Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/view_empty.xml

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -59,10 +59,10 @@ public class C {
 
     public static final class URL {
 //        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
-//        public static final String TEMP_PAY_URL = "http://demo.51zzd.cn/";
+        public static final String TEMP_PAY_URL = "http://demo.51zzd.cn/";
 
         public static final String BASE_URL = "http://121.40.56.52:8080/";
-        public static final String TEMP_PAY_URL = "http://121.40.56.52:8081/";
+//        public static final String TEMP_PAY_URL = "http://121.40.56.52:8081/";
 
         private static final String PKG = "/tk/";
 

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginPresenter.java

@@ -29,6 +29,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
 import com.xingdata.zzdpos.ui.login.fragment.bean.UserStoreInfo;
+import com.xingdata.zzdpos.util.Global;
 import com.xingdata.zzdpos.util.PhoneFormatCheckUtils;
 import com.xingdata.zzdpos.util.SystemUtil;
 
@@ -249,6 +250,10 @@ public class LoginPresenter extends LoginContract.Presenter {
     public void createCounter(long shopMapId, PromptDialog promptDialog, LoadingDialog
             loadingDialog) {
         ApiFactory.Test.addCounter(shopMapId).subscribe(addCounter -> {
+            if (Global.isSnNull()) {
+                ToastUtils.showLong("Sn为空");
+                return;
+            }
             mView.bindingCounterSucc(promptDialog, loadingDialog);
         }, throwable -> {
             mView.errorInfo(throwable.getMessage(), promptDialog, loadingDialog);
@@ -261,6 +266,10 @@ public class LoginPresenter extends LoginContract.Presenter {
     public void bindingCounter(long casherId, PromptDialog promptDialog, LoadingDialog
             loadingDialog) {
         ApiFactory.Test.bindCounter(casherId).subscribe(bindCounter -> {
+            if (Global.isSnNull()) {
+                ToastUtils.showLong("Sn为空");
+                return;
+            }
             mView.bindingCounterSucc(promptDialog, loadingDialog);
         }, throwable -> {
             mView.errorInfo(throwable.getMessage(), promptDialog, loadingDialog);
@@ -299,6 +308,10 @@ public class LoginPresenter extends LoginContract.Presenter {
     public void deviceRegister(String phone, String password, PromptDialog promptDialog,
                                LoadingDialog loadingDialog) {
         ApiFactory.Test.deviceRegister().subscribe(s -> {
+            if (Global.isSnNull()) {
+                ToastUtils.showLong("Sn为空");
+                return;
+            }
             signIn(phone, password, promptDialog, loadingDialog);
         }, throwable -> {
             mView.errorInfo(throwable.getMessage(), new PromptDialog(), loadingDialog);

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java

@@ -176,6 +176,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
                     break;
                     case R.id.btn_scan: {
                         ScanFragment mScanFragment = new ScanFragment();
+                        mScanFragment.setTitle("添加商品组合");
                         mScanFragment.setOnScanCompletedListener(new ScanFragment
                                 .OnScanCompletedListener() {
                             @Override

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleIndexFragment.java

@@ -79,6 +79,7 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
                                                     case R.id.btn_scan: {
                                                         ScanFragment mScanFragment = new
                                                                 ScanFragment();
+                                                        mScanFragment.setTitle("商品组合");
                                                         mScanFragment.setOnScanCompletedListener
                                                                 (new ScanFragment
                                                                         .OnScanCompletedListener() {
@@ -94,9 +95,11 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
                                                                                         loadingDialog);
                                                                     }
                                                                 });
+
                                                         if (!mScanFragment.isAdded()) {
                                                             start(mScanFragment);
                                                         }
+
                                                     }
                                                     break;
                                                     default: {
@@ -117,6 +120,11 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
                            LoadingDialog
                                    loadingDialog) {
         mViewBinding.tvKeyword.setText(wd);
+        if (usskuPager.getTotalRow() <= 0) {
+            mViewBinding.btnGroup.setVisibility(View.GONE);
+        } else {
+            mViewBinding.btnGroup.setVisibility(View.VISIBLE);
+        }
         mViewBinding.btnGroup.setText(Html.fromHtml(getResources().getString(R.string
                 .tv_bale_count, "<font color='#1f7bdb'><big> " + usskuPager.getTotalRow() +
                 "</big></font>")));

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java

@@ -63,6 +63,9 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 
 
         mViewBinding.edTitle.setHint(R.string.inventory_add_et_hint);
+        if (mViewBinding.edTitle.getText().toString().length() != 0) {
+            mViewBinding.edTitle.setText("");
+        }
         mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
             @Override
             public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
@@ -226,7 +229,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
 
             }, view1 -> {
                 promptDialog.dismiss();
-                mPresenter.changeTitle("盘库记录",false);
+                mPresenter.changeTitle("盘库记录", false);
                 pop();
 
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/adpter/OtherSelectAdapter.java

@@ -32,13 +32,12 @@ public class OtherSelectAdapter extends BaseAdapter<Ossku, ItemOtherSelectBindin
         mViewBinding.imgGoods.setImageURI(item.getSpuImg());
 //        mViewBinding.tvNum.setText(item.getSkuStock() + "个");
         mViewBinding.setShopName(item.getShopName());
-        mViewBinding.setStock("库存:" +item.getSkuStock()+item.getSpuUnitName());
-        mViewBinding.setAddress(item.getCityProvName()+item.getCityName()+item.getCityCountyName()+item.getCityAddress());
-        mViewBinding.setPhone(item.getContactTel());
+        mViewBinding.setStock("库存:" + item.getSkuStock() + item.getSpuUnitName());
+        mViewBinding.setAddress(item.getCityProvName() + item.getCityName() + item.getCityCountyName() + item.getCityAddress());
+        mViewBinding.setPhone(item.getContactMob() + "");
 //        mViewBinding.tvAddress.setText(item.getCityAddress());
 //        mViewBinding.tvTel.setText(item.getContactTel());
     }
 
 
-
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java

@@ -137,7 +137,7 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
         }
         this.isLoadMore = isLoadMore;
         if (pager == null || pager.getList() == null || pager.getList().size() <= 0) {
-            integralAdapter.setEmptyView(getEmptyView("没有规则"));
+            integralAdapter.setEmptyView(getEmptyView("没有积分规则~"));
         }
         if (pager.getList() != null) {
             switch (queryType) {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerIndexFragment.java

@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.marketing.ticket.fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.Html;
 import android.view.View;
+import android.widget.TextView;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.xingdata.zzdpos.R;
@@ -72,7 +73,8 @@ public class TickerIndexFragment extends BaseFragment<ReturnTicketPresenter,
         closeLoading(loadingDialog);
         if (trulePager == null || trulePager.getList() == null || trulePager.getList().size() <=
                 0) {
-            mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
+//            mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
+            returnTicketAdapter.setEmptyView(getEmptyView("没有积分规则~"));
         }
         if (trulePager != null && trulePager.getList() != null) {
             mViewBinding.tvEmpty.setVisibility(View.GONE);
@@ -85,6 +87,12 @@ public class TickerIndexFragment extends BaseFragment<ReturnTicketPresenter,
         }
     }
 
+    private View getEmptyView(String str) {
+        View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+        ((TextView) view.findViewById(R.id.tv_empty)).setText(str);
+        return view;
+    }
+
     private void closeLoading(LoadingDialog loadingDialog) {
         if (loadingDialog != null) {
             loadingDialog.dismiss();

app/src/main/java/com/xingdata/zzdpos/ui/scan/ScanFragment.java

@@ -2,6 +2,9 @@ package com.xingdata.zzdpos.ui.scan;
 
 import android.content.Context;
 import android.os.Handler;
+import android.view.View;
+import android.view.ViewStub;
+import android.widget.TextView;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
@@ -12,10 +15,14 @@ import me.dm7.barcodescanner.core.IViewFinder;
 import me.dm7.barcodescanner.core.ViewFinderView;
 import me.dm7.barcodescanner.zxing.ZXingScannerView;
 
-public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, FragmentStoreScanBinding> {
+public class ScanFragment<P extends BasePresenter> extends BaseFragment<P,
+        FragmentStoreScanBinding> {
 
     private ZXingScannerView mScannerView;
     private ZXingScannerView.ResultHandler mResultHandler;
+    private String titleStr = "";
+    private ViewStub viewStub;
+    private View inflated;
 
     @Override
     public int getLayoutId() {
@@ -51,6 +58,21 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, Fragm
 
     @Override
     public void initView() {
+        if (!titleStr.equals("")) {
+            mViewBinding.vsTitle.getViewStub().setVisibility(View.VISIBLE);
+            viewStub = mViewBinding.vsTitle.getViewStub();
+            if (viewStub.getParent() != null) {
+                inflated = viewStub.inflate();
+            }
+            inflated.findViewById(R.id.iv_back).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    pop();
+                }
+            });
+            ((TextView) (inflated.findViewById(R.id.tv_title))).setText(titleStr);
+        }
+
         mScannerView = new ZXingScannerView(mContext) {
             @Override
             protected IViewFinder createViewFinderView(Context context) {
@@ -99,7 +121,8 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, Fragm
             int themeColor = getResources().getColor(R.color.blue_mawu);
 
             this.setBorderColor(themeColor);
-            this.setBorderStrokeWidth(getResources().getDimensionPixelOffset(R.dimen.all_shape_radius));
+            this.setBorderStrokeWidth(getResources().getDimensionPixelOffset(R.dimen
+                    .all_shape_radius));
 
             this.setLaserColor(themeColor);
             this.setLaserEnabled(true);
@@ -107,4 +130,8 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, Fragm
 
 
     }
+
+    public void setTitle(String titleStr) {
+        this.titleStr = titleStr;
+    }
 }
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java

@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.sendticke.fragment;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.view.View;
+import android.widget.TextView;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -122,7 +123,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                             }
                         }
                     }
-                    case R.id.cl_all:{
+                    case R.id.cl_all: {
                         mViewBinding.llAllVipGroup.setVisibility(View.VISIBLE);
                         mViewBinding.clAll.setVisibility(View.GONE);
                     }
@@ -253,18 +254,22 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
         closeLoading(loadingDialog);
         if (trulePager == null || trulePager.getList() == null || trulePager.getList().size() <=
                 0) {
-            mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
-            mViewBinding.rlTicker.setVisibility(View.GONE);
+            returnTicketAdapter.setEmptyView(getEmptyView("没有优惠券~"));
         }
         if (trulePager != null && trulePager.getList() != null && trulePager.getList().size() > 0) {
             truleList = trulePager.getList();
-            mViewBinding.tvEmpty.setVisibility(View.GONE);
             mViewBinding.rlTicker.setVisibility(View.VISIBLE);
             trulePager.getList().get(0).setSelect(true);
             returnTicketAdapter.setNewData(trulePager.getList());
         }
     }
 
+    private View getEmptyView(String str) {
+        View view = getLayoutInflater().inflate(R.layout.view_empty, null);
+        ((TextView) view.findViewById(R.id.tv_empty)).setText(str);
+        return view;
+    }
+
     /**
      * 0单个会员发券，1按会员类型发券
      *

app/src/main/java/com/xingdata/zzdpos/ui/statistics/adapter/StatisticsTicketGroupAdapter.java

@@ -35,7 +35,7 @@ public class StatisticsTicketGroupAdapter extends BaseSectionQuickAdapter<Ticket
     protected void convert(BaseViewHolder helper, Ticket item) {
         helper.setText(R.id.tv_left_top, ConvertUtil.fenToYuanNoZero(item.getTicketValAmt()) + "元优惠券");
         helper.setText(R.id.tv_left_bottom, TimeUtils.date2String(item.getCreateTime(),new SimpleDateFormat(StringUtil.mmddhhmmmDatePattern)));
-        ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.icon_record);
+        ((ImageView) helper.getView(R.id.img_left)).setImageResource(R.mipmap.icon_voucher02);
 
 
     }

app/src/main/java/com/xingdata/zzdpos/util/Global.java

@@ -12,6 +12,21 @@ import android.widget.EditText;
  */
 
 public class Global {
+    public static boolean isNull(String str) {
+        if (null == str || str.equals("")) {
+            return true;
+        }
+        return false;
+    }
+
+    public static boolean isSnNull() {
+        if (isNull(SystemUtil.getDeviceSN())) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public static void clickHideKeyboard(MotionEvent ev, Activity context) {
         if (ev.getAction() == MotionEvent.ACTION_DOWN) {
             View v = context.getCurrentFocus();
@@ -52,4 +67,6 @@ public class Global {
         }
         return false;
     }
+
+
 }

app/src/main/res/layout/activity_bale.xml

@@ -13,7 +13,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/appBack"
+        android:background="@color/white_caocao"
         tools:context="com.xingdata.zzdhd.ui.manager.ticket.ReturnTicketActivity">
 
 

app/src/main/res/layout/activity_send_ticket.xml

@@ -14,7 +14,7 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
-                  android:background="@color/appBack"
+                  android:background="@color/white_caocao"
                   android:orientation="vertical">
 
 
@@ -24,7 +24,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_gravity="center"
-            android:background="@color/appBack"/>
+            android:background="@color/white_caocao"/>
 
 
     </LinearLayout>

app/src/main/res/layout/activity_statistics_detail.xml

@@ -11,7 +11,7 @@
         <include
             android:id="@+id/ic_title"
             layout="@layout/title"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"/>
 
 
         <FrameLayout
@@ -26,25 +26,25 @@
                 android:id="@+id/view_order_detail"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_order_detail" />
+                android:layout="@layout/view_order_detail"/>
 
             <ViewStub
                 android:id="@+id/view_vip_recharge"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_vip_recharge" />
+                android:layout="@layout/view_vip_recharge"/>
 
             <ViewStub
                 android:id="@+id/view_ticket"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_ticket" />
+                android:layout="@layout/view_ticket"/>
 
             <ViewStub
                 android:id="@+id/view_cs"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_inventory_detail" />
+                android:layout="@layout/view_inventory_detail"/>
         </FrameLayout>
 
         <android.support.constraint.ConstraintLayout
@@ -71,13 +71,13 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/btn_return"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:targetApi="lollipop" />
+                tools:targetApi="lollipop"/>
 
             <Button
                 android:id="@+id/btn_return"
                 style="@style/button_positive"
                 android:layout_width="@dimen/button1_width"
-                android:layout_height="37dp"
+                android:layout_height="@dimen/button1_height"
                 android:gravity="center"
                 android:stateListAnimator="@null"
                 android:text="@string/pay_return"
@@ -87,13 +87,13 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_goneMarginStart="@dimen/all_margin_big_big"
-                tools:targetApi="lollipop" />
+                tools:targetApi="lollipop"/>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/view_line_L050"
                 android:background="@color/gray_huanggai"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
         </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

app/src/main/res/layout/dialog_integral_exchange_setting.xml

@@ -205,6 +205,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="@dimen/all_bounced_padding"
                         android:layout_weight="1"
+                        android:gravity="right"
                         android:text="元"
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/et_textsize"/>
@@ -256,6 +257,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginRight="@dimen/all_bounced_padding"
                         android:layout_weight="1"
+                        android:gravity="right"
                         android:text="积分"
                         android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/et_textsize"/>

app/src/main/res/layout/dialog_integral_get_setting.xml

@@ -41,7 +41,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-
                 android:background="@color/store_back"
                 android:focusable="true"
                 android:orientation="vertical">
@@ -50,7 +49,7 @@
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
-                    android:background="@drawable/up_down_line_gray"
+                    android:background="@drawable/up_down_line_gray_bottom"
                     android:gravity="left|center_vertical"
                     android:paddingLeft="@dimen/all_bounced_padding"
                     android:text="基本信息"

app/src/main/res/layout/dialog_inventory_cart.xml

@@ -19,6 +19,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
+        android:paddingTop="@dimen/all_padding"
         android:orientation="vertical">
 
         <View
@@ -117,7 +118,7 @@
                 android:layout_marginTop="@dimen/all_spacing"
                 android:contentDescription="@string/store_cart"
                 android:foreground="?attr/actionBarItemBackground"
-                android:src="@mipmap/shopping_cart" />
+                android:src="@mipmap/inventory_cart" />
 
             <TextView
                 android:layout_width="@dimen/store_cart_count"

app/src/main/res/layout/fragment_bale_edit.xml

@@ -111,7 +111,7 @@
                 style="@style/button_positive"
                 android:layout_width="@dimen/all_button_radius_width"
                 android:layout_height="@dimen/all_button_radius_height"
-                android:layout_marginLeft="@dimen/all_margin_big"
+                android:layout_marginLeft="@dimen/all_margin_big_big"
                 android:onClick="@{OnClickListener}"
                 android:stateListAnimator="@null"
                 android:text="组 合"

app/src/main/res/layout/fragment_bale_index.xml

@@ -26,7 +26,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="@color/white_caocao"
-            app:layout_constraintBottom_toTopOf="@id/tv_keyword"
+            app:layout_constraintBottom_toTopOf="@id/ll_keyword"
             app:layout_constraintTop_toTopOf="parent">
 
             <ImageButton
@@ -177,7 +177,6 @@
             android:layout_height="0dp"
             android:background="@color/white"
             android:orientation="vertical"
-            android:padding="@dimen/all_padding"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
@@ -188,6 +187,7 @@
                 android:id="@+id/ll_null"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:background="@color/white"
                 android:gravity="center"
                 android:orientation="vertical"
                 android:visibility="gone">
@@ -196,6 +196,7 @@
                     android:id="@+id/tv_empty"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@color/white"
                     android:drawablePadding="@dimen/all_margin"
                     android:drawableTop="@mipmap/nong"
                     android:gravity="center"
@@ -209,7 +210,9 @@
             <android.support.v4.widget.SwipeRefreshLayout
                 android:id="@+id/srl_products"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                android:background="@color/gray_zhouyu"
+                android:padding="@dimen/all_padding">
 
                 <android.support.v7.widget.RecyclerView
                     android:id="@+id/rc_bale_shop"

app/src/main/res/layout/fragment_bale_seach.xml

@@ -75,7 +75,7 @@
                     android:paddingLeft="@dimen/all_padding"
                     android:saveEnabled="false"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/all_text_size"/>
+                    android:textSize="@dimen/all_text_size_low"/>
 
                 <TextView
                     android:id="@+id/btn_seach"

app/src/main/res/layout/fragment_bale_seach_shop.xml

@@ -67,7 +67,7 @@
                     android:labelFor="@+id/et_search"
                     android:saveEnabled="false"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/all_text_size"/>
+                    android:textSize="@dimen/all_text_size_low"/>
 
                 <TextView
                     android:id="@+id/btn_seach"

app/src/main/res/layout/fragment_send_ticker.xml

@@ -251,21 +251,9 @@
                 android:layout_height="0dp"
                 android:layout_weight="9"
                 android:paddingLeft="@dimen/all_padding"
-                android:paddingRight="@dimen/all_padding"/>
+                android:paddingRight="@dimen/all_padding"
+                android:visibility="visible"/>
 
-            <TextView
-                android:id="@+id/tv_empty"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="9"
-                android:background="@color/appBack"
-                android:drawableTop="@mipmap/icon_things_null"
-                android:gravity="center"
-                android:padding="100dp"
-                android:text="@string/empty_other_select"
-                android:textColor="@color/white_half"
-                android:textSize="@dimen/all_text_size_big"
-                android:visibility="gone"/>
         </LinearLayout>
 
         <LinearLayout
@@ -286,6 +274,7 @@
                 android:layout_weight="3"
                 android:gravity="center|left"
                 android:text="白金会员"
+                android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/et_textsize"/>
 
             <Button

app/src/main/res/layout/fragment_send_ticker_vip.xml

@@ -67,7 +67,7 @@
                     android:maxLength="11"
                     android:textColor="@color/black_likui"
                     android:textColorHint="@color/gray_huanggai"
-                    android:textSize="@dimen/all_text_size"/>
+                    android:textSize="@dimen/all_text_size_low"/>
 
             </LinearLayout>
 

app/src/main/res/layout/fragment_store_scan.xml

 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.constraint.ConstraintLayout
+    <data>
+
+        <variable
+            name="onClickListener"
+            type="com.xingdata.zzdpos.util.OnClickListener"></variable>
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ViewStub
+            android:id="@+id/vs_title"
             android:layout_width="match_parent"
-        android:layout_height="match_parent">
+            android:layout_height="?attr/actionBarSize"
+            android:inflatedId="@+id/iv_VsContent"
+            android:layout="@layout/title"
+            android:onClick="@{onClickListener}"
+            android:visibility="gone"/>
 
         <FrameLayout
             android:id="@+id/content_frame"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </android.support.constraint.ConstraintLayout>
+            android:layout_height="match_parent"/>
+    </LinearLayout>
 
 </layout>
\ No newline at end of file

app/src/main/res/layout/item_bale_edit.xml

@@ -63,7 +63,10 @@
             android:layout_marginRight="@dimen/all_bounced_padding"
             android:background="@drawable/frame_frame_zhouyu_bg"
             android:padding="@dimen/dp_4"
+            android:maxLines="1"
+            android:lines="1"
             android:text="规格"
+            android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size_small"
             app:layout_constraintBottom_toBottomOf="@id/tv_no"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/item_bale_edit_query.xml

@@ -74,15 +74,15 @@
                 <TextView
                     android:id="@+id/tv_No"
                     style="@style/other_select_smallstyle"
-                    android:layout_width="150dp"
+                    android:layout_width="140dp"
                     android:layout_height="wrap_content"
                     android:text="8531651233213"/>
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="right"
                     android:layout_marginRight="@dimen/all_bounced_padding"
+                    android:gravity="right"
                     android:orientation="horizontal">
 
                     <TextView
@@ -90,8 +90,11 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@drawable/frame_frame_zhouyu_bg"
+                        android:lines="1"
+                        android:maxLines="1"
                         android:padding="@dimen/dp_4"
                         android:text="规格"
+                        android:textColor="@color/black_baozheng"
                         android:textSize="@dimen/all_text_size_small"
                         />
                 </LinearLayout>

app/src/main/res/layout/item_other_select.xml

@@ -81,6 +81,7 @@
             android:background="@drawable/frame_frame_zhouyu_bg"
             android:padding="@dimen/dp_4"
             android:text="规格"
+            android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size_small"
             app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
             app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />

app/src/main/res/layout/view_empty.xml

@@ -15,7 +15,7 @@
             android:gravity="center"
             android:lineSpacingExtra="@dimen/all_padding"
             android:textColor="@color/gray_huanggai"
-            android:textSize="@dimen/all_text_size" />
+            android:textSize="@dimen/all_text_size"/>
 
     </LinearLayout>
 </layout>
\ No newline at end of file

app/src/main/res/values/strings.xml

@@ -272,16 +272,16 @@
     <string name="other_selcet_shop">共%s个门店库存</string>
 
     <!--补货界面-->
-    <string name="replenishment_meun">补货订货</string>
+    <string name="replenishment_meun">补货定货</string>
     <string name="replenishment_add">一键补货</string>
     <string name="replenishment_order">共%s个订单</string>
     <string name="replenishment_search_hint">搜索供货商订单</string>
-    <string name="replenishment_empty_hint">还没有订货单哦~</string>
+    <string name="replenishment_empty_hint">还没有定货单哦~</string>
     <string name="replenishment_detail_cancel">关闭</string>
     <string name="replenishment_detail_submit">定货提交</string>
     <string name="replenishment_detail_print">打印</string>
     <string name="replenishment_detail_title">定货明细</string>
-    <string name="replenishment_detail_full">货物满满\n不需要订货哦~</string>
+    <string name="replenishment_detail_full">货物满满\n不需要定货哦~</string>
     <!--盘点界面-->
     <string name="inventory_meun">库存盘点</string>
     <string name="inventory_add">开始盘库</string>
@@ -421,7 +421,7 @@
     <string name="sssku_cost_hint">是否按此包装进货:</string>
     <string name="sssku_stock_low_limit">库存下限:</string>
     <string name="sssku_stock_upper_limit">库存上限:</string>
-    <string name="sssku_min_oder">最小订货:</string>
+    <string name="sssku_min_oder">最小定货:</string>
     <string name="sssku_pack_name">品名:</string>
     <string name="sssku_pack_price">售价:</string>
     <string name="sssku_pack_default_unit">件</string>
@@ -513,7 +513,7 @@
     <string name="menu_manager_oper">店员管理</string>
     <string name="menu_manager_goods">商品维护</string>
     <string name="menu_manager_bale">商品组合</string>
-    <string name="menu_manager_replenishment">补货订货</string>
+    <string name="menu_manager_replenishment">补货定货</string>
     <string name="menu_manager_other">邻库查询</string>
     <string name="menu_manager_inventory">库存盘点</string>
 
@@ -726,7 +726,7 @@
     <string name="sku_cost">进价:</string>
     <string name="sku_stock_low_limit">库存下限:</string>
     <string name="sku_stock_upper_limit">库存上限:</string>
-    <string name="sku_min_oder">最小订货:</string>
+    <string name="sku_min_oder">最小定货:</string>
 
     <string name="sku_update">编辑商品</string>
     <string name="sku_update_price">调整价格</string>

app/src/main/res/values/styles.xml

@@ -315,7 +315,7 @@
     </style>
 
     <style name="button_positive_noradius">
-        <item name="android:background">@drawable/selector_gradient_red_button_background_noradius
+        <item name="android:background">@drawable/selector_gradient_red_button_background
         </item>
         <item name="android:layout_height">@dimen/button3_height</item>
         <item name="android:layout_width">match_parent</item>