修改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/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>
 
 
     <!--盘点界面-->