Merge remote-tracking branch 'origin/master'

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

@@ -120,7 +120,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
         mInventoryGoodsAdapter.setEmptyView(getEmptyView());
         mInventoryGoodsAdapter.setOnItemLongClickListener((adapter, view, position) -> {
             PromptDialog delDialog = new PromptDialog();
-            delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
+            delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, getString(R.string.replenishment_toast_ifDelete)).setClick(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     adapter.getData().remove(position);
@@ -139,7 +139,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
             switch (view.getId()) {
                 case R.id.btn_ok:
                     PromptDialog promptDialog = new PromptDialog();
-                    promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "请确认添加记录").setClick(view1 -> {
+                    promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, getString(R.string.inventory_toast_ifAdd)).setClick(view1 -> {
                         mPresenter.clickOkCsDetail(mInventoryGoodsAdapter.getData().get(position), mCs);
                         promptDialog.dismiss();
                     }, view1 -> {
@@ -160,10 +160,10 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
     public void addInventoryGoodsItem(List<Sssku> list) {
         for (Sssku s : list) {
             if (topCsList.contains(s)) {
-                ToastUtils.showShort("商品已存在");
+                ToastUtils.showShort(getString(R.string.inventory_toast_skuHad));
             } else {
                 if (bottomCsList.contains(s)) {
-                    ToastUtils.showShort("商品已盘点");
+                    ToastUtils.showShort(getString(R.string.inventory_toast_skuDone));
                 } else {
                     topCsList.add(s);
                 }
@@ -181,13 +181,13 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
     public void addInventoryGoodsItem(Sssku sssku) {
         if (!topCsList.contains(sssku)) {
             if (bottomCsList.contains(sssku)) {
-                ToastUtils.showShort("商品已盘点");
+                ToastUtils.showShort(getString(R.string.inventory_toast_skuDone));
             } else {
                 topCsList.add(sssku);
             }
 
         } else {
-            ToastUtils.showShort("商品已存在");
+            ToastUtils.showShort(getString(R.string.inventory_toast_skuHad));
 
         }
 
@@ -204,11 +204,11 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
         topCsList.remove(sssku);
         mInventoryGoodsAdapter.notifyDataSetChanged();
         if (isResult) {
-            mViewBinding.setResult("相符");
-            mCartDialog.setResult("相符");
+            mViewBinding.setResult(getString(R.string.inventory_adapter_tally));
+            mCartDialog.setResult(getString(R.string.inventory_adapter_tally));
         } else {
-            mViewBinding.setResult("不相符");
-            mCartDialog.setResult("不相符");
+            mViewBinding.setResult(getString(R.string.inventory_adapter_no_tally));
+            mCartDialog.setResult(getString(R.string.inventory_adapter_no_tally));
         }
     }
 

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

@@ -88,7 +88,7 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
         );
         mInventoryAdapter.setOnItemLongClickListener((adapter, view, position) -> {
             PromptDialog promptDialog = new PromptDialog();
-            promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "请确认删除此记录").setClick(view1 -> {
+            promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, getString(R.string.inventory_toast_ifDelete2)).setClick(view1 -> {
                 mPresenter.delInventoryItem(mInventoryAdapter.getData().get(position));
                 promptDialog.dismiss();
             }, view1 -> {
@@ -104,7 +104,7 @@ public class InventoryFragment extends BaseFragment<InventoryPresenter, Fragment
 
     //
     public void setCount(int count) {
-        mViewBinding.tvCount.setText("共" + count + "人次盘库记录");
+        mViewBinding.tvCount.setText(count + getString(R.string.inventory_tv_item) );
     }
 
     public void setCount(String count) {

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentActivity.java

@@ -8,6 +8,7 @@ import com.blankj.utilcode.constant.PermissionConstants;
 import com.blankj.utilcode.util.FragmentUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.PermissionUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.databinding.ActivityReplenishmentBinding;
@@ -117,10 +118,14 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
 
     @Override
     public void openReplenishmentDetailFragment(List<Sssku> ssskuList) {
+        if (ssskuList.size() == 0) {
+            ToastUtils.showShort(getString(R.string.replenishment_toast_noNeedDo));
+            return;
+        }
         if (isAllowFragment) {
             isAllowFragment = false;
             mReplenishmentDetailFragment.setSsskuList(ssskuList);
-            changeTitle("一键补货", true);
+            changeTitle(getString(R.string.manage_replenishment_add), true);
             start(mReplenishmentDetailFragment);
         }
 
@@ -131,7 +136,7 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
         if (isAllowFragment) {
             isAllowFragment = false;
             mReplenishmentDetailFragment.setPsb(psb);
-            changeTitle("定货详情", true);
+            changeTitle(getString(R.string.replenishment_tv_replenishmentDetail), true);
             start(mReplenishmentDetailFragment);
         }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/ReplenishmentPresenter.java

@@ -37,11 +37,10 @@ public class ReplenishmentPresenter extends ReplenishmentContract.Presenter {
             mView.isShowLoading(false);
         })
                 .subscribe(ssskuPager -> {
-                    if (ssskuPager.getList().size() == 0) {
-                        ToastUtils.showShort("库存正常，无需补货");
-                    } else {
+
+
                         mView.openReplenishmentDetailFragment(ssskuPager.getList());
-                    }
+
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
                 });

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/adpter/ReplenishmentAdapter.java

@@ -33,13 +33,13 @@ public class ReplenishmentAdapter extends BaseAdapter<Psb, ItemReplenishmentBind
         mViewBinding.setShopName(LoginPresenter.loginReturnBean.getShopNameAbcn());
         switch (item.getPsbStatus()) {
             case 3:
-                mViewBinding.setStatus("待确认");
+                mViewBinding.setStatus(mContext.getString(R.string.manage_replenishment_unConfirmed));
                 break;
             case 1:
-                mViewBinding.setStatus("待收货");
+                mViewBinding.setStatus(mContext.getString(R.string.manage_replenishment_unReceive));
                 break;
             case 0:
-                mViewBinding.setStatus("已入库");
+                mViewBinding.setStatus(mContext.getString(R.string.manage_replenishment_finished));
                 break;
         }
         mViewBinding.setSupplierName(item.getOutChannelNameabcn());

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/adpter/ReplenishmentDetailAdapter.java

@@ -35,7 +35,7 @@ public class ReplenishmentDetailAdapter extends BaseAdapter<Sssku, ItemReplenish
         mViewBinding.imgGoods.setImageURI(item.getSpuImg());
         mViewBinding.tvGoodsName.setText(item.getSpuName());
         mViewBinding.tvGoodsCode.setText(item.getSpuBarcode() + "");
-        mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
+        mViewBinding.tvGoodsSize.setText(mContext.getString(R.string.sku_size) + item.getSpuUnitName());
         mViewBinding.tvGoodsPrice.setText(ConvertUtil.fenToYuan(item.getSkuCost(), false));
         mViewBinding.tvStock.setText(item.getSkuStock() + item.getSpuUnitName());
         if (item.getSkuCnt() != null) {

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentDetailFragment.java

@@ -174,7 +174,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
 
         mReplenishmentDetailAdapter.setOnItemLongClickListener((adapter, view, position) -> {
             PromptDialog delDialog = new PromptDialog();
-            delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "是否删除").setClick(new View.OnClickListener() {
+            delDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, getString(R.string.replenishment_toast_ifDelete)).setClick(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
                     mReplenishmentDetailAdapter.getData().remove(position);
@@ -211,10 +211,10 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
             mViewBinding.setNo(mPsb.getPsbNo());
         }
         if (this.ssskuList.size() != 0) {
-            mViewBinding.setSumNum(ssskuList.size() + "种");
+            mViewBinding.setSumNum(ssskuList.size() + getString(R.string.replenishment_tv_item));
             mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(getSumPrice(), true));
         } else {
-            mViewBinding.setSumNum("0个");
+            mViewBinding.setSumNum("0");
             mViewBinding.setFinallyPrice("￥0.00");
         }
         mViewBinding.setShopOderName(LoginPresenter.loginReturnBean.getOperName());
@@ -225,10 +225,10 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
         if (mPsb != null && mPsb.getPsbStatus() != null) {
             switch (mPsb.getPsbStatus()) {
                 case 3:
-                    mViewBinding.btnOk.setText("修改订单");
+                    mViewBinding.btnOk.setText(getString(R.string.replenishment_tv_editOrder));
                     break;
                 case 1:
-                    mViewBinding.btnOk.setText("确认收货");
+                    mViewBinding.btnOk.setText(getString(R.string.replenishment_tv_takeOver));
                     break;
                 case 0:
                     mViewBinding.llBottom.setVisibility(View.GONE);
@@ -284,7 +284,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
     public void scrollToItem(String string) {
 
         if (string.length() == 0) {
-            ToastUtils.showShort("请输入搜索内容");
+            ToastUtils.showShort(getString(R.string.replenishment_toast_seachText));
             return;
         }
 
@@ -295,7 +295,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
             if (matcher.find()) {
                 ((LinearLayoutManager) mViewBinding.recyclerView.getLayoutManager()).scrollToPositionWithOffset(i, 0);
                 mPresenter.popScan();
-                ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
+                ToastUtils.showShort(getString(R.string.replenishment_toast_findedSku) + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
                 KeyboardUtils.hideSoftInput(getActivity());
 
                 return;
@@ -304,7 +304,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
             if (matcher.find()) {
                 ((LinearLayoutManager) mViewBinding.recyclerView.getLayoutManager()).scrollToPositionWithOffset(i, 0);
                 mPresenter.popScan();
-                ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
+                ToastUtils.showShort(getString(R.string.replenishment_toast_findedSku) + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
                 KeyboardUtils.hideSoftInput(getActivity());
                 return;
             }
@@ -312,13 +312,13 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
             if (matcher.find()) {
                 ((LinearLayoutManager) mViewBinding.recyclerView.getLayoutManager()).scrollToPositionWithOffset(i, 0);
                 mPresenter.popScan();
-                ToastUtils.showShort("已找到商品：" + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
+                ToastUtils.showShort(getString(R.string.replenishment_toast_findedSku) + mReplenishmentDetailAdapter.getData().get(i).getSpuName());
                 KeyboardUtils.hideSoftInput(getActivity());
                 return;
             }
         }
 
-        ToastUtils.showShort("没有找到相关货品");
+        ToastUtils.showShort(getString(R.string.replenishment_toast_noFindedSku));
 
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentFragment.java

@@ -68,14 +68,12 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
             mPresenter.clickAdd();
         });
 
-        mViewBinding.edTitle.setHint("请输入供货商名称");
+        mViewBinding.edTitle.setHint(getString(R.string.replenishment_hint_supplierName));
         mViewBinding.edTitle.setInputType(InputType.TYPE_CLASS_TEXT);
-        mViewBinding.edTitle.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView textView, int i, KeyEvent keyEvent) {
+        mViewBinding.edTitle.setOnEditorActionListener((textView, i, keyEvent) -> {
             if (i == EditorInfo.IME_ACTION_SEARCH) {
                 if (mViewBinding.edTitle.getText().toString().trim().length() == 0) {
-                        ToastUtils.showShort("请输入供货商名称");
+                    ToastUtils.showShort(getString(R.string.replenishment_hint_supplierName));
                     return true;
                 }
                 switch (mViewBinding.tab.getSelectedTabPosition()) {
@@ -92,7 +90,6 @@ public class ReplenishmentFragment extends BaseFragment<ReplenishmentPresenter,
             }
             return true;
 
-            }
         });
 
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentListFragment.java

@@ -62,7 +62,7 @@ public class ReplenishmentListFragment extends BaseFragment<ReplenishmentPresent
             if ((System.currentTimeMillis() - mExitTime) > 500) {
                 mPresenter.queryPsbDetail(mReplenishmentAdapter.getData().get(position));
             } else {
-                ToastUtils.showLong("您操作太快了");
+//                ToastUtils.showLong("您操作太快了");
             }
 
         });

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

@@ -61,8 +61,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     }
 
     @Override
-    public void showMsg(String msg) {
-        ToastUtils.showShort(msg);
+    public void showMsgSuc() {
+        ToastUtils.showShort(getString(R.string.sku_toast_doSuc));
     }
 
     @Override
@@ -166,14 +166,14 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         switch (editMode) {
             case C.SKU_EDITOR_MODE.ADD:
                 this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_EDITOR);
-                mViewBinding.tvEditorHint.setText("已有");
+                mViewBinding.tvEditorHint.setText(getString(R.string.sku_title_iconHad));
                 mViewBinding.tvEditorHint.setBackgroundResource(R.drawable.shape_orange_r1);
                 mViewBinding.tvTitle.setText(R.string.sssku_add);
                 this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.ADD));
                 break;
             case C.SKU_EDITOR_MODE.UNKNOWN:
                 this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_EDITOR);
-                mViewBinding.tvEditorHint.setText("新增");
+                mViewBinding.tvEditorHint.setText(getString(R.string.sku_title_iconAdd));
                 mViewBinding.tvEditorHint.setBackgroundResource(R.drawable.shape_red_r1);
                 mViewBinding.tvTitle.setText(R.string.sssku_add);
                 this.start(mEditorFragment.setSssku(sku).setEditMode(C.SKU_EDITOR_MODE.UNKNOWN));

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

@@ -17,9 +17,8 @@ public interface SsskuContract {
         /**
          * 显示文字内容
          *
-         * @param msg 要显示的内容
          */
-        void showMsg(String msg);
+        void showMsgSuc();
 
         /**
          * 加载商品

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

@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.manage.sssku;
 
 import com.blankj.utilcode.util.SPUtils;
 import com.blankj.utilcode.util.StringUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.model.Sskugrp;
@@ -103,7 +104,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                                         mView.backToManagerFragment();
                                         mView.showEditorFragment(sssku, C.SKU_EDITOR_MODE.UNKNOWN);
                                     }
-                                }, throwable -> mView.showMsg(throwable.getMessage()))
+                                }, throwable -> ToastUtils.showShort(throwable.getMessage()))
         );
     }
 
@@ -133,7 +134,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                                             mView.showDetailFragment(sssku1);
                                         },
                                         throwable -> {
-                                            mView.showMsg(throwable.getMessage());
+                                            ToastUtils.showShort(throwable.getMessage());
                                         })
                 );
                 break;
@@ -173,7 +174,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.dismissAllDialog();
                             this.getSkugrp();
                         }, throwable -> {
-                            mView.showMsg(throwable.getMessage());
+                           ToastUtils.showShort(throwable.getMessage());
                         })
         );
     }
@@ -194,7 +195,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.dismissAllDialog();
                             this.getSkugrp();
                         }, throwable -> {
-                            mView.showMsg(throwable.getMessage());
+                           ToastUtils.showShort(throwable.getMessage());
                         })
         );
     }
@@ -211,7 +212,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             mView.dismissAllDialog();
                             this.getSkugrp();
                         }, throwable -> {
-                            mView.showMsg(throwable.getMessage());
+                          ToastUtils.showShort(throwable.getMessage());
                         })
         );
     }
@@ -222,19 +223,19 @@ public class SsskuPresenter extends SsskuContract.Presenter {
             case C.SKU_EDITOR_MODE.ADD:
                 ApiFactory.Sssku.addSssku(sssku).subscribe(
                         sssku1 -> {
-                            mView.showMsg("添加成功");
+                            mView.showMsgSuc();
                             isNeedSync = true;
                             mView.backToManagerFragment();
                             if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
                                 mView.addSku(sssku1);
                             }
                         },
-                        throwable -> mView.showMsg(throwable.getMessage()));
+                        throwable ->  ToastUtils.showShort(throwable.getMessage()));
                 break;
             case C.SKU_EDITOR_MODE.UPDATE:
                 ApiFactory.Sssku.update(sssku).subscribe(
                         sssku1 -> {
-                            mView.showMsg("修改成功");
+                            mView.showMsgSuc();
                             isNeedSync = true;
                             mView.backToEditFragment();
                             mView.backToManagerFragment();
@@ -243,18 +244,18 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             } else {
                                 mView.deleteSku(sssku1.getId());
                             }
-                        }, throwable -> mView.showMsg(throwable.getMessage()));
+                        }, throwable ->  ToastUtils.showShort(throwable.getMessage()));
                 break;
             case C.SKU_EDITOR_MODE.UNKNOWN:
                 ApiFactory.Sssku.addSssku(sssku).subscribe(
                         sssku1 -> {
-                            mView.showMsg("添加成功");
+                            mView.showMsgSuc();
                             isNeedSync = true;
                             mView.backToManagerFragment();
                             if (sssku1.getSkuGrpId().longValue() == mSkuGrpId) {
                                 mView.addSku(sssku1);
                             }
-                        }, throwable -> mView.showMsg(throwable.getMessage()));
+                        }, throwable ->  ToastUtils.showShort(throwable.getMessage()));
                 break;
         }
     }
@@ -309,7 +310,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                                 mView.loadSsskuCount(ssskuPager.getTotalRow());
                             mView.loadSkus(ssskuPager, mPageNum == 1);
                         }, throwable -> {
-                            mView.showMsg(throwable.getMessage());
+                            ToastUtils.showShort(throwable.getMessage());
                         })
         );
     }
@@ -324,7 +325,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
                         .subscribe(
                                 ssskuPager -> mView.loadSearchResult(ssskuPager, mSearchPageNum == 1),
-                                throwable -> mView.showMsg(throwable.getMessage())
+                                throwable -> ToastUtils.showShort(throwable.getMessage())
                         )
         );
     }
@@ -337,7 +338,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                 ApiFactory.Sskugrp.querySskugrp().subscribe(sskugrpPager -> {
                             mView.loadSkugrps(sskugrpPager.getList());
                         }, throwable -> {
-                            mView.showMsg(throwable.getMessage());
+                          ToastUtils.showShort(throwable.getMessage());
                         }
                 )
         );
@@ -349,7 +350,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
     private void getReplenish() {
         mCompositeDisposable.add(
                 ApiFactory.Psb.preOrder().subscribe(ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()), throwable -> {
-                    mView.showMsg(throwable.getMessage());
+                    ToastUtils.showShort(throwable.getMessage());
                 })
         );
     }
@@ -360,7 +361,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
     private void getCor() {
         mCompositeDisposable.add(
                 ApiFactory.Cor.queryAll().subscribe(cors -> mView.loadCors(cors), throwable -> {
-                    mView.showMsg(throwable.getMessage());
+                    ToastUtils.showShort(throwable.getMessage());
                 })
         );
     }

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

@@ -335,7 +335,7 @@ public class EditorFragment extends BaseFragment<SsskuPresenter, FragmentSsskuEd
     public void loadSkugrps(List<Sskugrp> sskugrps) {
         Sskugrp sskugrp = new Sskugrp();
         sskugrp.setSkuGrpId(0L);
-        sskugrp.setSkuGrpName("无");
+        sskugrp.setSkuGrpName(getString(R.string.sku_default_skuname));
         sskugrp.setSelected(true);
         List<Sskugrp> _sskugrps = new ArrayList<>();
         _sskugrps.addAll(sskugrps);

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

@@ -95,7 +95,7 @@ public class ManagerFragment extends BaseFragment<SsskuPresenter, FragmentSsskuM
     public void loadSkugrps(List<Sskugrp> sskugrps) {
         Sskugrp sskugrp = new Sskugrp();
         sskugrp.setSkuGrpId(0L);
-        sskugrp.setSkuGrpName("全部商品");
+        sskugrp.setSkuGrpName(getString(R.string.sku_default_grpName));
         sskugrp.setSelected(true);
         List<Sskugrp> _sskugrps = new ArrayList<>();
         _sskugrps.addAll(sskugrps);

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

@@ -42,7 +42,7 @@ public class UserActivity extends BaseActivity<UserPresenter, ActivityUserBindin
 
     @Override
     public void updateUserSus(Oper oper) {
-        ToastUtils.showShort("修改成功");
+        ToastUtils.showShort(getString(R.string.user_toast_changeSuc));
         mPresenter.userListFragment.updateUserSus(oper);
     }
 

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

@@ -50,7 +50,7 @@ public class UserMenuDialog extends BaseSheetDialog<UserPresenter, DialogUserMen
                      */
                     //两个选择按钮，确定取消并含有提示信息
                     PromptDialog promptDialog = new PromptDialog();
-                    promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, "确定是否删除店员？")
+                    promptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SELECT, getString(R.string.user_toast_ifDeleteUser))
                             .setClick(new View.OnClickListener() {
                                 @Override
                                 public void onClick(View view) {
@@ -60,7 +60,7 @@ public class UserMenuDialog extends BaseSheetDialog<UserPresenter, DialogUserMen
                             }, new View.OnClickListener() {
                                 @Override
                                 public void onClick(View view) {
-                                    promptDialog. dismiss();
+                                    promptDialog.dismiss();
                                 }
                             }).show((BaseActivity) getActivity());
                     break;

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsActivity.java

@@ -5,6 +5,7 @@ import android.view.KeyEvent;
 import android.view.MotionEvent;
 
 import com.blankj.utilcode.util.FragmentUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -61,11 +62,19 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter,
 
     @Override
     public void searchSuc(Pager<Saleorder> saleorderPager, String wd) {
+        if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty));
+            return;
+        }
         mStatisticsTitleFragment.searchSuc(saleorderPager, wd);
     }
 
     @Override
     public void searchSuc(Pager<Saleorder> saleorderPager, int payType) {
+        if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty));
+            return;
+        }
         mStatisticsTitleFragment.searchSuc(saleorderPager, payType);
     }
 
@@ -76,6 +85,10 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter,
 
     @Override
     public void searchSuc(Pager<Saleorder> saleorderPager, long start, long end) {
+        if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty));
+            return;
+        }
         mStatisticsDateFragment.pop();
         mStatisticsTitleFragment.searchSuc(saleorderPager, start, end);
     }
@@ -83,12 +96,20 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter,
     @Override
     public void searchRechargeSuc(Pager<VipRechargeOrder> vipRechargeOrderPager, long start, long
             end) {
+        if (vipRechargeOrderPager.getList() == null || vipRechargeOrderPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty_recharge));
+            return;
+        }
         mStatisticsDateFragment.pop();
         mStatisticsTitleFragment.searchRechargeSuc(vipRechargeOrderPager, start, end);
     }
 
     @Override
     public void searchTicketSuc(Pager<Ticket> ticketPager, long start, long end) {
+        if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
+            ToastUtils.showShort(getString(R.string.statistics_search_empty_ticket));
+            return;
+        }
         mStatisticsDateFragment.pop();
         mStatisticsTitleFragment.searchTicketSuc(ticketPager, start, end);
     }

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java

@@ -119,18 +119,18 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         InventoryDetailAdapter mInventoryDetailAdapter = new InventoryDetailAdapter(cs
                 .getCsdetailList());
         viewInventoryDetailBinding.replenishmentLeftRecycler.setAdapter(mInventoryDetailAdapter);
-        mViewBinding.btnPrint.setText("取消");
-        mViewBinding.btnReturn.setText("打印清单");
+        mViewBinding.btnPrint.setText(getString(R.string.all_cancel));
+        mViewBinding.btnReturn.setText(getString(R.string.inventory_add_btn_print));
         viewInventoryDetailBinding.setOperName(cs.getOperName());
         viewInventoryDetailBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(cs
                 .getCreateTime()));
         viewInventoryDetailBinding.setSumNum(cs.getCount() + "");
         switch (cs.getCsResultFlag()) {
             case 0:
-                viewInventoryDetailBinding.setFinallyResult("相符");
+                viewInventoryDetailBinding.setFinallyResult(getString(R.string.inventory_adapter_tally));
                 break;
             case 1:
-                viewInventoryDetailBinding.setFinallyResult("不相符");
+                viewInventoryDetailBinding.setFinallyResult(getString(R.string.inventory_adapter_no_tally));
                 break;
         }
         mViewBinding.btnReturn.setOnClickListener(new OnClickListener() {
@@ -139,7 +139,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
                 try {
                     ZX_PrintPOS.getInstance(MainActivity.mainActivity).printInventory(1, cs);
                 } catch (Exception e) {
-                    ToastUtils.showShort("无法打印");
+                    ToastUtils.showShort(getString(R.string.statistics_toast_noPrint));
                 }
 
 
@@ -199,6 +199,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
 
     @Override
     public void getOrderDetailSuss(Saleorder mSaleorder) {
+        ToastUtils.showShort(R.string.statistics_toast_refundSuc);
         mViewBinding.viewOrderDetail.getViewStub().inflate();
         ViewOrderDetailBinding viewOrderDetailBinding = DataBindingUtil.bind(mViewBinding
                 .viewOrderDetail.getRoot());

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailPresenter.java

@@ -38,7 +38,7 @@ public class StatisticsDetailPresenter extends StatisticsDetailContract.Presente
             switch (response.getCode()) {
                 case com.xingdata.zxpay.C.PAY_STATE.SUCCESS:
                     ApiFactory.Test.returnOrder(saleorder.getOrderNo()).subscribe(s -> {
-                        ToastUtils.showLong("退货成功");
+
                         mView.returnOrderSuss();
                     }, throwable -> {
                         ToastUtils.showLong(throwable.getMessage());

app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java

@@ -98,11 +98,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(vipRechargeOrderPager -> {
                     //判断是否能加载更多
-                    if (vipRechargeOrderPager.getList() == null || vipRechargeOrderPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关充值记录");
-                    } else {
+
                         mView.searchRechargeSuc(vipRechargeOrderPager, startDate, endDate);
-                    }
+
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
                 });
@@ -124,11 +122,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         mView.isShowLoading(true);
         ApiFactory.Ticket.query(pageNumber, nowPageSize, usedFlag, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(ticketPager -> {
-                    if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关优惠券");
-                    } else {
+
                         mView.searchTicketSuc(ticketPager, startDate, endDate);
-                    }
+
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
                 });
@@ -143,11 +139,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", null, wd).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
-                    if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关订单");
-                    } else {
+
                         mView.searchSuc(saleorderPager, wd);
-                    }
+
 
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
@@ -164,11 +158,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         ApiFactory.Test.getSaleOrderList(pageNumber, nowPageSize, "99", payType).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
-                    if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关订单");
-                    } else {
+
                         mView.searchSuc(saleorderPager, payType);
-                    }
+
 
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
@@ -182,11 +174,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         ApiFactory.Test.getSaleOrderList("99", pageNumber, nowPageSize, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(saleorderPager -> {
                     //判断是否能加载更多
-                    if (saleorderPager.getList() == null || saleorderPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有查询到相关订单");
-                    } else {
+
                         mView.searchSuc(saleorderPager, startDate, endDate);
-                    }
+
 
                 }, throwable -> {
                     ToastUtils.showShort(throwable.getMessage());
@@ -198,7 +188,7 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
         long longStart = TimeUtils.string2Millis(dateStart, new SimpleDateFormat(StringUtil.defaultDatePattern));
         long longEnd = TimeUtils.string2Millis(dateEnd, new SimpleDateFormat(StringUtil.defaultDatePattern)) + 86400000L;
         if (longStart > longEnd) {
-            ToastUtils.showShort("日期不符合区间");
+            ToastUtils.showShort("date error");
             mView.showDateAlert(true);
         } else {
             mView.showDateAlert(false);

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

@@ -28,7 +28,7 @@ public class StatisticsTicketAdapter extends BaseAdapter<Ticket, ItemStatisticsB
     @Override
     protected void convert(ItemStatisticsBinding mViewBinding, Ticket item) {
         mViewBinding.imgLeft.setImageResource(R.mipmap.ic_text_ticket);
-        mViewBinding.tvLeftTop.setText(ConvertUtil.fenToYuanNoZero(item.getTicketValAmt())+"元优惠券");
+        mViewBinding.tvLeftTop.setText(mContext.getString(R.string.tv_money,ConvertUtil.fenToYuanNoZero(item.getTicketValAmt())));
         mViewBinding.tvLeftBottom.setText(TimeUtils.date2String(item.getCreateTime()));
     }
 

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

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

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

@@ -48,7 +48,7 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
 
                 mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
                 mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
-                mViewBinding.icTitle.tvTitle.setText("订单列表");
+                mViewBinding.icTitle.tvTitle.setText(getString(R.string.statistics_tv_orderList));
                 mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
                     @Override
                     protected void myOnClickListener(View v) {

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

@@ -170,7 +170,7 @@ public class OrderMainFragment extends BaseFragment<StatisticsPresenter, Fragmen
             if (i == 0) {
                 itemMenuBottomBinding.itemTv.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
             }
-            itemMenuBottomBinding.itemTv.setText(month + "月");
+            itemMenuBottomBinding.itemTv.setText(month + getString(R.string.statistics_tv_dateM));
             itemMenuBottomBinding.itemTv.setPadding(0, 0, 0, 0);
 
             mViewBinding.tabLayout.getTabAt(i).setCustomView(view);

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

@@ -21,7 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:text="退出前是否删除本次盘库记录"
+            android:text="@string/inventory_toast_ifDelete"
             android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size" />
     </LinearLayout>

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

@@ -73,6 +73,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="结果："
+                android:visibility="gone"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_text_size" />
 

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

@@ -66,7 +66,7 @@
                 android:paddingBottom="@dimen/all_padding"
                 android:paddingStart="@dimen/all_bounced_padding"
                 android:paddingTop="@dimen/all_padding"
-                android:text="共0人次盘库记录"
+
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_text_size_low" />
 

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

@@ -87,7 +87,7 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="结果："
+                android:text="@string/inventory_tv_result"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/all_text_size" />
 

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

 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:app="http://schemas.android.com/apk/res-auto">
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <data>
 
@@ -497,19 +498,20 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginEnd="8dp"
                                 android:paddingTop="@dimen/all_padding"
-                                android:text="金额"
+                                android:text="@string/replenishment_tv_amt"
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/all_text_size_low"
                                 app:layout_constraintEnd_toEndOf="@+id/ll_result"
                                 app:layout_constraintStart_toStartOf="@id/ll_result"
-                                app:layout_constraintTop_toBottomOf="@id/ll_no" />
+                                app:layout_constraintTop_toBottomOf="@id/ll_no"
+                                tools:ignore="NotSibling" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_margin="@dimen/all_margin"
                                 android:paddingTop="@dimen/all_padding"
-                                android:text="缺货种类"
+                                android:text="@string/replenishment_tv_needReplenishmentItem"
                                 android:textColor="@color/black"
                                 android:textSize="@dimen/all_text_size_low"
                                 app:layout_constraintBottom_toBottomOf="@id/tv_result_hint"

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

@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="取消"
+                android:text="@string/all_cancel"
                 android:textColor="@color/red_guanyu"
                 app:layout_constraintStart_toStartOf="parent" />
 
@@ -37,7 +37,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="选择时间"
+                android:text="@string/statistics_tv_dateSelect"
                 android:textColor="@color/black_baozheng"
                 android:textSize="@dimen/big_text_size" />
 
@@ -47,7 +47,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:gravity="center"
-                android:text="完成"
+                android:text="@string/settle_complete"
                 android:textColor="@color/red_guanyu"
                 app:layout_constraintEnd_toEndOf="parent" />
             <View

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

@@ -91,7 +91,7 @@
             android:paddingBottom="@dimen/all_padding"
             android:paddingStart="@dimen/all_bounced_padding"
             android:paddingTop="@dimen/all_padding"
-            android:text="盘点件数："
+            android:text="@string/inventory_tv_cnt"
             android:textColor="@color/black"
             android:textSize="@dimen/all_text_size_low"
             app:layout_constraintBottom_toBottomOf="@id/tv_unit"
@@ -106,7 +106,7 @@
             android:paddingBottom="@dimen/all_padding"
             android:paddingStart="@dimen/all_bounced_padding"
             android:paddingTop="@dimen/all_padding"
-            android:text="盘点结果："
+            android:text="@string/inventory_tv_result"
             android:textColor="@color/black"
             android:textSize="@dimen/all_text_size_low"
             app:layout_constraintEnd_toStartOf="@id/tv_result"
@@ -148,7 +148,7 @@
             android:paddingBottom="@dimen/all_padding"
             android:paddingStart="@dimen/all_bounced_padding"
             android:paddingTop="@dimen/all_padding"
-            android:text="盘点时间"
+            android:text="@string/inventory_tv_date"
             android:textColor="@color/black_baozheng"
             android:textSize="@dimen/all_text_size_low"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -40,7 +40,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/all_bounced_padding"
             android:layout_marginStart="@dimen/all_bounced_padding"
-            android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
+            android:text=""
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/img_goods"
             app:layout_constraintTop_toTopOf="@id/img_goods" />
@@ -51,7 +51,7 @@
             android:layout_width="wrap_content"
             android:layout_height="28dp"
             android:layout_marginTop="@dimen/all_padding"
-            android:text="条码："
+            android:text="@string/sku_barcode"
             app:layout_constraintStart_toStartOf="@id/tv_goods_name"
             app:layout_constraintTop_toBottomOf="@id/tv_goods_name" />
 
@@ -60,7 +60,7 @@
             style="@style/other_select_smallstyle"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:text="12783163981789"
+            android:text=""
             app:layout_constraintBottom_toBottomOf="@id/tv_goods_code_hint"
             app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
             app:layout_constraintTop_toTopOf="@id/tv_goods_code_hint" />
@@ -73,7 +73,7 @@
             android:layout_marginEnd="@dimen/all_bounced_padding"
             android:background="@drawable/frame_frame_zhouyu_bg"
             android:padding="@dimen/dp_4"
-            android:text="规格"
+            android:text="@string/sku_size"
             android:textSize="@dimen/all_text_size_small"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
@@ -157,7 +157,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/dp_4"
-            android:text="构成数量："
+            android:text="@string/inventory_tv_num"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_goods_price" />
@@ -169,7 +169,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/all_bounced_padding"
             android:layout_marginTop="@dimen/all_padding"
-            android:text="系统库存："
+            android:text="@string/inventory_tv_systemCnt"
             android:textStyle="bold"
             app:layout_constraintStart_toEndOf="@id/tv_goods_price"
             app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
@@ -192,7 +192,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/all_padding"
-            android:text="进价："
+            android:text="@string/sku_cost"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
             app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />

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

@@ -154,7 +154,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
-                    android:text="供货方"
+                    android:text="@string/sku_subtitle_supplier"
                     android:textColor="@color/black"
                     android:textSize="@dimen/big_text_size"
                     app:layout_constraintStart_toStartOf="parent"

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

@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/all_bounced_padding"
             android:layout_marginStart="@dimen/all_bounced_padding"
-            android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
+            android:text=""
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/img_goods"
             app:layout_constraintTop_toTopOf="@id/img_goods" />
@@ -40,9 +40,9 @@
             android:layout_width="wrap_content"
             android:layout_height="28dp"
             android:layout_marginTop="@dimen/all_padding"
-            android:text="条码："
-            app:layout_constraintStart_toStartOf="@id/tv_goods_name"
-            app:layout_constraintTop_toBottomOf="@id/tv_goods_name" />
+            android:text="@string/sku_barcode"
+            app:layout_constraintTop_toBottomOf="@id/tv_goods_name"
+            tools:layout_editor_absoluteX="97dp" />
 
         <TextView
             android:id="@+id/tv_goods_code"
@@ -161,7 +161,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/all_padding"
-            android:text="库存："
+            android:text="@string/sssku_stock"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
             app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
@@ -206,7 +206,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/all_padding"
-            android:text="进价："
+            android:text="@string/sku_cost"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@id/tv_stock_hint"

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

@@ -35,7 +35,7 @@
         <TextView
             android:id="@+id/tv_right_bottom"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="10dp"
             android:layout_marginEnd="@dimen/all_text_size_small"
             android:text="本店"
             android:textSize="@dimen/all_text_size_small"

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

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--店员管理-->
+    <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>
+    <string name="replenishment_tv_editOrder">修改订单</string>
+    <string name="replenishment_tv_takeOver">确认收货</string>
+    <string name="replenishment_toast_seachText">请输入搜索内容</string>
+    <string name="replenishment_toast_findedSku">已找到商品:</string>
+    <string name="replenishment_toast_noFindedSku">没有找到相关货品</string>
+    <string name="replenishment_tv_needReplenishmentItem">缺货种类</string>
+    <string name="replenishment_hint_supplierName">请输入供货商名称</string>
+    <string name="replenishment_tv_replenishmentDetail">定货详情</string>
+    <string name="replenishment_toast_noNeedDo">库存正常，无需补货</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>
+    <string name="inventory_toast_skuHad">商品已存在</string>
+    <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>
+    <string name="statistics_tv_dateSelect">选择时间</string>
+    <string name="statistics_tv_orderList">订单列表</string>
+    <string name="statistics_toast_noPrint">无法打印</string>
+    <string name="statistics_toast_refundSuc">退货成功</string>
+
+
+
+
+
+</resources>