修改Radiobutton间距

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

@@ -13,6 +13,7 @@ import com.xingdata.zzdpos.App;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.db.DBFactory;
+import com.xingdata.zzdpos.model.Level;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
@@ -39,7 +40,7 @@ public class VipPresenter extends VipContract.Presenter {
     public VipSearchFragment vipSearchFragment = new VipSearchFragment();
     public VipRechargeFragment vipRechargeFragment = new VipRechargeFragment();
     public  VipAddSucceedFragment vipAddSucceedFragment =new VipAddSucceedFragment();
-    public int inVipState = 0; //1 充值
+    public ArrayList<Level> levels = new ArrayList<>();
 
     @Override
     public void onAttached() {

app/src/main/java/com/xingdata/zzdpos/ui/vip/dialog/VipEditMenuDialog.java

@@ -34,14 +34,12 @@ public class VipEditMenuDialog extends BaseSheetDialog<VipPresenter, DialogVipMe
                 case R.id.editVip:
                     mPresenter.vipInfoEditFragment = new VipInfoEditFragment();
                     mPresenter.vipInfoEditFragment.setVip(mVip);
-                    mPresenter.vipInfoEditFragment.setVipLevel(mLevel);
                     ((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
                     break;
                 //充值記錄
                 case R.id.rechargeList:
                     mPresenter.vipRechargeListFragment = new VipRechargeListFragment();
                     mPresenter.vipRechargeListFragment.setVip(mVip);
-                    mPresenter.vipRechargeListFragment.setVipLevel(mLevel);
                     ((BaseActivity) getActivity()).start(mPresenter.vipRechargeListFragment);
                     break;
                 //優惠券詳情

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

@@ -6,14 +6,12 @@ package com.xingdata.zzdpos.ui.vip.fragment;
 
 import android.view.View;
 
-import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentVipAddSucceedBinding;
 import com.xingdata.zzdpos.model.Vip;
 import com.xingdata.zzdpos.ui.vip.VipPresenter;
 import com.xingdata.zzdpos.util.ConvertUtil;
-import com.xingdata.zzdpos.util.OnClickListener;
 
 /**
  * 会员信息界面
@@ -38,29 +36,22 @@ public class VipAddSucceedFragment extends BaseFragment<VipPresenter, FragmentVi
             mViewBinding.vipLevel.setText(mVip.getVipLevelName() + "    " + ConvertUtil.discount(mVip.getVipDefDiscount()) + "折");
         }
 
-        mViewBinding.onAdd.setOnClickListener(view -> {
-            ToastUtils.showShort("111");
+        mViewBinding.vipAdd.setOnClickListener(view -> {
+            this.pop();
+        });
+        mViewBinding.vipRecharge.setOnClickListener(view -> {
+            this.pop();
+            mPresenter.vipRechargeFragment.setVip(mVip);
+            start(mPresenter.vipRechargeFragment);
         });
 
-//        mViewBinding.setOnClickListener(view -> {
-//            switch (view.getId()) {
-//                case R.id.onSure:
-//
-//                    break;
-//
-//                    case R.id.onAdd;
-//
-//                    break;
-//
-//                    case R.id.
-//            }
-//        });
-        mViewBinding.infoTitle.ivBack.setOnClickListener(new OnClickListener() {
-            @Override
-            protected void myOnClickListener(View v) {
+        mViewBinding.vipSure.setOnClickListener(view -> {
             pop();
             mPresenter.vipListFragment.updateVipSus(null);
-            }
+        });
+
+        mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
+            pop();
         });
 
     }

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

@@ -35,7 +35,6 @@ import java.util.List;
  * 会员信息界面
  */
 public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipInfoEditBinding> {
-    private List<Level> levels;
     private ArrayList<Level> mLevels = new ArrayList<>();
     private Vip vip;
     private Byte vipTag;
@@ -48,6 +47,10 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
 
     @Override
     public void initView() {
+        mLevels.clear();
+        mLevels.add(mPresenter.levels.get(0));
+        mLevels.add(mPresenter.levels.get(mPresenter.levels.size() - 1));
+        mLevels.get(mLevels.size() - 1).setVipLevelName("超级会员");
         mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
         if (vip != null) {
             mViewBinding.infoTitle.tvTitle.setText("修改会员");
@@ -69,8 +72,8 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
         } else {
             mViewBinding.infoTitle.tvTitle.setText("添加会员");
             mViewBinding.vipDiscounts.setEnabled(true);
-            mViewBinding.vipDiscounts.setText(levels.get(0).getVipLevelName() + "    " + ConvertUtil.discount(levels.get(0).getVipDefDiscount()) + "折");
-            vipDiscounts = levels.get(0).getVipDefDiscount();
+            mViewBinding.vipDiscounts.setText(mPresenter.levels.get(0).getVipLevelName() + "    " + ConvertUtil.discount(mPresenter.levels.get(0).getVipDefDiscount()) + "折");
+            vipDiscounts = mPresenter.levels.get(0).getVipDefDiscount();
             mViewBinding.vipBirthday.setText(StringUtil.format(new Date(System.currentTimeMillis())));
             ((RadioButton) mViewBinding.vipSex.getChildAt(0)).setChecked(true);
         }
@@ -110,7 +113,7 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
                         mVip.setVipLevelName("超级会员");
                     } else {
                         mVip.setVipTag(Byte.parseByte("0"));
-                        mVip.setVipLevelName(levels.get(0).getVipLevelName());
+                        mVip.setVipLevelName(mPresenter.levels.get(0).getVipLevelName());
                     }
                     mVip.setVipDefDiscount(vipDiscounts);
                     int sexId = mViewBinding.vipSex.getCheckedRadioButtonId();
@@ -141,11 +144,11 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
                     @Override
                     public void onOptionsSelect(int options1, int options2, int options3, View v) {
                         if (options1 == 0) {
-                            mViewBinding.vipDiscounts.setText(levels.get(options1).getPickerViewText() + "    " + ConvertUtil.discount(levels.get(options1).getVipDefDiscount()) + "折");
-                            vipDiscounts = levels.get(options1).getVipDefDiscount();
+                            mViewBinding.vipDiscounts.setText(mPresenter.levels.get(options1).getPickerViewText() + "    " + ConvertUtil.discount(mPresenter.levels.get(options1).getVipDefDiscount()) + "折");
+                            vipDiscounts = mPresenter.levels.get(options1).getVipDefDiscount();
                         } else {
-                            mViewBinding.vipDiscounts.setText(levels.get(levels.size() - 1).getVipLevelName() + "    " + ConvertUtil.discount(levels.get(levels.size() - 1).getVipDefDiscount()) + "折");
-                            vipDiscounts = levels.get(levels.size() - 1).getVipDefDiscount();
+                            mViewBinding.vipDiscounts.setText(mPresenter.levels.get(mPresenter.levels.size() - 1).getVipLevelName() + "    " + ConvertUtil.discount(mPresenter.levels.get(mPresenter.levels.size() - 1).getVipDefDiscount()) + "折");
+                            vipDiscounts = mPresenter.levels.get(mPresenter.levels.size() - 1).getVipDefDiscount();
                         }
                         vipTag = Byte.parseByte(options1 + "");
                     }
@@ -159,14 +162,6 @@ public class VipInfoEditFragment extends BaseFragment<VipPresenter, FragmentVipI
         pvOptions.show();
     }
 
-    public void setVipLevel(List<Level> levels) {
-        this.levels = levels;
-        mLevels.clear();
-        mLevels.add(levels.get(0));
-        mLevels.add(levels.get(levels.size() - 1));
-        mLevels.get(mLevels.size() - 1).setVipLevelName("超级会员");
-    }
-
     public void setVip(Vip mVip) {
         this.vip = mVip;
     }

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

@@ -20,7 +20,6 @@ import java.util.List;
 
 public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoBinding> {
     private Vip mVip;
-    private List<Level> level;
 
 
     @Override
@@ -36,7 +35,7 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
         });
         mViewBinding.infoTitle.popMenu.setOnClickListener(view -> {
             VipEditMenuDialog dialog = new VipEditMenuDialog();
-            dialog.setLevel(level);
+            dialog.setLevel(mPresenter.levels);
             dialog.setVip(mVip);
             dialog.show((BaseActivity) getActivity());
         });
@@ -72,9 +71,6 @@ public class VipInfoFragment extends BaseFragment<VipPresenter, FragmentVipInfoB
         this.mVip = vip;
     }
 
-    public void setLevel(List<Level> level) {
-        this.level = level;
-    }
 
     public void addVipSus(Vip vip) {
         mVip = vip;

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

@@ -36,7 +36,6 @@ import java.util.List;
 public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListBinding> {
     private VipListAdapter vipListAdapter;
     private List<Vip> vips = new ArrayList<>();
-    private List<Level> levels = null;
     private int pageNumber = 0;
     private String strVipLevle;
     private int vipState = 0;//0 会员 1 充值
@@ -92,7 +91,7 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         mViewBinding.setOnClickListener(view -> {
             switch (view.getId()) {
                 case R.id.addVip:
-                    if (levels == null || levels.size() == 0) {
+                    if (mPresenter.levels== null || mPresenter.levels.size() == 0) {
                         ToastUtils.showShort("缺少会员等级");
                         return;
                     }
@@ -117,7 +116,6 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
             }
         });
         mViewBinding.titleSearch.serchEditText.setOnClickListener(view -> {
-            mPresenter.vipSearchFragment.setLevel(levels);
             if (vipState == 0) {
                 mPresenter.vipSearchFragment.setBaseFragment(mPresenter.vipInfoFragment);
             } else {
@@ -191,11 +189,12 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
 //            mPresenter.getVipList(0,mViewBinding.vipLevelR.getChildAt(0).getTag()== null ? null :  mViewBinding.vipLevelR.getChildAt(0).getTag().toString());
 
         }
-        levels = levelPager.getList();
+        mPresenter.levels.clear();
+        mPresenter.levels.addAll(levelPager.getList());
         Level level = new Level();
         level.setVipLevelName("超级会员");
-        level.setVipDefDiscount(levels.get(levels.size()-1).getVipDefDiscount());
-        levels.add(level);
+        level.setVipDefDiscount(mPresenter.levels.get(mPresenter.levels.size()-1).getVipDefDiscount());
+        mPresenter.levels.add(level);
     }
 
     private void onLoadMore() {
@@ -232,7 +231,6 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
         if (vip != null) {
             if (vipState == 0) {
                 mPresenter.vipInfoFragment.setVip(vip);
-                mPresenter.vipInfoFragment.setLevel(levels);
                 ((BaseActivity) getActivity()).start(mPresenter.vipInfoFragment);
             } else {
                 mPresenter.vipInfoFragment.setVip(vip);
@@ -241,7 +239,6 @@ public class VipListFragment extends BaseFragment<VipPresenter, FragmentVipListB
 
         } else {
             mPresenter.vipInfoEditFragment.setVip(null);
-            mPresenter.vipInfoEditFragment.setVipLevel(levels);
             ((BaseActivity) getActivity()).start(mPresenter.vipInfoEditFragment);
         }
     }

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

@@ -12,6 +12,7 @@ import android.text.Spanned;
 import android.text.SpannedString;
 import android.text.TextWatcher;
 import android.text.style.AbsoluteSizeSpan;
+import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.LinearLayout;
 import android.widget.RadioButton;
@@ -40,7 +41,6 @@ import java.util.List;
  */
 @SuppressLint("ValidFragment")
 public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipRechargeBinding> {
-    private List<Level> levels;
     private List<Mscard> mscards = new ArrayList<>();
     private LinearLayout.LayoutParams layoutParams = null;
     private HashMap<String, Mscard> mscardHashMap = new HashMap<>();
@@ -57,6 +57,7 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
 
     @Override
     public void initView() {
+        mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
         mViewBinding.vipMobile.setText(String.valueOf(mVip.getVipMobile()));
         mViewBinding.vipName.setText(String.valueOf(mVip.getVipName()));
         mViewBinding.infoTitle.tvTitle.setText("充值");
@@ -110,9 +111,6 @@ public class VipRechargeFragment extends BaseFragment<VipPresenter, FragmentVipR
         return true;
     }
 
-    public void setVipLevel(List<Level> levels) {
-        this.levels = levels;
-    }
 
 
     public void setVip(Vip mVip) {

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

@@ -37,7 +37,6 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
     private VipRechargeAdapter vipRechargeAdapter;
     private List<VipRechargeOrder> orders = new ArrayList<>();
     private int pageNumber = 0;
-    private List<Level> levels;
 
 
     @Override
@@ -87,9 +86,6 @@ public class VipRechargeListFragment extends BaseFragment<VipPresenter, Fragment
         return true;
     }
 
-    public void setVipLevel(List<Level> levels) {
-        this.levels = levels;
-    }
 
 
     public void setVip(Vip mVip) {

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

@@ -30,7 +30,6 @@ import java.util.List;
 public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSerchBinding> {
     private VipAdapter mVipAdapter;
     private BaseFragment baseFragment;
-    private List<Level> level;
 
     public void setBaseFragment(BaseFragment baseFragment) {
         this.baseFragment = baseFragment;
@@ -55,7 +54,6 @@ public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSer
         ((EditText) mViewBinding.etSearch).requestFocus();
         mVipAdapter.setOnItemClickListener((adapter, view, position) -> {
             if (baseFragment instanceof VipInfoFragment) {
-                ((VipInfoFragment) baseFragment).setLevel(this.level);
                 ((VipInfoFragment) baseFragment).setVip(mVipAdapter.getData().get(position));
             }else if (baseFragment instanceof VipRechargeFragment){
                 ((VipRechargeFragment) baseFragment).setVip(mVipAdapter.getData().get(position));
@@ -102,9 +100,6 @@ public class VipSearchFragment extends BaseFragment<VipPresenter, FragmentVipSer
         mVipAdapter.setNewData(vips.getList());
     }
 
-    public void setLevel(List<Level> level) {
-        this.level = level;
-    }
 
     @Override
     public void onResume() {

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

 <?xml version="1.0" encoding="utf-8"?>
 <layout>
-
     <data>
         <variable
             name="onClickListener"
-            type="com.xingdata.zzdpos.util.OnClickListener" />
-
+            type="android.view.View.OnClickListener" />
     </data>
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -122,26 +120,21 @@
                 android:orientation="vertical">
 
                 <Button
-                    android:id="@+id/onSure"
+                    android:id="@+id/vip_Sure"
                     style="@style/button_positive_noradius"
                     android:layout_alignParentBottom="true"
-                    android:onClick="@{onClickListener}"
                     android:text="完成" />
 
                 <Button
-                    android:id="@+id/onRecharge"
+                    android:id="@+id/vip_recharge"
                     style="@style/button_positive_white"
-                    android:layout_alignBottom="@id/onRecharge"
                     android:layout_alignParentBottom="true"
-                    android:onClick="@{onClickListener}"
                     android:text="充值" />
 
                 <Button
-                    android:id="@+id/onAdd"
+                    android:id="@+id/vip_add"
                     style="@style/button_positive_white"
-                    android:layout_alignBottom="@id/onRecharge"
                     android:layout_alignParentBottom="true"
-                    android:onClick="@{onClickListener}"
                     android:text="继续添加" />
             </LinearLayout>
         </RelativeLayout>