修改BUG;

.idea/dictionaries/Eurus.xml

+<component name="ProjectDictionaryState">
+  <dictionary name="Eurus">
+    <words>
+      <w>baseinfo</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file

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

@@ -174,7 +174,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.dismissAllDialog();
                             this.getSkugrp();
                         }, throwable -> {
-                           ToastUtils.showShort(throwable.getMessage());
+                            ToastUtils.showShort(throwable.getMessage());
                         })
         );
     }
@@ -195,7 +195,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.dismissAllDialog();
                             this.getSkugrp();
                         }, throwable -> {
-                           ToastUtils.showShort(throwable.getMessage());
+                            ToastUtils.showShort(throwable.getMessage());
                         })
         );
     }
@@ -212,7 +212,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.dismissAllDialog();
                             this.getSkugrp();
                         }, throwable -> {
-                          ToastUtils.showShort(throwable.getMessage());
+                            ToastUtils.showShort(throwable.getMessage());
                         })
         );
     }
@@ -230,7 +230,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                                 mView.addSku(sssku1);
                             }
                         },
-                        throwable ->  ToastUtils.showShort(throwable.getMessage()));
+                        throwable -> ToastUtils.showShort(throwable.getMessage()));
                 break;
             case C.SKU_EDITOR_MODE.UPDATE:
                 ApiFactory.Sssku.update(sssku).subscribe(
@@ -244,7 +244,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             } else {
                                 mView.deleteSku(sssku1.getId());
                             }
-                        }, throwable ->  ToastUtils.showShort(throwable.getMessage()));
+                        }, throwable -> ToastUtils.showShort(throwable.getMessage()));
                 break;
             case C.SKU_EDITOR_MODE.UNKNOWN:
                 ApiFactory.Sssku.addSssku(sssku).subscribe(
@@ -255,7 +255,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
                                 mView.addSku(sssku1);
                             }
-                        }, throwable ->  ToastUtils.showShort(throwable.getMessage()));
+                        }, throwable -> ToastUtils.showShort(throwable.getMessage()));
                 break;
         }
     }
@@ -304,7 +304,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
         mView.showLoadingDialog();
         mCompositeDisposable.add(
                 ApiFactory.Sssku.querySssku(mPageNum, "", mSkuGrpId)
-                        .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
+                        .doOnSubscribe(subscription -> mView.showLoadingDialog())
+                        .doFinally(() -> mView.dismissLoadingDialog())
                         .subscribe(ssskuPager -> {
                             if (mPageNum == 1 && mSkuGrpId == 0L)
                                 mView.loadSsskuCount(ssskuPager.getTotalRow());
@@ -338,7 +339,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                 ApiFactory.Sskugrp.querySskugrp().subscribe(sskugrpPager -> {
                             mView.loadSkugrps(sskugrpPager.getList());
                         }, throwable -> {
-                          ToastUtils.showShort(throwable.getMessage());
+                            ToastUtils.showShort(throwable.getMessage());
                         }
                 )
         );

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

@@ -101,16 +101,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                                         mLoadingDialog);
                             } else if (nowtype == 1) {
                                 Long tempLevelId = levelList.get(nowVipGroupId).getId();
-                                if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
+                                if (tempLevelId == SendTickerC.getVipType(mContext).get(0).getId()) {
                                     //选择全部会员
                                     mPresenter.sendTickerBefor(null, null, null, tickerId,
                                             mLoadingDialog);
                                     return;
                                 }
-                                for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
+                                for (int i = 1; i < SendTickerC.getVipType(mContext).size(); i++) {
                                     long tempServerId = SendTickerC.getServerId(tempLevelId);
                                     //选择 当月下月以及流失会员
-                                    if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
+                                    if (tempLevelId == SendTickerC.getVipType(mContext).get(i).getId() &&
                                             tempServerId != -1) {
                                         mPresenter.sendTickerBefor(tempServerId + "", null,
                                                 null, tickerId,
@@ -203,16 +203,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                     mLoadingDialog);
         } else if (nowtype == 1) {
             Long tempLevelId = levelList.get(nowVipGroupId).getId();
-            if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
+            if (tempLevelId == SendTickerC.getVipType(mContext).get(0).getId()) {
                 //选择全部会员
                 mPresenter.sendTicker(null, null, null, tickerId,
                         mLoadingDialog);
                 return;
             }
-            for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
+            for (int i = 1; i < SendTickerC.getVipType(mContext).size(); i++) {
                 long tempServerId = SendTickerC.getServerId(tempLevelId);
                 //选择 当月下月以及流失会员
-                if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
+                if (tempLevelId == SendTickerC.getVipType(mContext).get(i).getId() &&
                         tempServerId != -1) {
                     mPresenter.sendTicker(tempServerId + "", null,
                             null, tickerId,
@@ -234,15 +234,15 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
         mViewBinding.llAll.setVisibility(View.VISIBLE);
         RealmResults<Level> levels = DBFactory.getRealm().where(Level.class).findAll();
         levelList = new ArrayList<>();
-        SendTickerC.getVipType().get(0).setSelect(true);
-        levelList.add(SendTickerC.getVipType().get(0));
+        SendTickerC.getVipType(mContext).get(0).setSelect(true);
+        levelList.add(SendTickerC.getVipType(mContext).get(0));
         for (int i = 0; i < levels.size(); i++) {
             levels.get(i).setSelect(false);
             levelList.add(levels.get(i));
         }
-        for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
-            SendTickerC.getVipType().get(i).setSelect(false);
-            levelList.add(SendTickerC.getVipType().get(i));
+        for (int i = 1; i < SendTickerC.getVipType(mContext).size(); i++) {
+            SendTickerC.getVipType(mContext).get(i).setSelect(false);
+            levelList.add(SendTickerC.getVipType(mContext).get(i));
         }
         mViewBinding.tvSelect.setText(levelList.get(nowVipGroupId).getVipLevelName());
         mViewBinding.vipType.setAdapter(vipGroupAdapter);

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
+<layout 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">
+    
     <data>
-
+        
         <import type="android.view.View" />
-
+        
         <variable
             name="sumNum"
             type="String" />
-
+        
         <variable
             name="finallyPrice"
             type="String" />
-
+        
         <variable
             name="isShowSupplier"
             type="Boolean" />
-
+        
         <variable
             name="isShowBar"
             type="Boolean" />
-
+        
         <variable
             name="shopOderName"
             type="String" />
-
+        
         <variable
             name="shopName"
             type="String" />
-
+        
         <variable
             name="shopAddress"
             type="String" />
-
+        
         <variable
             name="shopTel"
             type="String" />
-
-
+        
+        
         <variable
             name="supplierName"
             type="String" />
-
+        
         <variable
             name="supplierAddress"
             type="String" />
-
+        
         <variable
             name="supplierTel"
             type="String" />
-
+        
         <variable
             name="date"
             type="String" />
-
+        
         <variable
             name="no"
             type="String" />
     </data>
-
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+    
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white_caocao"
         android:splitMotionEvents="false">
-
+        
         <android.support.design.widget.CoordinatorLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_above="@id/ll_bottom"
             android:layout_below="@id/ed_title"
             android:layout_marginTop="@dimen/all_bounced_padding">
-
+            
             <android.support.design.widget.AppBarLayout
                 android:id="@+id/app_bar"
                 android:layout_width="match_parent"
@@ -81,8 +81,8 @@
                 android:gravity="center"
                 app:elevation="0dp"
                 app:layout_scrollFlags="snap">
-
-
+                
+                
                 <android.support.design.widget.CollapsingToolbarLayout
                     android:id="@+id/collapsingToolbarLayout"
                     android:layout_width="match_parent"
@@ -90,26 +90,26 @@
                     android:fitsSystemWindows="true"
                     app:expandedTitleMarginStart="0dp"
                     app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
-
+                    
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:background="@color/white_caocao"
                         android:orientation="vertical">
-
+                        
                         <android.support.constraint.ConstraintLayout
                             android:id="@+id/cl_default"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
-
+                            
                             <TextView
                                 android:id="@+id/tv_supplier_title"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginEnd="@dimen/all_bounced_padding"
-                                android:paddingBottom="@dimen/all_padding"
                                 android:paddingStart="@dimen/all_bounced_padding"
                                 android:paddingTop="@dimen/all_padding"
+                                android:paddingBottom="@dimen/all_padding"
                                 android:text="供货方"
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/all_text_size_low"
@@ -118,7 +118,7 @@
                                 app:layout_constraintRight_toRightOf="parent"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="parent" />
-
+                            
                             <TextView
                                 android:id="@+id/tv_supplier_name"
                                 android:layout_width="wrap_content"
@@ -132,8 +132,8 @@
                                 app:layout_constraintBottom_toBottomOf="@id/tv_supplier_title"
                                 app:layout_constraintEnd_toEndOf="@id/tv_supplier_title"
                                 app:layout_constraintTop_toTopOf="@id/tv_supplier_title" />
-
-
+                            
+                            
                             <View
                                 android:id="@+id/view_line_left_1"
                                 android:layout_width="match_parent"
@@ -141,17 +141,17 @@
                                 android:background="@color/gray_kongming"
                                 android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
                                 app:layout_constraintTop_toBottomOf="@id/tv_supplier_title" />
-
+                            
                             <LinearLayout
                                 android:id="@+id/ll_supplier"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:orientation="vertical"
-                                android:paddingEnd="@dimen/all_bounced_padding"
                                 android:paddingStart="@dimen/all_bounced_padding"
+                                android:paddingEnd="@dimen/all_bounced_padding"
                                 android:visibility="gone"
                                 app:layout_constraintTop_toTopOf="@id/view_line_left_1">
-
+                                
                                 <LinearLayout
                                     android:id="@+id/ll_supplier_name"
                                     android:layout_width="match_parent"
@@ -159,90 +159,90 @@
                                     android:gravity="center_vertical"
                                     android:orientation="horizontal"
                                     android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}">
-
+                                    
                                     <ImageView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:src="@mipmap/icon_stores" />
-
+                                    
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:paddingBottom="@dimen/dp_4"
                                         android:paddingLeft="@dimen/all_padding"
                                         android:paddingTop="@dimen/dp_4"
+                                        android:paddingBottom="@dimen/dp_4"
                                         android:text="@{supplierName}"
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/all_text_size_low" />
                                 </LinearLayout>
-
+                                
                                 <LinearLayout
                                     android:id="@+id/ll_supplier_address"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:gravity="center_vertical"
-
+                                    
                                     android:orientation="horizontal"
                                     android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}">
-
+                                    
                                     <ImageView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:src="@mipmap/icon_address" />
-
+                                    
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:paddingBottom="@dimen/dp_4"
                                         android:paddingLeft="@dimen/all_padding"
                                         android:paddingTop="@dimen/dp_4"
+                                        android:paddingBottom="@dimen/dp_4"
                                         android:text="@{supplierAddress}"
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/all_text_size_low" />
                                 </LinearLayout>
-
+                                
                                 <LinearLayout
                                     android:id="@+id/ll_supplier_phone"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:gravity="center_vertical"
-
+                                    
                                     android:orientation="horizontal"
                                     android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}">
-
+                                    
                                     <ImageView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:src="@mipmap/icon_telephone" />
-
+                                    
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:paddingBottom="@dimen/dp_4"
                                         android:paddingLeft="@dimen/all_padding"
                                         android:paddingTop="@dimen/dp_4"
+                                        android:paddingBottom="@dimen/dp_4"
                                         android:text="@{supplierTel}"
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/all_text_size_low" />
                                 </LinearLayout>
-
-
+                            
+                            
                             </LinearLayout>
-
+                            
                             <TextView
                                 android:id="@+id/tv_shop_title"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginEnd="@dimen/all_bounced_padding"
-                                android:paddingBottom="@dimen/all_padding"
                                 android:paddingStart="@dimen/all_bounced_padding"
                                 android:paddingTop="@dimen/all_padding"
+                                android:paddingBottom="@dimen/all_padding"
                                 android:text="定货方"
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/all_text_size_low"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toBottomOf="@id/ll_supplier" />
-
+                            
                             <TextView
                                 android:id="@+id/tv_shop_name"
                                 android:layout_width="wrap_content"
@@ -255,25 +255,25 @@
                                 app:layout_constraintBottom_toBottomOf="@id/tv_shop_title"
                                 app:layout_constraintEnd_toEndOf="@id/tv_shop_title"
                                 app:layout_constraintTop_toTopOf="@id/tv_shop_title" />
-
-
+                            
+                            
                             <View
                                 android:id="@+id/view_line_left_2"
                                 android:layout_width="match_parent"
                                 android:layout_height="@dimen/all_slight_line_width"
                                 android:background="@color/gray_kongming"
                                 app:layout_constraintTop_toBottomOf="@id/tv_shop_title" />
-
+                            
                             <LinearLayout
                                 android:id="@+id/ll_shop"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:orientation="vertical"
-                                android:paddingEnd="@dimen/all_bounced_padding"
                                 android:paddingStart="@dimen/all_bounced_padding"
+                                android:paddingEnd="@dimen/all_bounced_padding"
                                 android:visibility="gone"
                                 app:layout_constraintTop_toBottomOf="@id/tv_shop_title">
-
+                                
                                 <LinearLayout
                                     android:id="@+id/ll_shop_name"
                                     android:layout_width="match_parent"
@@ -283,79 +283,79 @@
                                     app:layout_constraintEnd_toEndOf="parent"
                                     app:layout_constraintStart_toStartOf="parent"
                                     app:layout_constraintTop_toTopOf="@id/view_line_left_2">
-
+                                    
                                     <ImageView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:src="@mipmap/icon_stores" />
-
+                                    
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:paddingBottom="@dimen/dp_4"
                                         android:paddingLeft="@dimen/all_padding"
                                         android:paddingTop="@dimen/dp_4"
+                                        android:paddingBottom="@dimen/dp_4"
                                         android:text="@{shopName}"
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/all_text_size_low" />
                                 </LinearLayout>
-
+                                
                                 <LinearLayout
                                     android:id="@+id/ll_shop_address"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-
+                                    
                                     android:gravity="center_vertical"
                                     android:orientation="horizontal"
                                     app:layout_constraintEnd_toEndOf="@id/ll_shop_name"
                                     app:layout_constraintStart_toStartOf="@id/ll_shop_name"
                                     app:layout_constraintTop_toBottomOf="@id/ll_shop_name">
-
+                                    
                                     <ImageView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:src="@mipmap/icon_address" />
-
+                                    
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:paddingBottom="@dimen/dp_4"
                                         android:paddingLeft="@dimen/all_padding"
                                         android:paddingTop="@dimen/dp_4"
+                                        android:paddingBottom="@dimen/dp_4"
                                         android:text="@{shopAddress}"
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/all_text_size_low" />
                                 </LinearLayout>
-
+                                
                                 <LinearLayout
                                     android:id="@+id/ll_shop_phone"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:gravity="center_vertical"
                                     android:orientation="horizontal"
-
+                                    
                                     app:layout_constraintEnd_toEndOf="@id/ll_shop_name"
                                     app:layout_constraintStart_toStartOf="@id/ll_shop_name"
                                     app:layout_constraintTop_toBottomOf="@id/ll_shop_address">
-
+                                    
                                     <ImageView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:src="@mipmap/icon_telephone" />
-
+                                    
                                     <TextView
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
-                                        android:paddingBottom="@dimen/dp_4"
                                         android:paddingLeft="@dimen/all_padding"
                                         android:paddingTop="@dimen/dp_4"
+                                        android:paddingBottom="@dimen/dp_4"
                                         android:text="@{shopTel}"
                                         android:textColor="@color/black"
                                         android:textSize="@dimen/all_text_size_low" />
                                 </LinearLayout>
                             </LinearLayout>
-
-
+                            
+                            
                             <View
                                 android:id="@+id/view_line_left_3"
                                 android:layout_width="match_parent"
@@ -363,70 +363,70 @@
                                 android:background="@color/gray_kongming"
                                 android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
                                 app:layout_constraintTop_toBottomOf="@id/ll_shop" />
-
+                            
                             <LinearLayout
                                 android:id="@+id/ll_date"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:gravity="center_vertical"
                                 android:orientation="horizontal"
-                                android:paddingEnd="@dimen/all_bounced_padding"
                                 android:paddingStart="@dimen/all_bounced_padding"
+                                android:paddingEnd="@dimen/all_bounced_padding"
                                 android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
                                 app:layout_constraintEnd_toEndOf="@id/ll_shop"
                                 app:layout_constraintStart_toStartOf="@id/ll_shop"
                                 app:layout_constraintTop_toBottomOf="@id/view_line_left_3">
-
+                                
                                 <ImageView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:src="@mipmap/icon_dates_green" />
-
+                                
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:paddingBottom="@dimen/dp_4"
                                     android:paddingLeft="@dimen/all_padding"
                                     android:paddingTop="@dimen/dp_4"
+                                    android:paddingBottom="@dimen/dp_4"
                                     android:text="@{date}"
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/all_text_size_low" />
                             </LinearLayout>
-
+                            
                             <LinearLayout
                                 android:id="@+id/ll_no"
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 android:gravity="center_vertical"
                                 android:orientation="horizontal"
-                                android:paddingEnd="@dimen/all_bounced_padding"
                                 android:paddingStart="@dimen/all_bounced_padding"
+                                android:paddingEnd="@dimen/all_bounced_padding"
                                 android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
                                 app:layout_constraintEnd_toEndOf="@id/ll_shop"
                                 app:layout_constraintStart_toStartOf="@id/ll_shop"
                                 app:layout_constraintTop_toBottomOf="@id/ll_date">
-
+                                
                                 <ImageView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:src="@mipmap/icon_no_green" />
-
+                                
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
-                                    android:paddingBottom="@dimen/dp_4"
                                     android:paddingLeft="@dimen/all_padding"
                                     android:paddingTop="@dimen/dp_4"
+                                    android:paddingBottom="@dimen/dp_4"
                                     android:text="@{no}"
                                     android:textColor="@color/black"
                                     android:textSize="@dimen/all_text_size_low" />
                             </LinearLayout>
-
-
+                        
+                        
                         </android.support.constraint.ConstraintLayout>
                     </LinearLayout>
-
-
+                    
+                    
                     <android.support.v7.widget.Toolbar
                         android:id="@+id/toolbar"
                         android:layout_width="match_parent"
@@ -439,11 +439,11 @@
                         app:contentInsetStart="0dp"
                         app:elevation="0dp"
                         app:layout_collapseMode="pin">
-
+                        
                         <android.support.constraint.ConstraintLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent">
-
+                            
                             <LinearLayout
                                 android:id="@+id/ll_result"
                                 android:layout_width="180dp"
@@ -452,21 +452,21 @@
                                 android:orientation="horizontal"
                                 app:layout_constraintEnd_toEndOf="parent"
                                 app:layout_constraintTop_toBottomOf="@id/tv_result_hint">
-
+                                
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:gravity="center"
-                                    android:paddingBottom="@dimen/dp_4"
                                     android:paddingLeft="@dimen/all_padding"
-                                    android:paddingRight="@dimen/all_padding"
                                     android:paddingTop="@dimen/all_padding"
+                                    android:paddingRight="@dimen/all_padding"
+                                    android:paddingBottom="@dimen/dp_4"
                                     android:text="@{finallyPrice}"
                                     android:textColor="@color/reddeep"
                                     android:textSize="@dimen/big_big_text_size" />
                             </LinearLayout>
-
-
+                            
+                            
                             <LinearLayout
                                 android:id="@+id/ll_num"
                                 android:layout_width="0dp"
@@ -478,7 +478,7 @@
                                 app:layout_constraintHorizontal_weight="1"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintTop_toTopOf="@id/ll_result">
-
+                                
                                 <TextView
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
@@ -487,11 +487,11 @@
                                     android:textColor="@color/reddeep"
                                     android:textSize="@dimen/big_big_text_size"
                                     android:textStyle="bold" />
-
-
+                            
+                            
                             </LinearLayout>
-
-
+                            
+                            
                             <TextView
                                 android:id="@+id/tv_result_hint"
                                 android:layout_width="wrap_content"
@@ -505,7 +505,7 @@
                                 app:layout_constraintStart_toStartOf="@id/ll_result"
                                 app:layout_constraintTop_toBottomOf="@id/ll_no"
                                 tools:ignore="NotSibling" />
-
+                            
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
@@ -518,19 +518,19 @@
                                 app:layout_constraintEnd_toEndOf="@id/ll_num"
                                 app:layout_constraintStart_toStartOf="@id/ll_num"
                                 app:layout_constraintTop_toTopOf="@id/tv_result_hint" />
-
+                            
                             <View
                                 android:layout_width="match_parent"
                                 android:layout_height="@dimen/all_bounced_padding"
                                 android:background="@drawable/singleline_zhouyu_huanggai"
                                 app:layout_constraintTop_toBottomOf="@id/ll_result" />
                         </android.support.constraint.ConstraintLayout>
-
+                    
                     </android.support.v7.widget.Toolbar>
-
+                
                 </android.support.design.widget.CollapsingToolbarLayout>
             </android.support.design.widget.AppBarLayout>
-
+            
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recycler_view"
                 android:layout_width="match_parent"
@@ -538,71 +538,71 @@
                 android:background="@color/gray_zhouyu"
                 android:visibility="visible"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
+            
             </android.support.v7.widget.RecyclerView>
-
+        
         </android.support.design.widget.CoordinatorLayout>
-
-
+        
+        
         <EditText
             android:id="@+id/ed_title"
             style="@style/searchBarEditor"
             android:layout_width="match_parent"
             android:layout_height="30dp"
             android:layout_alignParentTop="true"
-            android:layout_marginBottom="@dimen/padding_small"
-            android:layout_marginEnd="@dimen/all_bounced_padding"
             android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/padding_small"
+            android:layout_marginEnd="@dimen/all_bounced_padding"
+            android:layout_marginBottom="@dimen/padding_small"
             android:drawablePadding="@dimen/all_padding"
             android:hint="@string/statistics_order_edit_hint"
             android:inputType="number"
             android:textColor="@color/black_likui"
             android:textSize="@dimen/all_text_size_low" />
-
-
+        
+        
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/all_bounced_padding"
             android:layout_below="@id/ed_title"
             android:background="@drawable/singleline_zhouyu_huanggai" />
-
-
+        
+        
         <android.support.constraint.ConstraintLayout
             android:id="@+id/ll_bottom"
             android:layout_width="match_parent"
             android:layout_height="@dimen/layout_statistics_bottom_height"
-            android:layout_alignParentBottom="true"
             android:layout_alignParentStart="true"
+            android:layout_alignParentBottom="true"
             android:background="@color/white_caocao"
             app:layout_constraintBottom_toBottomOf="parent">
-
+            
             <TextView
                 android:id="@+id/btn_cancel"
                 style="@style/button_passive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
-                android:text="取消"
+                android:text="@string/all_cancel"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/btn_ok"
                 app:layout_constraintTop_toTopOf="parent" />
-
+            
             <TextView
                 android:id="@+id/btn_ok"
                 style="@style/button_positive"
                 android:layout_width="@dimen/button1_width"
                 android:layout_height="@dimen/button1_height"
-                android:text="定货提交"
+                android:text="@string/settle_complete"
                 android:textSize="@dimen/all_text_size"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_cancel"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
-
+        
         </android.support.constraint.ConstraintLayout>
-
+        
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/view_line_L050"

app/src/main/res/values-en/strings_chen.xml

@@ -26,6 +26,7 @@
     <string name="replenishment_hint_supplierName">Please enter the supplier name</string>
     <string name="replenishment_tv_replenishmentDetail">Order details</string>
     <string name="replenishment_toast_noNeedDo">Stock is normal</string>
+    <string name="replenishment_tv_amt">Amount</string>
 
 
     <!--盘点界面-->
@@ -68,7 +69,7 @@
     <string name="ticket_tv_sendSuc">Successful issue</string>
     <string name="ticket_default_allVip">All vip</string>
     <string name="ticket_default_monthBirthday">Birthday of this month</string>
-    <string name="ticket_default_nextMonthBirthday">Next month's birthday</string>
+    <string name="ticket_default_nextMonthBirthday">Next month\'s birthday</string>
     <string name="ticket_default_lostVip">Lost Vip</string>
 
 

app/src/main/res/values-zh/strings_chen.xml

@@ -3,17 +3,17 @@
     <!--店员管理-->
     <string name="user_toast_changeSuc">修改成功</string>
     <string name="user_toast_ifDeleteUser">确定是否删除店员？</string>
-
-
+    
+    
     <!--商品管理-->
     <string name="sku_default_skuname">无</string>
     <string name="sku_default_grpName">全部商品</string>
     <string name="sku_title_iconHad">已有</string>
     <string name="sku_title_iconAdd">新增</string>
-
-
+    
+    
     <string name="sku_toast_doSuc">操作成功</string>
-
+    
     <!--补货管理-->
     <string name="replenishment_toast_ifDelete">是否删除</string>
     <string name="replenishment_tv_item">种</string>
@@ -26,15 +26,16 @@
     <string name="replenishment_hint_supplierName">请输入供货商名称</string>
     <string name="replenishment_tv_replenishmentDetail">定货详情</string>
     <string name="replenishment_toast_noNeedDo">库存正常，无需补货</string>
-
-
+    <string name="replenishment_tv_amt">金额</string>
+    
+    
     <!--盘点界面-->
     <string name="inventory_tv_cnt">盘点件数：</string>
     <string name="inventory_tv_result">盘点结果：</string>
     <string name="inventory_tv_date">盘点时间：</string>
     <string name="inventory_tv_num">构成数量：</string>
     <string name="inventory_tv_systemCnt">系统库存：</string>
-
+    
     <string name="inventory_tv_noEsc">暂不退出</string>
     <string name="inventory_toast_ifDelete">退出前是否删除本次盘库记录</string>
     <string name="inventory_toast_ifAdd">请确认添加记录</string>
@@ -42,7 +43,7 @@
     <string name="inventory_toast_skuDone">商品已盘点</string>
     <string name="inventory_toast_ifDelete2">请确认删除此记录</string>
     <string name="inventory_tv_item">条目</string>
-
+    
     <!--统计界面-->
     <string name="statistics_tv_this">本店</string>
     <string name="statistics_tv_dateM">月</string>
@@ -50,7 +51,7 @@
     <string name="statistics_tv_orderList">订单列表</string>
     <string name="statistics_toast_noPrint">无法打印</string>
     <string name="statistics_toast_refundSuc">退货成功</string>
-
+    
     <!--发券-->
     <string name="ticket_default_noDiscount">无折扣</string>
     <string name="ticket_title_allVip">全部会员</string>
@@ -72,6 +73,4 @@
     <string name="ticket_default_lostVip">流失会员</string>
 
 
-
-
 </resources>

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

@@ -26,6 +26,7 @@
     <string name="replenishment_hint_supplierName">请输入供货商名称</string>
     <string name="replenishment_tv_replenishmentDetail">定货详情</string>
     <string name="replenishment_toast_noNeedDo">库存正常，无需补货</string>
+    <string name="replenishment_tv_amt">金额</string>
 
 
     <!--盘点界面-->