Merge remote-tracking branch 'origin/master'

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

@@ -58,9 +58,12 @@ public class C {
     }
 
     public static final class URL {
-        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
+//        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 BASE_URL = "http://121.40.56.52:8080/";
+//        public static final String TEMP_PAY_URL = "http://121.40.56.52:8081/";
+
         private static final String PKG = "/tk/";
 
         public final class SYNCHRONOUS {
@@ -580,6 +583,8 @@ public class C {
         public static final int SKU_DETAIL = 6;
         public static final int ADD_SKU = 7;
         public static final int SKU_EDITOR = 8;
+        public static final int SKU_MANAGER = 9;
+        public static final int SKU_ADDER = 10;
     }
 
     public final class PAY_STATE {

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

@@ -50,7 +50,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
 //                    ("errMsg"));
 //
 //        }
-
+        getSyatemMessage();
         LogUtils.e("LoginActivity + initView");
         loadRootFragment(R.id.fra, mPresenter.signInFragment);
         mViewBinding.setText1(": 400 - 800 - 9406");
@@ -368,7 +368,6 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         } else if (keyCode == KeyEvent.KEYCODE_VOLUME_UP && tempVolumeDown == 5) {
             tempVolumeUp++;
             if (tempVolumeUp == 2) {
-                mViewBinding.tvSn.setText(getSyatemMessage());
                 mViewBinding.svMessage.setVisibility(View.VISIBLE);
                 tempVolumeDown = 0;
                 tempVolumeUp = 0;
@@ -380,10 +379,13 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         return super.onKeyDown(keyCode, event);
     }
 
-    private String getSyatemMessage() {
-        return "ApplicationName:" + SystemUtil.getApplicationName() + "\n\n" + "设备型号" + SystemUtil
-                .getDeviceModel() + "\n\n" + "设备SN：" + SystemUtil.getDeviceSN() + "\n\n 程序版本号：" +
+    private void getSyatemMessage() {
+        String str = "ApplicationName:" + SystemUtil.getApplicationName() + "\n\n" + "设备型号" +
+                SystemUtil
+                        .getDeviceModel() + "\n\n" + "设备SN：" + SystemUtil.getDeviceSN() + "\n\n " +
+                "程序版本号：" +
                 SystemUtil.getVersionName();
+        mViewBinding.tvSn.setText(str);
     }
 }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuActivity.java

@@ -24,6 +24,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.PriceFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.SearchFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.SkugrpFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.VipFragment;
+import com.xingdata.zzdpos.ui.scan.ScanFragment;
 import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
@@ -42,6 +43,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     private VipFragment mVipFragment = new VipFragment();
 
     private LoadingDialog mLoadingDialog = new LoadingDialog();
+    private ScanFragment mScanFragment = new ScanFragment();
 
     @Override
     public int getLayoutId() {
@@ -50,7 +52,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
 
     @Override
     public void initView() {
-        this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
+        this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_MANAGER);
         this.loadRootFragment(R.id.f_sssku, mManagerFragment);
 
         mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
@@ -61,6 +63,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
             }
             return false;
         });
+        mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickScan(mViewBinding.getTitleMode()));
         mViewBinding.btnMenu.setOnClickListener(view -> mPresenter.clickSkuMenu());
     }
 
@@ -140,9 +143,31 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         this.start(mSearchFragment.setKeyword(keyword).setSearchType(searchType));
     }
 
+    @Override
+    public void showScanFragment(int scanMode) {
+        switch (scanMode) {
+            case C.TITLE_MODE.SKU_MANAGER:
+                mScanFragment.setOnScanCompletedListener(barcode -> {
+                    this.pop();
+                    showSearchFragment(C.TITLE_MODE.SKU);
+                    mPresenter.searchSku(barcode);
+                });
+                mScanFragment.setOnBackPressedListener(this::backToManagerFragment);
+                break;
+            case C.TITLE_MODE.SKU_ADDER:
+                mScanFragment.setOnScanCompletedListener(barcode -> {
+                    this.pop();
+                    mAddFragment.loadBarcode(barcode);
+                });
+                mScanFragment.setOnBackPressedListener(this::backToAddFragment);
+                break;
+        }
+        this.start(mScanFragment);
+    }
+
     @Override
     public void showAddFragment() {
-        this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
+        this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_ADDER);
         mViewBinding.tvTitle.setText(R.string.sssku_add);
         this.start(mAddFragment);
     }
@@ -161,7 +186,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
                 this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_EDITOR);
                 mViewBinding.tvEditorHint.setText("新增");
                 mViewBinding.tvEditorHint.setBackgroundResource(R.drawable.shape_red_r1);
-
                 mViewBinding.tvTitle.setText(R.string.sssku_add);
                 this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UNKNOWN));
                 break;
@@ -216,7 +240,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
 
     @Override
     public void backToManagerFragment() {
-        this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
+        this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_MANAGER);
         mViewBinding.tvTitle.setText(R.string.sssku_title);
         this.resetSearchBar();
         this.pop();
@@ -229,6 +253,14 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         this.pop();
     }
 
+    @Override
+    public void backToAddFragment() {
+        this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_ADDER);
+        mViewBinding.tvTitle.setText(R.string.sssku_title);
+        this.resetSearchBar();
+        this.pop();
+    }
+
     @Override
     public void backToMenuActivity() {
         mPresenter.doOnFinish();

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuContract.java

@@ -98,6 +98,13 @@ public interface SsskuContract {
          */
         void showSearchFragment(String keyword, int searchType);
 
+        /**
+         * 显示扫描页面
+         *
+         * @param scanMode 扫描模式
+         */
+        void showScanFragment(int scanMode);
+
         /**
          * 显示添加检查页面
          */
@@ -157,6 +164,11 @@ public interface SsskuContract {
          */
         void backToDetailFragment();
 
+        /**
+         * 返回添加页面
+         */
+        void backToAddFragment();
+
         /**
          * 返回菜单页面
          */
@@ -342,6 +354,13 @@ public interface SsskuContract {
          */
         public abstract void clickSkuMenu();
 
+        /**
+         * 主页面 - 点击扫描按钮
+         *
+         * @param titleMode 标题模式
+         */
+        public abstract void clickScan(int titleMode);
+
         /**
          * 主页面 - 关闭
          */

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java

@@ -218,7 +218,6 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                         sssku1 -> {
                             mView.showMsg("添加成功");
                             isNeedSync = true;
-                            mView.backToEditFragment();
                             mView.backToManagerFragment();
                             if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
                                 mView.addSku(sssku1);
@@ -245,7 +244,6 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                         sssku1 -> {
                             mView.showMsg("添加成功");
                             isNeedSync = true;
-                            mView.backToEditFragment();
                             mView.backToManagerFragment();
                             if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
                                 mView.addSku(sssku1);
@@ -266,6 +264,11 @@ public class SsskuPresenter extends SsskuContract.Presenter {
         mView.showSkuMenuDialog();
     }
 
+    @Override
+    public void clickScan(int titleMode) {
+        mView.showScanFragment(titleMode);
+    }
+
     @Override
     public void doOnFinish() {
         if (!isNeedSync) return;

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/AddFragment.java

@@ -31,7 +31,6 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
         mViewBinding.etBarcode.setOnEditorActionListener((textView, i, keyEvent) -> {
             if ((i == EditorInfo.IME_ACTION_SEARCH || i == EditorInfo.IME_ACTION_UNSPECIFIED) && !StringUtils.isEmpty(textView.getText())) {
                 KeyboardUtils.hideSoftInput(textView);
-                this.pop();
                 mPresenter.clickCheck(mViewBinding.etBarcode.getText().toString());
             }
             return false;
@@ -63,6 +62,11 @@ public class AddFragment extends BaseFragment<SsskuPresenter, FragmentSsskuAddBi
         mSkuAdapter.setNewData(ssskus);
     }
 
+    public void loadBarcode(String barcode) {
+        if (mViewBinding == null) return;
+        mViewBinding.etBarcode.setText(barcode);
+    }
+
     @Override
     public boolean onBackPressedSupport() {
         ((SsskuActivity) getActivity()).backToManagerFragment();

app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/fragment/EditorFragment.java

@@ -527,7 +527,15 @@ public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEd
 
     @Override
     public boolean onBackPressedSupport() {
+        switch (mEditorMode) {
+            case C.SKU_EDITOR_MODE.ADD:
+            case C.SKU_EDITOR_MODE.UNKNOWN:
+                ((SsskuActivity) getActivity()).backToAddFragment();
+                break;
+            case C.SKU_EDITOR_MODE.UPDATE:
                 ((SsskuActivity) getActivity()).backToDetailFragment();
+                break;
+        }
         return super.onBackPressedSupport();
     }
 }
\ No newline at end of file

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/ms/fragment/ManagerFragment.java

 package com.xingdata.zzdpos.ui.marketing.ms.fragment;
 
 
+import android.annotation.SuppressLint;
 import android.support.v7.widget.LinearLayoutManager;
+import android.view.View;
+import android.widget.TextView;
 
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
@@ -40,6 +43,12 @@ public class ManagerFragment extends BaseFragment<MsPresenter, FragmentMsManager
         // set other
         mViewBinding.llAdd.setOnClickListener(view -> mPresenter.clickAdd());
 
+        // set empty
+        @SuppressLint("InflateParams") View emptyView = getLayoutInflater().inflate(R.layout.view_empty, null);
+        ((TextView) emptyView.findViewById(R.id.tv_empty)).setText(R.string.ms_empty_hint);
+        mMsAdapter.setEmptyView(emptyView);
+        mMsAdapter.isUseEmpty(false);
+
         // init data
         refreshMs();
     }

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/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/settle/SettlePresenter.java

@@ -155,9 +155,7 @@ public class SettlePresenter extends SettleContract.Presenter {
                     vips.add(vip);
                     mView.loadVips(vips);
                 },
-                throwable -> {
-                    mView.loadVips(new ArrayList<>());
-                });
+                throwable -> mView.loadVips(new ArrayList<>()));
     }
 
     @Override
@@ -319,9 +317,7 @@ public class SettlePresenter extends SettleContract.Presenter {
                                     break;
                             }
                         },
-                        throwable -> {
-                            mView.showPayFailFragment(throwable, mSaleorder);
-                        });
+                        throwable -> mView.showPayFailFragment(throwable, mSaleorder));
     }
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/vip/fragment/VipListFragment.java

@@ -179,6 +179,11 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         if (mViewBinding.vipLevelR.getChildCount() != 0) {
             mViewBinding.vipLevelR.removeAllViews();
         }
+
+        if (levelPager.getList()==null||levelPager.getList().size()==0){
+            ToastUtils.showShort("没有开通会员功能！");
+            return;
+        }
         LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);
         Level allLevel = new Level();
         allLevel.setVipLevelName("全部会员");

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_login.xml

@@ -45,10 +45,12 @@
 
             <ScrollView
                 android:id="@+id/sv_message"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="30dp"
                 android:layout_alignParentBottom="true"
-                android:visibility="gone"
-                android:layout_height="wrap_content">
+                android:layout_alignParentRight="true"
+                android:focusable="false"
+                android:visibility="visible">
 
                 <TextView
                     android:id="@+id/tv_sn"
@@ -56,7 +58,7 @@
                     android:layout_height="match_parent"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="@dimen/all_margin_left"
-                    android:layout_marginTop="@dimen/margin"
+                    android:focusable="false"
                     android:gravity="right|bottom"
                     android:text="忘记密码 ？"
                     android:textColor="@color/black_baozheng"/>

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_sssku.xml

@@ -6,6 +6,8 @@
 
     <data>
 
+        <import type="android.view.View" />
+
         <variable
             name="titleMode"
             type="int" />
@@ -39,7 +41,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_marginEnd="@dimen/all_margin"
-                android:visibility="@{titleMode==1||titleMode==6||titleMode==8?8:0}"
+                android:visibility="@{titleMode==1||titleMode==6||titleMode==8||titleMode==9||titleMode==10?8:0}"
                 app:layout_constraintBottom_toTopOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_back"
                 app:layout_constraintRight_toRightOf="parent"
@@ -63,7 +65,7 @@
                 android:text="@string/sssku_title"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_sub_title_size"
-                android:visibility="@{titleMode==1||titleMode==6||titleMode==8?0:8}"
+                android:visibility="@{titleMode==1||titleMode==6||titleMode==8||titleMode==9||titleMode==10?0:8}"
                 app:layout_constraintLeft_toRightOf="parent"
                 app:layout_constraintRight_toLeftOf="parent" />
 
@@ -94,6 +96,16 @@
                 android:visibility="@{titleMode==6?0:8}"
                 app:layout_constraintRight_toRightOf="parent" />
 
+            <ImageButton
+                android:id="@+id/btn_scan"
+                android:layout_width="?attr/actionBarSize"
+                android:layout_height="match_parent"
+                android:background="?attr/actionBarItemBackground"
+                android:contentDescription="@string/store_scan"
+                android:src="@mipmap/but_sweep_yard"
+                android:visibility="@{titleMode==9||titleMode==10?View.VISIBLE:View.GONE}"
+                app:layout_constraintRight_toRightOf="parent" />
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/all_line_width"

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/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_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

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

@@ -133,6 +133,38 @@
                     android:textColor="@color/black_baozheng"
                     android:textSize="@dimen/all_sub_title_size" />
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/all_line_width"
+                    android:layout_marginStart="@dimen/all_margin"
+                    android:background="@color/gray_kongming" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="?attr/actionBarSize"
+                    android:gravity="center_vertical">
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:paddingEnd="@null"
+                        android:paddingStart="@dimen/all_margin"
+                        android:text="@string/sku_barcode"
+                        android:textColor="@color/black_baozheng"
+                        android:textSize="@dimen/all_text_size" />
+
+                    <TextView
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="3"
+                        android:gravity="center_vertical"
+                        android:text="@{ConvertUtil.longToString(sku.spuBarcode)}"
+                        android:textColor="@color/black_baozheng"
+                        android:textSize="@dimen/all_text_size" />
+                </LinearLayout>
+
                 <View
                     android:layout_width="match_parent"
                     android:layout_height="@dimen/all_line_width"

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

@@ -36,6 +36,7 @@
             android:layout_width="match_parent"
             android:layout_height="0.5dp"
             android:background="@color/gray_huanggai" />
+      <include layout="@layout/line_layout"></include>
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -4,6 +4,7 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
+                  android:background="@color/gray_zhouyu"
                   android:gravity="center"
                   android:orientation="vertical">
 
@@ -17,7 +18,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/layout/view_type_gift.xml

@@ -122,12 +122,21 @@
                 android:layout_marginStart="@dimen/all_margin"
                 android:layout_marginTop="@dimen/all_margin">
 
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="@string/ms_editor_type_gift_text5"
+                    android:textColor="@color/black"
+                    android:textSize="@dimen/big_text_size" />
+
                 <EditText
                     android:id="@+id/et_search"
                     style="@style/searchBarEditor"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_marginEnd="@dimen/all_spacing"
+                    android:layout_marginStart="@dimen/all_spacing"
                     android:layout_weight="1"
                     android:hint="@string/ms_editor_type_gift_search_hint"
                     android:inputType="text"

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

@@ -329,7 +329,7 @@
     <string name="ms_user_hint">营销计划功能限时免费使用 1 个月</string>
     <string name="ms_count">共%s个营销计划</string>
     <string name="ms_search_hint">请输入活动名称</string>
-    <string name="ms_empty_hint">没有搜到此计划\n请重新搜索，或点击添加按钮进行添加~</string>
+    <string name="ms_empty_hint">没有找到营销计划~</string>
     <string name="ms_editor_title">管理-营销计划</string>
     <string name="ms_editor_setting">设置营销计划</string>
     <string name="ms_editor_subtitle_info">基本信息</string>
@@ -369,6 +369,7 @@
     <string name="ms_editor_type_gift_text2">元</string>
     <string name="ms_editor_type_gift_text3">加</string>
     <string name="ms_editor_type_gift_text4">1件</string>
+    <string name="ms_editor_type_gift_text5">换购</string>
     <string name="ms_editor_type_gift_hint">条码:请扫码或输入条码</string>
     <string name="ms_editor_type_gift_name">品名:</string>
     <string name="ms_editor_type_gift_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>