Merge remote-tracking branch 'origin/master'

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

@@ -79,7 +79,7 @@ public class C {
         /**
          * 地址
          */
-        public static final String BASE_URL = URL_TEST;
+        public static final String BASE_URL = URL_DEMO;
 
         private static final String PKG = "/tk/";
 

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

@@ -540,7 +540,13 @@ public final class ApiFactory {
         }
 
         public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(String wd) {
-            return run(Api.getInstance().service.querySssku(wd));
+            String mWd;
+            try {
+                mWd = String.valueOf(Long.valueOf(wd));
+            } catch (NumberFormatException e) {
+                mWd = wd;
+            }
+            return run(Api.getInstance().service.querySssku(mWd));
         }
 
         public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum, String keyword) {

app/src/main/java/com/xingdata/zzdpos/ui/main/MainActivity.java

@@ -196,8 +196,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     @Override
     public void showMarketingResult() {
         PromptDialog mPromptDialog = new PromptDialog();
-        mPromptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SUCC, "开通成功");
-        mPromptDialog.setCustomButton("确定", view -> dismissAllDialog());
+        mPromptDialog.setDialogType(PromptDialog.PROMPTDIALOG_SUCC, getString(R.string.paid_up_pay_suc));
+        mPromptDialog.setCustomButton(getString(R.string.all_confirm), view -> dismissAllDialog());
         mPromptDialog.show((BaseActivity) ActivityUtils.getTopActivity(), 2);
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/main/MainPresenter.java

@@ -6,6 +6,7 @@ import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.TimeUtils;
 import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.db.DBFactory;
 import com.xingdata.zzdpos.model.HandoverInfo;
@@ -130,12 +131,12 @@ public class MainPresenter extends MainContract.Presenter {
                             mView.showUptateDialog(ver.getVerUrl(), ver.getVerTitle() + "\n\n" + ver
                                     .getVerContent());
                         } else {
-                            ToastUtils.showShort("已经是最新版本");
+                            ToastUtils.showShort(R.string.update_hint_done);
                         }
                     }
                 }, throwable -> {
 //                    ToastUtils.showShort(throwable.getMessage());
-                    ToastUtils.showShort("已经是最新版本");
+                    ToastUtils.showShort(R.string.update_hint_done);
                 }
         );
 
@@ -149,15 +150,7 @@ public class MainPresenter extends MainContract.Presenter {
         mView.handoverOk();
     }
 
-    //    @Override
-//    public void clickFeedOk(Feed feed) {
-//        ApiFactory.Feed.addFeed(feed)
-//                .subscribe(object -> {
-//                }, throwable -> {
-//                    ToastUtils.showShort(throwable.getMessage());
-//                });
-//    }
-//
+
     @Override
     public void logout() {
         ApiFactory.Test.logout()

app/src/main/java/com/xingdata/zzdpos/ui/main/dialog/HandoverDialog.java

@@ -30,7 +30,7 @@ public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBind
     @Override
     public void onConfirmClick(View view) {
         super.onConfirmClick(view);
-       mPresenter.clickHandoverOk();
+        mPresenter.clickHandoverOk();
 
     }
 
@@ -49,7 +49,7 @@ public class HandoverDialog extends BaseDialog<MainPresenter, DialogHandoverBind
         mViewBinding.handoverTvSumamt.setText(ConvertUtil.fenToYuan(MainPresenter.handoverInfo.getFinallyAmt(), true));
         mViewBinding.setOrderNum(String.valueOf(MainPresenter.handoverInfo.getSumOrder()));
 
-        setBtnName("取消","交班");
+        setBtnName(mContext.getString(R.string.handover_cancel), mContext.getString(R.string.handover_handover));
     }
 
 

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

@@ -50,7 +50,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
     private void initTitle() {
         mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
         mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
-        changeTitle("盘库记录", false);
+        changeTitle(mContext.getString(R.string.inventory_title), false);
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
@@ -122,7 +122,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
 
     @Override
     public void disInventoryDetailFragment(Boolean idChange) {
-        changeTitle("盘库记录", false);
+        changeTitle(mContext.getString(R.string.inventory_title), false);
         if (idChange) {
             mInventoryAddFragment.pop();
             mInventoryFragment.onRefresh();
@@ -148,7 +148,7 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
     public void openInventoryAddFragment(Cs cs) {
         mInventoryAddFragment = new InventoryAddFragment();
         mInventoryAddFragment.setCs(cs);
-        changeTitle("商品盘点", true);
+        changeTitle(mContext.getString(R.string.inventory_add_title), true);
         start(mInventoryAddFragment);
     }
 

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

@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.manage.inventory;
 import com.blankj.utilcode.util.TimeUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.C;
+import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.api.ApiFactory;
 
 import com.xingdata.zzdpos.db.DB;
@@ -95,10 +96,10 @@ public class InventoryPresenter extends InventoryContract.Presenter {
                             } else if (ssskuPager.getList().size() == 1) {
                                 mView.addInventoryGoodsItem(ssskuPager.getList().get(0));
                             } else {
-                                ToastUtils.showShort("没有此商品");
+                                ToastUtils.showShort(R.string.inventory_add_hint);
                             }
                         }, throwable -> {
-                            ToastUtils.showShort("删除" + throwable.getMessage());
+                            ToastUtils.showShort(throwable.getMessage());
                         });
     }
 
@@ -142,7 +143,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
                 .subscribe(object -> {
                     mView.disInventoryDetailFragment(false);
                 }, throwable -> {
-                    ToastUtils.showShort("删除" + throwable.getMessage());
+                    ToastUtils.showShort(throwable.getMessage());
                 });
     }
 
@@ -156,7 +157,7 @@ public class InventoryPresenter extends InventoryContract.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(R.string.all_hint_date);
             mView.showDateAlert(true);
         } else {
             mView.showDateAlert(false);
@@ -188,7 +189,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
                 .subscribe(csPager -> {
                     //判断是否能加载更多
                     if (csPager.getList().size() == 0) {
-                        ToastUtils.showShort("没有盘库记录");
+                        ToastUtils.showShort(R.string.inventory_hint);
                     } else {
                         mView.loadCs(csPager, start, end);
                         mView.setInventoryCount(com.blankj.utilcode.util.TimeUtils.millis2String(start, new SimpleDateFormat(StringUtil.defaultDatePattern)) + " ~ " +

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryAdapter.java

@@ -34,11 +34,11 @@ public class InventoryAdapter extends BaseAdapter<Cs, ItemInventoryBinding> {
         mViewBinding.tvNum.setText(item.getCsdetailCount() + "");
         switch (item.getCsResultFlag()) {
             case 0:
-                mViewBinding.tvResult.setText("相符");
+                mViewBinding.tvResult.setText(R.string.inventory_adapter_tally);
                 mViewBinding.imgInventory.setImageResource(R.mipmap.ic_consistent);
                 break;
             case 1:
-                mViewBinding.tvResult.setText("不相符");
+                mViewBinding.tvResult.setText(R.string.inventory_adapter_no_tally);
                 mViewBinding.imgInventory.setImageResource(R.mipmap.ic_not_consistent);
                 break;
         }

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/adpter/InventoryGoodsAdapter.java

@@ -10,6 +10,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.xingdata.zzdpos.App;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseAdapter;
 import com.xingdata.zzdpos.base.BaseViewHolder;
@@ -48,7 +49,7 @@ public class InventoryGoodsAdapter extends BaseAdapter<Sssku, ItemInventoryGoods
         mViewBinding.etCount.setText(item.getInventoryCut() + "");
         mViewBinding.tvGoodsName.setText(item.getSpuName());
         mViewBinding.tvGoodsCode.setText(item.getSpuBarcode() + "");
-        mViewBinding.tvGoodsSize.setText("规格/" + item.getSpuUnitName());
+        mViewBinding.tvGoodsSize.setText(App.instance.getString(R.string.cart_size) + item.getSpuUnitName());
         mViewBinding.tvGoodsPrice.setText(ConvertUtil.fenToYuan(item.getSkuRetailPrice1(), false));
         mViewBinding.tvStock.setText(item.getSkuStock() + item.getSpuUnitName());
 

app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/dialog/DeleteInventoryDialog.java

@@ -14,7 +14,6 @@ import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.OnClickListener;
 
 
-
 public class DeleteInventoryDialog extends BaseDialog<InventoryPresenter, DialogDeleteInventoryBinding> {
 
     private BackCall mBackCall;
@@ -36,7 +35,7 @@ public class DeleteInventoryDialog extends BaseDialog<InventoryPresenter, Dialog
 
     @Override
     public void initView() {
-        setBtnName("不删除", "删除");
+        setBtnName(mContext.getString(R.string.all_no_delete), mContext.getString(R.string.all_delete));
         mViewBinding.tvDis.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {

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

@@ -107,7 +107,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
                 @Override
                 public void No() {
                     deleteInventoryDialog.dismiss();
-                    pop();
+                    mPresenter.exitInventoryAdd();
                 }
             });
         }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/viplevel/adapter/VipLevelListAdapter.java

@@ -44,7 +44,11 @@ public class VipLevelListAdapter extends BaseAdapter<Level, ItemVipLevelListItem
     @Override
     protected void convert(ItemVipLevelListItemBinding mViewBinding, Level item) {
         mViewBinding.levelName.setText(item.getVipLevelName());
-        mViewBinding.levelDiscount.setText(ConvertUtil.discount(item.getVipDefDiscount()) + "折");
+        if(item.getVipDefDiscount()==null||item.getVipDefDiscount()==100){
+            mViewBinding.levelDiscount.setText("无折扣");
+        }else {
+            mViewBinding.levelDiscount.setText(ConvertUtil.discount(item.getVipDefDiscount()) + "折");
+        }
         mViewBinding.levelCondition.setText(mContext.getString(R.string.adv_plan, ConvertUtil.fenToYuanNoZero(item.getVipUpgradeAmtTp())));
         mViewBinding.levelBg.setBackgroundResource(bgMap.get(item.getVipLevel().toString()));
     }

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

@@ -104,6 +104,8 @@ public class VipActivity extends BaseActivity<VipPresenter, ActivityVipBinding>
     @Override
     public void rechangeSus(Vip v) {
         ViewTools.toastSuss(this, "充值成功");
+        if ( mPresenter.vipSearchFragment!=null)pop();
+//        if ( mPresenter.vipRechargeFragment!=null)pop();
         popTo(mPresenter.vipListFragment.getClass(),false);
         mPresenter.vipListFragment.onRefresh();
     }

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

@@ -38,8 +38,8 @@ public class VipPresenter extends VipContract.Presenter {
     public VipExpenseListFragment vipExpenseListFragment = new VipExpenseListFragment();
     public VipRechargeListFragment vipRechargeListFragment = new VipRechargeListFragment();
     public VipTruleListFragment vipMscardListFragment = new VipTruleListFragment();
-    public VipSearchFragment vipSearchFragment = new VipSearchFragment();
-    public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
+    public VipSearchFragment vipSearchFragment;
+    public VipRechargeFragment vipRechargeFragment;
     public VipAddSucceedFragment vipAddSucceedFragment = new VipAddSucceedFragment();
     public ArrayList<Level> levels = new ArrayList<>();
 

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

@@ -127,10 +127,11 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
             }
         });
         mViewBinding.titleSearch.serchEditText.setOnClickListener(view -> {
+            mPresenter.vipSearchFragment = new VipSearchFragment();
             if (vipState == 0) {
-                mPresenter.vipSearchFragment.setBaseFragment(mPresenter.vipInfoFragment);
+                mPresenter.vipSearchFragment.setInType(0);
             } else {
-                mPresenter.vipSearchFragment.setBaseFragment(mPresenter.vipRechargeFragment);
+                mPresenter.vipSearchFragment.setInType(1);
             }
             start(mPresenter.vipSearchFragment);
         });
@@ -247,6 +248,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
 
 
     public void toStartVipInfo(Vip vip) {
+        mPresenter.vipRechargeFragment=new VipRechargeFragment();
         mPresenter.vipRechargeFragment.setVip(vip);
         if (vip != null) {
             if (vipState == 0) {

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

@@ -80,11 +80,11 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
         mPresenter.rechargeorderQuery(mVip.getVipId(), pageNumber);
     }
 
-    @Override
-    public boolean onBackPressedSupport() {
-        pop();
-        return true;
-    }
+//    @Override
+//    public boolean onBackPressedSupport() {
+//        pop();
+//        return true;
+//    }
 
 
 

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

@@ -25,9 +25,14 @@ import com.xingdata.zzdpos.ui.vip.VipPresenter;
 public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSerchBinding> {
     private VipAdapter mVipAdapter;
     private BaseFragment baseFragment;
+    private int inType=0;
 
-    public void setBaseFragment(BaseFragment baseFragment) {
-        this.baseFragment = baseFragment;
+    /**
+     * 0 會員详情  1 充值
+      * @param inType
+     */
+    public void setInType(int inType) {
+        this.inType = inType;
     }
 
     @Override
@@ -48,17 +53,22 @@ public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSer
         mVipAdapter.setEmptyView(emptyView);
         ((EditText) mViewBinding.etSearch).requestFocus();
         mVipAdapter.setOnItemClickListener((adapter, view, position) -> {
-            if (baseFragment instanceof VipInfoFragment) {
-                ((VipInfoFragment) baseFragment).setVip(mVipAdapter.getData().get(position));
-            } else if (baseFragment instanceof VipRechargeFragment) {
-                ((VipRechargeFragment) baseFragment).setVip(mVipAdapter.getData().get(position));
+            switch (inType){
+                case 0:
+                    mPresenter.vipInfoFragment = new VipInfoFragment();
+                    mPresenter.vipInfoFragment.setVip(mVipAdapter.getData().get(position));
+                    startWithPop(mPresenter.vipInfoFragment);
+                    break;
+                case 1:
+                    mPresenter.vipRechargeFragment= new VipRechargeFragment();
+                    mPresenter.vipRechargeFragment.setVip(mVipAdapter.getData().get(position));
+                    startWithPop( mPresenter.vipRechargeFragment);
+                    break;
             }
-            startWithPop(baseFragment);
         });
         mViewBinding.setOnClickListener(view -> {
             switch (view.getId()){
                 case R.id.btn_back:
-
                     pop();
                     break;
                 case R.id.search_ImageButton:

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

@@ -12,10 +12,12 @@
     <string name="all_yes">是</string>
     <string name="all_update">编辑</string>
     <string name="all_delete">删除</string>
+    <string name="all_no_delete">不删除</string>
     <string name="visible">visible</string>
     <string name="gone">gone</string>
     <string name="password">＊</string>
     <string name="rate">%</string>
+    <string name="all_hint_date">日期不符合区间</string>
 
     <!--返回-->
     <string name="all_go_back">返回</string>
@@ -65,6 +67,8 @@
 
     <!--交班报表页面 <WHERE>_<DESCRIPTION>-->
     <string name="handover_title">交班报表</string>
+    <string name="handover_cancel">取消</string>
+    <string name="handover_handover">交班</string>
 
     <!--反馈页面 <WHERE>_<DESCRIPTION>-->
     <string name="feedbcak_title">北京浙星技术有限公司</string>
@@ -91,6 +95,7 @@
     <string name="cart_amt">总计</string>
     <string name="cart_pay">应收:</string>
     <string name="cart_dis">优惠:</string>
+    <string name="cart_size">"规格/"</string>
     <string name="cart_dis_list">优惠项目:</string>
     <string name="cart_dis_change">抹零</string>
     <string name="cart_dis_vip">会员折扣</string>
@@ -284,7 +289,7 @@
     <string name="replenishment_detail_title">定货明细</string>
     <string name="replenishment_detail_full">货物满满\n不需要定货哦~</string>
     <!--盘点界面-->
-    <string name="inventory_meun">库存盘点</string>
+    <string name="inventory_title">盘库记录</string>
     <string name="inventory_add">开始盘库</string>
     <string name="inventory_order">共%s人次盘库记录</string>
     <string name="inventory_empty_hint">没有记录，请调整日期</string>
@@ -294,6 +299,11 @@
     <string name="inventory_add_btn_cancel">删除</string>
     <string name="inventory_add_btn_print">打印清单</string>
     <string name="inventory_add_btn_end">盘库结束</string>
+    <string name="inventory_adapter_tally">相符</string>
+    <string name="inventory_adapter_no_tally">不相符</string>
+    <string name="inventory_add_hint">没有此商品</string>
+    <string name="inventory_hint">无更多盘库记录</string>
+
 
     <!--公告界面-->
     <string name="announcement_meun">公告</string>
@@ -455,7 +465,7 @@
     <string name="adv_plan"> 本级标准：消费金额满 %s</string>
     <string name="level_Number">共有 %s个会员等级</string>
     <string name="vip_level_title">等级设置</string>
-    <string name="vip_mscard_period_of_validity">期限：%s-%s</string>
+    <string name="vip_mscard_period_of_validity">有效期至：%s</string>
 
     <!--会员充值-->
     <string name="vip_recharge_title">会员充值</string>
@@ -751,10 +761,14 @@
     <string name="paid_up_vip_model3">营销计划</string>
     <string name="paid_up_vip_model4_detail">提前设置打折、促销、满减、换购等优惠活动，不错过每一个节日</string>
     <string name="paid_up_pay_hint">请选择支付方式</string>
+    <string name="paid_up_pay_suc">开通成功</string>
 
     <!--换购页面-->
     <string name="gift_title">换购</string>
     <string name="gift_select_all">全选</string>
 
+    <!--升级页面-->
+    <string name="update_hint_done">已经是最新版本</string>
+
 
 </resources>