Merge remote-tracking branch 'origin/master'

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());
+        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

@@ -465,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>