Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -1233,6 +1233,7 @@ public final class ApiFactory {
                     .observeOn(AndroidSchedulers.mainThread())
                     .retryWhen(new RetryHelper(3));
         }
+
     }
 
     public static class Ver {

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

@@ -22,6 +22,7 @@ import com.xingdata.zzdpos.ui.manage.sssku.fragment.ManagerFragment;
 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 java.util.List;
 
@@ -32,9 +33,11 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     private SkugrpFragment mSkugrpFragment = new SkugrpFragment();
 
     private AddFragment mAddFragment = new AddFragment();
-    private EditorFragment mEditorFragment = new EditorFragment();
     private DetailFragment mDetailFragment = new DetailFragment();
+    private EditorFragment mEditorFragment = new EditorFragment();
+
     private PriceFragment mPriceFragment = new PriceFragment();
+    private VipFragment mVipFragment = new VipFragment();
 
     private LoadingDialog mLoadingDialog = new LoadingDialog();
 
@@ -48,9 +51,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         this.showTitleBarByTitleMode(C.TITLE_MODE.SKU);
         this.loadRootFragment(R.id.f_sssku, mManagerFragment);
 
-        mViewBinding.btnBack.setOnClickListener(view -> {
-            getTopFragment().onBackPressedSupport();
-        });
+        mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
         mViewBinding.etSearch.setOnEditorActionListener((textView, i, keyEvent) -> {
             if (i == EditorInfo.IME_ACTION_SEARCH && !StringUtils.isEmpty(textView.getText())) {
                 KeyboardUtils.hideSoftInput(textView);
@@ -58,12 +59,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
             }
             return false;
         });
-        mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> {
-            mPresenter.searchBarFocusChanged(b, C.TITLE_MODE.SKU);
-        });
-        mViewBinding.btnMenu.setOnClickListener(view -> {
-            mPresenter.clickSkuMenu();
-        });
+        mViewBinding.etSearch.setOnFocusChangeListener((view, b) -> mPresenter.searchBarFocusChanged(b, C.TITLE_MODE.SKU));
+        mViewBinding.btnMenu.setOnClickListener(view -> mPresenter.clickSkuMenu());
     }
 
     @Override
@@ -152,7 +149,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
                 this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UNKNOWN));
                 break;
             case C.SKU_EDITOR_MODE.UPDATE:
-                mViewBinding.tvTitle.setText(R.string.sssku_update);
+                mViewBinding.tvTitle.setText(R.string.sku_update);
                 this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UPDATE));
                 break;
         }
@@ -161,10 +158,17 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     @Override
     public void showPriceFragment(Sssku sku) {
         this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
-        mViewBinding.tvTitle.setText(R.string.sssku_update);
+        mViewBinding.tvTitle.setText(R.string.sku_update_price);
         this.start(mPriceFragment.setSssku(sku));
     }
 
+    @Override
+    public void showVipFragment(Sssku sku) {
+        this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
+        mViewBinding.tvTitle.setText(R.string.sku_subtitle_vip);
+        this.start(mVipFragment.setSssku(sku));
+    }
+
 
     @Override
     public void showDetailFragment(Sssku sku) {
@@ -188,7 +192,7 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     @Override
     public void backToEditFragment() {
         this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
-        mViewBinding.tvTitle.setText(R.string.sssku_update);
+        mViewBinding.tvTitle.setText(R.string.sku_update);
         this.pop();
     }
 

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

@@ -102,12 +102,19 @@ public interface SsskuContract {
         void showEditorFragment(Sssku sku, int editMode);
 
         /**
-         * 显示价格页面
+         * 显示价格编辑页面
          *
          * @param sku 要编辑的商品
          */
         void showPriceFragment(Sssku sku);
 
+        /**
+         * 显示会员编辑页面
+         *
+         * @param sku 要编辑的商品
+         */
+        void showVipFragment(Sssku sku);
+
         /**
          * 显示详情页面
          *

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

@@ -142,7 +142,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
 
     @Override
     public void clickEditVipSku(Sssku sssku) {
-        //TODO
+        mView.showVipFragment(sssku);
     }
 
     @Override

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

+package com.xingdata.zzdpos.ui.manage.sssku.fragment;
+
+import android.view.View;
+import android.widget.EditText;
+
+import com.xingdata.zzdpos.C;
+import com.xingdata.zzdpos.R;
+import com.xingdata.zzdpos.base.BaseFragment;
+import com.xingdata.zzdpos.databinding.FragmentSsskuVipBinding;
+import com.xingdata.zzdpos.model.Sssku;
+import com.xingdata.zzdpos.ui.manage.sssku.SsskuActivity;
+import com.xingdata.zzdpos.ui.manage.sssku.SsskuPresenter;
+import com.xingdata.zzdpos.util.ConvertUtil;
+import com.xingdata.zzdpos.util.InputFilters;
+
+public class VipFragment extends BaseFragment<SsskuPresenter, FragmentSsskuVipBinding> {
+    private Sssku mSssku;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fragment_sssku_vip;
+    }
+
+    @Override
+    public void initView() {
+        mViewBinding.ivPic.setImageURI(mSssku.getSpuImg());
+        mViewBinding.setSku(mSssku);
+
+        this.initVipView();
+        this.setVipViewBySssku();
+
+        mViewBinding.btnConfirm.setOnClickListener(view -> {
+            this.processSssku();
+            mPresenter.clickConfirm(mSssku, C.SKU_EDITOR_MODE.UPDATE);
+        });
+    }
+
+    /**
+     * 设置商品
+     *
+     * @param sssku 商品信息
+     */
+    public VipFragment setSssku(Sssku sssku) {
+        this.mSssku = sssku;
+        return this;
+    }
+
+    /**
+     * 初始化价格
+     */
+    private void initVipView() {
+        View.OnFocusChangeListener mOnFocusChangeListener = (view, b) -> {
+            if (view instanceof EditText) {
+                EditText editText = (EditText) view;
+                if (b && editText.getText().toString().equals("0.0")) {
+                    editText.setText("");
+                } else if (!b && editText.getText().length() == 0) {
+                    editText.setText("0.0");
+                }
+            }
+        };
+
+        mViewBinding.etPoint.setFilters(InputFilters.getMoneyFilter(6));
+        mViewBinding.etPoint.setOnFocusChangeListener(mOnFocusChangeListener);
+    }
+
+    /**
+     * 根据商品设置价格页面
+     */
+    private void setVipViewBySssku() {
+        mViewBinding.rgDis.check(mSssku.getSkuOffFlag() == null || mSssku.getSkuOffFlag() == 1 ? R.id.rb_dis_on : R.id.rb_dis_off);
+        if (mSssku.getSkuBoundAmt() == null) mSssku.setSkuBoundAmt(100L);
+        mViewBinding.etPoint.setText(ConvertUtil.fenToYuan(mSssku.getSkuBoundAmt()));
+    }
+
+    /**
+     * 处理商品
+     */
+    private void processSssku() {
+        mSssku.setSkuOffFlag((byte) (mViewBinding.rbDisOff.isChecked() ? 0 : 1));
+        mSssku.setSkuBoundAmt(ConvertUtil.yuanToFen(mViewBinding.etPoint.getText().toString()));
+
+        mSssku.setCreateTime(null);
+        mSssku.setUpdateTime(null);
+    }
+
+    @Override
+    public boolean onBackPressedSupport() {
+        ((SsskuActivity) getActivity()).backToDetailFragment();
+        return super.onBackPressedSupport();
+    }
+
+}

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserActivity.java

@@ -40,4 +40,9 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
     public void queryOperSus(Pager<Oper> operPager) {
         mPresenter.userListFragment.queryOperSus(operPager);
     }
+
+    @Override
+    public void querySta(Sta sta) {
+
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserContract.java

@@ -21,9 +21,12 @@ public interface UserContract {
 
     interface View extends BaseView {
         void queryOperSus(Pager<Oper> operPager);
+        void querySta(Sta sta);
     }
 
     abstract class Presenter extends BasePresenter<View> {
         public abstract void getUserList(String wd);
+        public abstract  void addUser(Oper oper);
+        public abstract  void querySta();
     }
 }
\ No newline at end of file

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/UserPresenter.java

@@ -2,10 +2,12 @@ package com.xingdata.zzdpos.ui.manage.user;
 
 
 import com.xingdata.zzdpos.api.ApiFactory;
+import com.xingdata.zzdpos.model.Oper;
 import com.xingdata.zzdpos.ui.manage.user.fragment.UserListFragment;
 
 public class UserPresenter extends UserContract.Presenter {
     public UserListFragment userListFragment = new UserListFragment();
+
     @Override
     public void onAttached() {
 
@@ -15,9 +17,29 @@ public class UserPresenter extends UserContract.Presenter {
     @Override
     public void getUserList(String wd) {
         ApiFactory.Oper.queryOper(wd).subscribe(operPager -> {
+            mView.queryOperSus(operPager);
+        }, throwable -> {
+
+        });
+    }
+
+    @Override
+    public void addUser(Oper oper) {
+        ApiFactory.Oper.addOper(oper).subscribe(operPager -> {
+
+        }, throwable -> {
 
-        },throwable -> {
+        });
+    }
+
+    @Override
+    public void querySta() {
+        ApiFactory.Sta.querySta().subscribe(sta -> {
+
+        }, throwable -> {
 
         });
     }
+
+
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/adapter/UserListAdapter.java

@@ -28,5 +28,10 @@ public class UserListAdapter extends BaseAdapter<Oper, ItemUserListItemBinding>
 
     @Override
     protected void convert(ItemUserListItemBinding mViewBinding, Oper item) {
+
+        mViewBinding.userName.setText(item.getOperName());
+        mViewBinding.userMobile.setText(String.valueOf(item.getOperMobile()));
+
+
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/user/fragment/UserListFragment.java

@@ -53,6 +53,7 @@ public class UserListFragment extends BaseFragment<UserPresenter, FragmentUserLi
         });
         adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.userRecyclerView);
         adapter.setEnableLoadMore(true);
+        adapter.loadMoreComplete();
 
         mViewBinding.titleSearch.onBack.setOnClickListener(view -> {
             getActivity().finish();

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsFragment.java

@@ -72,7 +72,7 @@ public class StatisticsFragment extends BaseFragment<StatisticsPresenter, Fragme
         mViewBinding.setTodayAmt(ConvertUtil.fenToYuan(sta.getSaleAmt(), false));
         mViewBinding.setTodayOrder(String.valueOf(sta.getSaleCount()));
         mViewBinding.setTodayRecharge(ConvertUtil.fenToYuan(sta.getCardAmt(), false));
-        mViewBinding.setTodayVipAdd(String.valueOf(sta.getVipCount()));
+        mViewBinding.setTodayVipAdd(String.valueOf(sta.getVipAddCount()));
     }
 
 }

app/src/main/java/com/xingdata/zzdpos/ui/vip/VipPresenter.java

@@ -37,7 +37,7 @@ public class VipPresenter extends VipContract.Presenter {
     public VipTruleListFragment vipMscardListFragment = new VipTruleListFragment();
     public VipSearchFragment vipSearchFragment = new VipSearchFragment();
     public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
-    public int inVipState=0; //1 充值
+    public int inVipState = 0; //1 充值
 
     @Override
     public void onAttached() {
@@ -198,18 +198,18 @@ public class VipPresenter extends VipContract.Presenter {
     @Override
     public void fullVip(Vip vipOld, Long amtPay, Long amtSend) {
         ApiFactory.Recard.fullVip(vipOld.getVipId(), amtPay, amtSend).subscribe(vip -> {
-            VipRechargeOrder mVipRechangeOrdervip=vip.getRctrace();
+            VipRechargeOrder mVipRechangeOrdervip = vip.getRctrace();
             mVipRechangeOrdervip.setCreateTime(vip.getUpdateTime());
             mVipRechangeOrdervip.setRechangeBefore(vipOld.getAcctCbal());
             mVipRechangeOrdervip.setRechangeAfter(vip.getAcctCbal());
             try {
-                ZX_PrintPOS.getInstance(App.instance).printSave(1,mVipRechangeOrdervip);
-            }catch (Exception e){
+                ZX_PrintPOS.getInstance(App.instance).printSave(1, mVipRechangeOrdervip);
+            } catch (Exception e) {
                 ToastUtils.showShort("打印异常");
             }
             mView.rechangeSus(vip);
         }, throwable -> {
-            mView.rechangeErr(vipOld, amtPay, amtSend,throwable.getMessage());
+            mView.rechangeErr(vipOld, amtPay, amtSend, throwable.getMessage());
 
         });
     }

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

@@ -24,7 +24,7 @@ public class ConvertUtil {
      * @return 元
      */
     public static String fenToYuan(Long fen) {
-        if (fen == null) return "0.0";
+        if (fen == null) return "0.00";
         return String.valueOf((double) fen / 100);
     }
 

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

@@ -25,8 +25,8 @@ public final class SystemUtil {
      * @return 设备型号
      */
     public static String getDeviceModel() {
-        return DeviceUtils.getModel();
-
+//        return DeviceUtils.getModel();
+        return "AECRC10";
     }
 
 

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

@@ -62,29 +62,29 @@
             <Button
                 android:id="@+id/btn_print"
                 style="@style/button_passive"
-                android:layout_width="@dimen/layout_statistics_bottom_button_width"
-                android:layout_height="@dimen/layout_statistics_bottom_button_height"
-                android:layout_marginStart="@dimen/all_margin_big_big"
+                android:layout_width="@dimen/button1_width"
+                android:layout_height="@dimen/button1_height"
                 android:stateListAnimator="@null"
                 android:text="@string/settle_print_receipt"
                 android:textSize="@dimen/all_text_size"
+                android:gravity="center"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toLeftOf="@id/btn_confirm"
+                app:layout_constraintRight_toLeftOf="@id/btn_return"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:targetApi="lollipop" />
 
             <Button
                 android:id="@+id/btn_return"
                 style="@style/button_positive"
-                android:layout_width="@dimen/layout_statistics_bottom_button_width"
-                android:layout_height="@dimen/layout_statistics_bottom_button_height"
-                android:layout_marginEnd="@dimen/all_margin_big_big"
+                android:layout_width="@dimen/button1_width"
+                android:layout_height="@dimen/button1_height"
                 android:stateListAnimator="@null"
                 android:text="@string/pay_return"
+                android:gravity="center"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toRightOf="@id/btn_cancel"
+                app:layout_constraintLeft_toRightOf="@id/btn_print"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_goneMarginStart="@dimen/all_margin_big_big"

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

@@ -26,20 +26,19 @@
             android:layout_height="@dimen/all_line_width"
             android:background="@color/gray_kongming" />
 
-        <LinearLayout
+        <android.support.constraint.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white_caocao"
-            android:orientation="horizontal"
-            android:weightSum="2">
+            android:orientation="horizontal">
 
             <Button
                 android:id="@+id/btn_cancel"
                 style="@style/button_passive"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/button1_width"
+                android:layout_height="@dimen/button1_height"
                 android:layout_margin="@dimen/all_padding"
-                android:layout_weight="1"
+                android:gravity="center"
                 android:stateListAnimator="@null"
                 android:text="@string/all_cancel"
                 android:textSize="@dimen/all_text_size"
@@ -52,10 +51,10 @@
             <Button
                 android:id="@+id/btn_confirm"
                 style="@style/button_positive"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/button1_width"
+                android:layout_height="@dimen/button1_height"
                 android:layout_margin="@dimen/all_padding"
-                android:layout_weight="1"
+                android:gravity="center"
                 android:stateListAnimator="@null"
                 android:text="@string/all_confirm"
                 android:textSize="@dimen/all_text_size"
@@ -65,7 +64,7 @@
                 app:layout_constraintTop_toTopOf="parent"
                 tools:targetApi="lollipop" />
 
-        </LinearLayout>
+        </android.support.constraint.ConstraintLayout>
 
     </LinearLayout>
 

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

@@ -54,8 +54,8 @@
             android:gravity="center"
             android:singleLine="true"
             android:text="￥9999"
-            android:textColor="@color/red900"
-            android:textSize="@dimen/all_text_size_big"
+            android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/handover_amt_size"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -70,6 +70,7 @@
             android:paddingTop="@dimen/all_margin"
             android:text="实收金额"
             android:textColor="@color/black_baozheng"
+            android:textSize="@dimen/all_text_size"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -108,7 +109,7 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:text="@string/handover_date"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_low" />
 
                 <TextView
                     style="@style/textView_body_small"
@@ -116,7 +117,7 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:text="@string/handover_oper"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_low" />
 
                 <TextView
                     style="@style/textView_body_small"
@@ -124,7 +125,7 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:text="@string/handover_orderNum"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_low" />
 
                 <TextView
                     style="@style/textView_body_small"
@@ -132,7 +133,7 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:text="@string/handover_cash"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_low" />
 
                 <TextView
                     style="@style/textView_body_small"
@@ -140,7 +141,7 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:text="@string/handover_wechat"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_low" />
 
                 <TextView
                     style="@style/textView_body_small"
@@ -148,7 +149,7 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:text="@string/handover_alipay"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_low" />
 
                 <TextView
                     style="@style/textView_body_small"
@@ -156,7 +157,7 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:text="@string/handover_bank"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_low" />
 
                 <TextView
                     style="@style/textView_body_small"
@@ -164,95 +165,102 @@
                     android:layout_height="wrap_content"
                     android:singleLine="true"
                     android:text="@string/handover_vip"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_low" />
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:gravity="right"
-                android:orientation="vertical">
+                android:gravity="right|center_vertical"
+                android:orientation="vertical"
+                android:paddingEnd="@dimen/dp_4"
+                android:weightSum="8">
 
                 <TextView
-                    style="@style/textView_body_small"
+
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right|center_vertical"
                     android:singleLine="true"
                     android:text="@{date}"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_small" />
 
                 <TextView
-                    style="@style/textView_body_small"
+
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right|center_vertical"
                     android:singleLine="true"
                     android:text="@{operName}"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_small" />
 
                 <TextView
-                    style="@style/textView_body_small"
+
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right|center_vertical"
                     android:singleLine="true"
                     android:text="@{orderNum}"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_small" />
 
                 <TextView
-                    style="@style/textView_body_small"
+
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right|center_vertical"
                     android:singleLine="true"
                     android:text="@{cash}"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_small" />
 
                 <TextView
-                    style="@style/textView_body_small"
+
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right|center_vertical"
                     android:singleLine="true"
                     android:text="@{wechat}"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_small" />
 
                 <TextView
-                    style="@style/textView_body_small"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right|center_vertical"
                     android:singleLine="true"
                     android:text="@{alipay}"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_small" />
 
                 <TextView
-                    style="@style/textView_body_small"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right|center_vertical"
                     android:singleLine="true"
                     android:text="@{bank}"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_small" />
 
                 <TextView
-                    style="@style/textView_body_small"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="right"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:gravity="right|center_vertical"
                     android:singleLine="true"
                     android:text="@{vipPay}"
                     android:textColor="@color/black_likui"
-                    android:textSize="@dimen/small_text_size" />
+                    android:textSize="@dimen/all_text_size_small" />
             </LinearLayout>
         </LinearLayout>
 

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

@@ -48,8 +48,7 @@
                 android:layout_height="@dimen/all_line_width"
                 android:layout_marginEnd="@dimen/all_margin"
                 android:layout_marginStart="@dimen/all_margin"
-                android:background="@color/gray_kongming"
-                android:visibility="gone" />
+                android:background="@color/gray_kongming" />
 
             <TextView
                 android:id="@+id/tv_update_vip"
@@ -59,8 +58,7 @@
                 android:gravity="center"
                 android:text="@string/sku_update_vip"
                 android:textColor="@color/blue_mawu"
-                android:textSize="@dimen/all_text_size"
-                android:visibility="gone" />
+                android:textSize="@dimen/all_text_size" />
         </LinearLayout>
 
         <TextView

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

@@ -76,21 +76,12 @@
             android:layout_height="0dp"
             android:layout_marginBottom="@dimen/all_padding"
             android:layout_marginTop="@dimen/all_padding"
+            android:background="@color/white_caocao"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@id/guideline" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintTop_toTopOf="@id/fragment_casher_recycler" />
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_kongming"
-            app:layout_constraintBottom_toBottomOf="@id/fragment_casher_recycler" />
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

 <layout>
 
-    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
@@ -9,12 +9,7 @@
         tools:context="com.example.administrator.tangkupos.CasherFragment">
 
         <!-- TODO: Update blank fragmfragment_integral_indexyout -->
-        <android.support.constraint.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.38" />
+
 
 
         <android.support.design.widget.TabLayout
@@ -22,29 +17,30 @@
             android:layout_width="match_parent"
             android:layout_height="33dp"
             android:background="@color/white_caocao"
-            app:layout_constraintTop_toTopOf="parent"
             app:tabIndicatorColor="@color/red_lvzhi"
             app:tabIndicatorHeight="@dimen/view_line_L2"
             app:tabTextColor="@color/black_baozheng">
 
         </android.support.design.widget.TabLayout>
 
+
+
         <android.support.v4.view.ViewPager
             android:id="@+id/viewPager_data"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@color/gray"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tab_layout">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/tab_layout"
+            android:layout_marginTop="-1dp"
+            android:background="@color/gray">
 
         </android.support.v4.view.ViewPager>
 
+
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"
-            android:background="@color/gray_huanggai"
-            app:layout_constraintBottom_toBottomOf="@id/tab_layout" />
-    </android.support.constraint.ConstraintLayout>
+            android:layout_above="@id/viewPager_data"
+            android:background="@color/gray_huanggai" />
+
+    </RelativeLayout>
 </layout>
\ No newline at end of file

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

 <layout>
 
-    <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
@@ -9,40 +9,36 @@
         tools:context="com.example.administrator.tangkupos.CasherFragment">
 
         <!-- TODO: Update blank fragmfragment_integral_indexyout -->
-        <android.support.constraint.Guideline
-            android:id="@+id/guideline"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.38" />
 
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"
             android:layout_height="30dp"
-            android:background="@drawable/singleline_white_gray"
-            app:layout_constraintTop_toTopOf="parent"
+            android:background="@color/white_caocao"
             app:tabIndicatorHeight="0dp"
             app:tabMinWidth="100dp"
             app:tabMode="scrollable"
             app:tabSelectedTextColor="#ff7a61"
-            app:tabTextColor="@color/gray_kongming">
+            app:tabTextColor="@color/gray_kongming" />
 
 
-        </android.support.design.widget.TabLayout>
-
         <android.support.v4.view.ViewPager
             android:id="@+id/viewPager_data"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@color/gray"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tab_layout">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@id/tab_layout"
+            android:layout_marginTop="-1dp"
+            android:background="@color/gray">
 
         </android.support.v4.view.ViewPager>
 
-    </android.support.constraint.ConstraintLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/view_line_L050"
+            android:layout_above="@id/viewPager_data"
+            android:background="@color/gray_huanggai" />
+
+    </RelativeLayout>
 </layout>
\ No newline at end of file

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

@@ -109,9 +109,8 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/all_spacing"
-            android:layout_weight="1"
             android:background="@color/white_caocao"
             android:orientation="vertical">
 
@@ -192,6 +191,11 @@
                 android:background="@color/gray_huanggai" />
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1" />
+
         <Button
             android:id="@+id/btn_confirm"
             android:layout_width="match_parent"

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

@@ -47,8 +47,8 @@
                     android:gravity="center"
                     android:singleLine="true"
                     android:text="￥9999"
-                    android:textColor="@color/red900"
-                    android:textSize="@dimen/all_text_size_big"
+                    android:textColor="@color/black_baozheng"
+                    android:textSize="@dimen/handover_amt_size"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -63,6 +63,7 @@
                     android:paddingTop="@dimen/all_margin"
                     android:text="优惠券面值"
                     android:textColor="@color/black_baozheng"
+                    android:textSize="@dimen/all_text_size"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -95,13 +96,13 @@
                             android:paddingEnd="@dimen/dp_4"
                             android:paddingStart="@dimen/dp_4"
                             android:paddingTop="@dimen/dp_4"
-                            android:weightSum="2">
+                            android:weightSum="10">
 
                             <LinearLayout
 
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_weight="1"
+                                android:layout_weight="7"
                                 android:orientation="vertical">
 
                                 <TextView
@@ -110,7 +111,7 @@
                                     android:layout_height="wrap_content"
                                     android:singleLine="true"
                                     android:text="@string/ticket_detail_date"
-                                    android:textSize="@dimen/small_text_size" />
+                                    android:textSize="@dimen/all_text_size_low" />
 
                                 <TextView
                                     style="@style/textView_body_small"
@@ -118,37 +119,38 @@
                                     android:layout_height="wrap_content"
                                     android:singleLine="true"
                                     android:text="@string/ticket_detail_no"
-                                    android:textSize="@dimen/small_text_size" />
+                                    android:textSize="@dimen/all_text_size_low" />
 
 
                             </LinearLayout>
 
                             <LinearLayout
                                 android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
+                                android:layout_height="match_parent"
+                                android:layout_weight="3"
                                 android:gravity="right"
-                                android:orientation="vertical">
+                                android:orientation="vertical"
+                                android:weightSum="2">
 
                                 <TextView
                                     style="@style/textView_body_small"
                                     android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="1"
+                                    android:gravity="right|center_vertical"
                                     android:singleLine="true"
                                     android:text="@{date}"
-                                    android:textColor="@color/black_likui"
-                                    android:textSize="@dimen/small_text_size" />
+                                    android:textColor="@color/black_likui" />
 
                                 <TextView
                                     style="@style/textView_body_small"
                                     android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="right"
+                                    android:layout_height="0dp"
+                                    android:layout_weight="1"
+                                    android:gravity="right|center_vertical"
                                     android:singleLine="true"
                                     android:text="@{orderNo}"
-                                    android:textColor="@color/black_likui"
-                                    android:textSize="@dimen/small_text_size" />
+                                    android:textColor="@color/black_likui" />
 
 
                             </LinearLayout>

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

@@ -232,6 +232,8 @@
     <dimen name="button3_height">44dp</dimen>
     <dimen name="button3_marginHorizontal">16dp</dimen>
     <dimen name="button3_width">328dp</dimen>
+    <!--交班-->
+    <dimen name="handover_amt_size">34sp</dimen>
 
 
 </resources>