Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/res/layout/activity_statistics_detail.xml

app/src/main/java/com/xingdata/zzdpos/base/BaseActivity.java

@@ -132,4 +132,27 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
             super.start(toFragment);
         }
     }
+
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            dialogDismiss();
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
+    @Override
+    public void onBackPressedSupport() {
+        dialogDismiss();
+        super.onBackPressedSupport();
+    }
+
+    /**
+     * 关闭对话框
+     */
+    public void dialogDismiss() {
+        if (null != mLoadingDialog && mLoadingDialog.isShowing) {
+            mLoadingDialog.dismiss();
+        }
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/announcement/AnnouncementActivity.java

@@ -17,7 +17,6 @@ import com.xingdata.zzdpos.util.OnClickListener;
 public class AnnouncementActivity extends BaseActivity<AnnouncementPresenter, ActivityAnnouncementBinding> implements AnnouncementContract.View {
 
     private AnnouncementFragment mAnnouncementFragment = new AnnouncementFragment();
-    LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {

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

@@ -33,7 +33,6 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         getDialog().getWindow().setBackgroundDrawableResource(R.color.transparent);
-
     }
 
     public void show(BaseActivity activity, boolean isClose) {

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java

@@ -32,7 +32,6 @@ import java.util.List;
 public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBinding> implements
         LoginContract.View {
     private long mExitTime;
-    LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {
@@ -335,6 +334,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         } else {
             pop();
         }
+        super.onBackPressedSupport();
 
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/login/LoginContract.java

@@ -160,8 +160,8 @@ public interface LoginContract {
          * @param phone    手机号
          * @param password 密码
          */
-        abstract void signIn(String phone, String password, PromptDialog promptDialog,
-                             LoadingDialog loadingDialog);
+        public abstract void signIn(String phone, String password, PromptDialog promptDialog,
+                                    LoadingDialog loadingDialog);
 
         /**
          * 登录页面-帐号下拉框

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/BindingCounterFragment.java

@@ -26,7 +26,6 @@ import java.util.List;
  */
 public class BindingCounterFragment extends BaseFragment<LoginPresenter,
         FragmentBindingCounterBinding> {
-    private LoadingDialog mLoadingDialog = new LoadingDialog();
     Shops mShops = new Shops();
     //款台id
     long CounterId = -1;

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/ChoiceStoreFragment.java

@@ -9,7 +9,6 @@ import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentChoiceStoreBinding;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
 import com.xingdata.zzdpos.util.OnClickListener;
@@ -26,7 +25,6 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
         FragmentChoiceStoreBinding> {
     private Shops shops;
     private Boolean lock = false;
-    private LoadingDialog mLoadingDialog = new LoadingDialog();
     List<Shops> list = new ArrayList<>();
 
     @Override

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/CreateStoreFragment.java

@@ -33,7 +33,6 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
 
     private ArrayList<StoreTypeJsonBean> listTypeItem1 = new ArrayList<>();
     private ArrayList<ArrayList<String>> listTypeItem2 = new ArrayList<>();
-    LoadingDialog mLoadingDialog = new LoadingDialog();
     //判断是否加载完数据
     private Boolean isLock = false;
     //省市县地址id

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/InputPasswordFragment.java

@@ -26,7 +26,6 @@ public class InputPasswordFragment extends BaseFragment<LoginPresenter,
     private String twoPwd;
     //找回密码发验证码为1，注册发验证码为2
     int startway = -1;
-    private LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SelectIndustryFragment.java

@@ -31,7 +31,6 @@ public class SelectIndustryFragment extends BaseFragment<LoginPresenter,
     List<Industry> list = new ArrayList<>();
     SelectIndustryAdapter selectIndustryAdapter;
     long mExitTime;
-    LoadingDialog loadingDialog = new LoadingDialog();
     Boolean isLoadMore = false;
     int nowId = 0;
 

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SignInFragment.java

@@ -31,7 +31,6 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
     String errorMsg;
     PromptDialog promptDialog;
     private int time = 0;
-    LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {

app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SmsCodeFragment.java

@@ -34,7 +34,6 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter,
     Disposable disp;
     //找回密码发验证码为1，注册发验证码为2
     int startway = -1;
-    LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {

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

@@ -45,7 +45,6 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
     //    private List<View> views=new ArrayList<>();
     private List<ItemMenuBottomBinding> itemMenuBottomBindings = new ArrayList<>();
     private HandoverDialog mHandoverDialog = new HandoverDialog();
-    LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleEditFragment.java

@@ -45,7 +45,6 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
     EditFragmentQueryShopAdapter queryShopAdapter;
     EditFragmentImgShopAdapter editFragmentImgShopAdapter;
     private long mExitTime;
-    public LoadingDialog loadingDialog = new LoadingDialog();
     List<Sssku> listData = new ArrayList<>();
     //需要提交给服务器的对象
     private UsskuParam mUsskuParam;
@@ -134,14 +133,14 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
                     break;
                     case R.id.btn_ok: {
                         if (isNullAndSet()) {
-                            loadingDialog.show((BaseActivity) getActivity());
+                            mLoadingDialog.show((BaseActivity) getActivity());
                             if (nowType == 1) {
                                 //新增
-                                mPresenter.usskuAddMis(mUsskuParam, loadingDialog);
+                                mPresenter.usskuAddMis(mUsskuParam, mLoadingDialog);
                             } else if (nowType == 2) {
                                 //更新
                                 mUsskuParam.setSkuId(ussku.getSkuId());
-                                mPresenter.usskuUpdate(mUsskuParam, loadingDialog);
+                                mPresenter.usskuUpdate(mUsskuParam, mLoadingDialog);
                             }
 
                         } else {
@@ -158,9 +157,9 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
                                     @Override
                                     public void onClick(View view) {
                                         //拆解商品
-                                        loadingDialog.show((BaseActivity) getActivity());
+                                        mLoadingDialog.show((BaseActivity) getActivity());
                                         mPresenter.usskuDelete(ussku.getSkuId() + "",
-                                                loadingDialog);
+                                                mLoadingDialog);
                                         promptDialog.dismiss();
                                     }
                                 }, new View.OnClickListener() {

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleIndexFragment.java

@@ -33,7 +33,6 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
     BaleIndexAdapter mBaleIndexAdapter;
     //    final int SPACING = mContext.getResources().getDimensionPixelOffset(R.dimen
 //            .fragment_store_item_spacing);
-    LoadingDialog loadingDialog = new LoadingDialog();
     long mExitTime;
     Boolean isLoadMore = false;
 
@@ -87,12 +86,12 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
                                                                     public void onScanCompleted
                                                                             (String barcode) {
                                                                         pop();
-                                                                        loadingDialog.show(
+                                                                        mLoadingDialog.show(
                                                                                 (BaseActivity)
                                                                                         getActivity());
                                                                         mPresenter.usskuQuery
                                                                                 (barcode,
-                                                                                        loadingDialog);
+                                                                                        mLoadingDialog);
                                                                     }
                                                                 });
 
@@ -110,8 +109,8 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
                                             }
                                         }
         );
-        loadingDialog.show((BaseActivity) getActivity());
-        mPresenter.usskuQuery("", loadingDialog);
+        mLoadingDialog.show((BaseActivity) getActivity());
+        mPresenter.usskuQuery("", mLoadingDialog);
 
         KeyboardUtils.showSoftInput(mViewBinding.tvKeyword);
     }
@@ -174,11 +173,11 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
     private void refreshProduct() {
 
         mBaleIndexAdapter.setEnableLoadMore(false);
-        loadingDialog.show((BaseActivity) getActivity());
+        mLoadingDialog.show((BaseActivity) getActivity());
         if (nowData.size() <= 0) {
-            mPresenter.usskuQuery("", loadingDialog);
+            mPresenter.usskuQuery("", mLoadingDialog);
         } else {
-            mPresenter.usskuQuery(null, loadingDialog);
+            mPresenter.usskuQuery(null, mLoadingDialog);
         }
 
     }
@@ -189,7 +188,7 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
     private void loadMoreProduct() {
         mViewBinding.srlProducts.setRefreshing(false);
         if (isLoadMore) {
-            mPresenter.queryShopItemLoadMore(1, loadingDialog);
+            mPresenter.queryShopItemLoadMore(1, mLoadingDialog);
         } else {
             mBaleIndexAdapter.setEnableLoadMore(false);
         }
@@ -206,8 +205,8 @@ public class BaleIndexFragment extends BaseFragment<BalePresenter, FragmentBaleI
     private void clickProduct(Ussku sssku) {
         if ((System.currentTimeMillis() - mExitTime) > 1000) {
             mExitTime = System.currentTimeMillis();
-            loadingDialog.show((BaseActivity) getActivity());
-            mPresenter.usskuDetail(sssku.getSkuId() + "", loadingDialog);
+            mLoadingDialog.show((BaseActivity) getActivity());
+            mPresenter.usskuDetail(sssku.getSkuId() + "", mLoadingDialog);
         } else {
             ToastUtils.showLong("您操作太快了");
         }

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachFragment.java

@@ -16,7 +16,6 @@ import com.xingdata.zzdpos.util.OnClickListener;
  */
 
 public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleSeachBinding> {
-    LoadingDialog loadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {
@@ -52,7 +51,7 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
 //        );
         mViewBinding.vSearch.setOnSearchListener(keyword -> {
             mViewBinding.vSearch.hideSoftInput();
-            loadingDialog.show((BaseActivity) getActivity());
+            mLoadingDialog.show((BaseActivity) getActivity());
             seach(keyword);
         });
         mViewBinding.vSearch.setHint("请输入商品名称/助记码/条码");
@@ -61,9 +60,9 @@ public class BaleSeachFragment extends BaseFragment<BalePresenter, FragmentBaleS
     }
 
     public void seach(String str) {
-        loadingDialog.show((BaseActivity)
+        mLoadingDialog.show((BaseActivity)
                 getActivity());
-        mPresenter.usskuQuery(str, loadingDialog);
+        mPresenter.usskuQuery(str, mLoadingDialog);
         pop();
     }
 }

app/src/main/java/com/xingdata/zzdpos/ui/manage/bale/fragment/BaleSeachShopFragment.java

@@ -11,7 +11,6 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentBaleSeachShopBinding;
 import com.xingdata.zzdpos.model.Sssku;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.manage.bale.BalePresenter;
 import com.xingdata.zzdpos.ui.manage.bale.adpter.EditDialogQueryShopItemAdapter;
 import com.xingdata.zzdpos.util.OnClickListener;
@@ -25,7 +24,6 @@ import java.util.List;
 
 public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
         FragmentBaleSeachShopBinding> {
-    LoadingDialog loadingDialog = new LoadingDialog();
     EditDialogQueryShopItemAdapter queryShopItemAdapter;
     long mExitTime;
     Boolean isLoadMore = false;
@@ -59,14 +57,14 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
             queryShopItemAdapter.setNewData(nowData);
             getEmptyView("没有数据");
         }
-        loadingDialog.show((BaseActivity) getActivity());
+        mLoadingDialog.show((BaseActivity) getActivity());
         if (barCode != null) {
             mViewBinding.vSearch.setText(barCode);
             mPresenter.queryShopItem(barCode, true,
-                    loadingDialog);
+                    mLoadingDialog);
         } else {
             mPresenter.queryShopItem("", true,
-                    loadingDialog);
+                    mLoadingDialog);
         }
 
 
@@ -119,8 +117,8 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
 //        );
         mViewBinding.vSearch.setOnSearchListener(keyword -> {
             mViewBinding.vSearch.hideSoftInput();
-            loadingDialog.show((BaseActivity) getActivity());
-            mPresenter.queryShopItem(keyword, true, loadingDialog);
+            mLoadingDialog.show((BaseActivity) getActivity());
+            mPresenter.queryShopItem(keyword, true, mLoadingDialog);
         });
         mViewBinding.vSearch.setHint("请输入商品名称/助记码/条码");
         mViewBinding.vSearch.setEmptyEnabled(true);
@@ -159,8 +157,8 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
      */
     private void refreshProduct() {
         queryShopItemAdapter.setEnableLoadMore(false);
-        loadingDialog.show((BaseActivity) getActivity());
-        mPresenter.queryShopItem(null, null, loadingDialog);
+        mLoadingDialog.show((BaseActivity) getActivity());
+        mPresenter.queryShopItem(null, null, mLoadingDialog);
     }
 
     /**
@@ -169,7 +167,7 @@ public class BaleSeachShopFragment extends BaseFragment<BalePresenter,
     private void loadMoreProduct() {
         mViewBinding.srlProducts.setRefreshing(false);
         if (isLoadMore) {
-            mPresenter.queryShopItemLoadMore(1, loadingDialog);
+            mPresenter.queryShopItemLoadMore(1, mLoadingDialog);
         } else {
             queryShopItemAdapter.setEnableLoadMore(false);
         }

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

@@ -17,7 +17,6 @@ import com.xingdata.zzdpos.model.Cs;
 import com.xingdata.zzdpos.model.CsDetail;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Sssku;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryAddFragment;
 import com.xingdata.zzdpos.ui.manage.inventory.fragment.InventoryFragment;
 import com.xingdata.zzdpos.ui.manage.manageMenu.ManageDateFragment;
@@ -35,7 +34,6 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
     private ManageDateFragment mManageDateFragment = new ManageDateFragment();
     private InventoryAddFragment mInventoryAddFragment;
     ;
-    LoadingDialog mLoadingDialog = new LoadingDialog();
     private ScanFragment mScanFragment;
 
     @Override
@@ -73,7 +71,8 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
     @Override
     public void showDateFragment() {
 
-        FragmentUtils.add(getSupportFragmentManager(), mManageDateFragment, R.id.f_bottom, false, true);
+        FragmentUtils.add(getSupportFragmentManager(), mManageDateFragment, R.id.f_bottom, false,
+                true);
 
     }
 
@@ -195,7 +194,8 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
                         public void onGranted(List<String> permissionsGranted) {
                             if (mScanFragment == null) {
                                 mScanFragment = new ScanFragment();
-                                mScanFragment.setOnScanCompletedListener(new ScanFragment.OnScanCompletedListener() {
+                                mScanFragment.setOnScanCompletedListener(new ScanFragment
+                                        .OnScanCompletedListener() {
                                     @Override
                                     public void onScanCompleted(String barcode) {
                                         mPresenter.getProductByBarcode(barcode);

app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/OtherSelectActivity.java

@@ -33,7 +33,6 @@ public class OtherSelectActivity extends BaseActivity<OtherSelectPresenter,
         ActivityOtherSelectBinding> implements OtherSelectContract.View {
     private OtherListFragment mOtherListFragment = new OtherListFragment();
     private OtherDetailFragment mOtherDetailFragment = new OtherDetailFragment();
-    LoadingDialog mLoadingDialog = new LoadingDialog();
     private ScanFragment mScanFragment;
 
     @Override

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

@@ -29,7 +29,6 @@ public class ReplenishmentActivity extends BaseActivity<ReplenishmentPresenter,
             ReplenishmentDetailFragment();
     private boolean isAllowFragment = true;
     private ScanFragment mScanFragment;
-    LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {

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

@@ -12,7 +12,6 @@ import com.xingdata.zzdpos.model.Cor;
 import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Sskugrp;
 import com.xingdata.zzdpos.model.Sssku;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.manage.replenishment.ReplenishmentActivity;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.AddFragment;
 import com.xingdata.zzdpos.ui.manage.sssku.fragment.DetailFragment;
@@ -27,7 +26,8 @@ import com.xingdata.zzdpos.util.Global;
 
 import java.util.List;
 
-public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBinding> implements SsskuContract.View {
+public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBinding> implements
+        SsskuContract.View {
 
     private ManagerFragment mManagerFragment = new ManagerFragment();
     private SearchFragment mSearchFragment = new SearchFragment();
@@ -40,7 +40,6 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
     private PriceFragment mPriceFragment = new PriceFragment();
     private VipFragment mVipFragment = new VipFragment();
 
-    private LoadingDialog mLoadingDialog = new LoadingDialog();
     private ScanFragment mScanFragment = new ScanFragment();
 
     @Override
@@ -53,7 +52,8 @@ public class SsskuActivity extends BaseActivity<SsskuPresenter, ActivitySsskuBin
         this.showTitleBarByTitleMode(C.TITLE_MODE.SKU_MANAGER);
         this.loadRootFragment(R.id.f_sssku, mManagerFragment);
         mViewBinding.btnBack.setOnClickListener(view -> getTopFragment().onBackPressedSupport());
-        mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickScan(mViewBinding.getTitleMode()));
+        mViewBinding.btnScan.setOnClickListener(view -> mPresenter.clickScan(mViewBinding
+                .getTitleMode()));
         mViewBinding.btnMenu.setOnClickListener(view -> mPresenter.clickSkuMenu());
         mViewBinding.vSearch.setOnSearchListener(keyword -> mPresenter.searchSku(keyword));
     }

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

@@ -68,35 +68,34 @@ public class UserInfoEditFragment extends BaseFragment<UserPresenter, FragmentUs
                     break;
 
                 case R.id.onSure:
-                    if (oper == null) {
-                        oper = new Oper();
-                    }
+                    Oper mOper = new Oper();
 
                     if (mViewBinding.userName.getText().length() == 0) {
-                        ToastUtils.showShort("会员名称不能为空");
+                        ToastUtils.showShort("店员名称不能为空");
                         return;
                     }
                     if (mViewBinding.userPhone.getText().length() == 0) {
-                        ToastUtils.showShort("会员帐号不能为空");
+                        ToastUtils.showShort("店员帐号不能为空");
                         return;
                     }
                     if (mViewBinding.userPhone.getText().length() !=11) {
-                        ToastUtils.showShort("会员帐号长度必须11位");
+                        ToastUtils.showShort("店员帐号长度必须11位");
                         return;
                     }
 
                     if (mViewBinding.userLevel.getText().length() == 0) {
-                        ToastUtils.showShort("会员等级不能为空");
+                        ToastUtils.showShort("店员等级不能为空");
                         return;
                     }
 
-                    oper.setOperLevel(Byte.valueOf(mPresenter.operLevel.get(mViewBinding.userLevel.getText().toString())));
-                    oper.setOperMobile(Long.parseLong(mViewBinding.userPhone.getText().toString()));
-                    oper.setOperName(mViewBinding.userName.getText().toString());
+                    mOper.setOperLevel(Byte.valueOf(mPresenter.operLevel.get(mViewBinding.userLevel.getText().toString())));
+                    mOper.setOperMobile(Long.parseLong(mViewBinding.userPhone.getText().toString()));
+                    mOper.setOperName(mViewBinding.userName.getText().toString());
                     if (oper.getOperId() == null) {
-                        mPresenter.addUser(oper);
+                        mPresenter.addUser(mOper);
                     } else {
-                        mPresenter.updateUser(oper);
+                        mOper.setOperId(oper.getOperId());
+                        mPresenter.updateUser(mOper);
                     }
                     break;
             }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralExchangeFragment.java

@@ -53,11 +53,10 @@ public class IntegralExchangeFragment extends BaseFragment<IntegralPresenter,
                 break;
                 case R.id.btn_ok: {
                     if (isNullAndSet()) {
-                        LoadingDialog loadingDialog = new LoadingDialog();
-                        loadingDialog.show((BaseActivity) getActivity());
+                        mLoadingDialog.show((BaseActivity) getActivity());
                         ubound.setUpdateTime(null);
                         ubound.setCreateTime(null);
-                        mPresenter.exchangeUpdate(ubound, loadingDialog);
+                        mPresenter.exchangeUpdate(ubound, mLoadingDialog);
                     } else {
                         ToastUtils.showLong("输入数据不能null");
                     }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralGetFragment.java

@@ -19,7 +19,6 @@ import com.xingdata.zzdpos.databinding.DialogIntegralGetSettingBinding;
 import com.xingdata.zzdpos.model.Category;
 import com.xingdata.zzdpos.model.Gbound;
 import com.xingdata.zzdpos.model.Level;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.marketing.integral.IntegralPresenter;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.OnClickListener;
@@ -54,8 +53,6 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
     private Category category = new Category();
     //当前为修改还是新增 0为修改1为新增
     private int nowType = -1;
-    //进度对话框
-    LoadingDialog loadingDialog;
     //当前点击商品类型空间id，防止直接点击商品第二三种类型
     private int nowShopTypeId = 0;
 
@@ -141,15 +138,14 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
                     break;
                     case R.id.btn_add: {
                         if (isNullAndSetDate()) {
-                            LoadingDialog loadingDialog = new LoadingDialog();
-                            loadingDialog.show((BaseActivity) getActivity());
+                            mLoadingDialog.show((BaseActivity) getActivity());
                             if (nowType == 0) {
                                 //修改
-                                mPresenter.update(gbound, loadingDialog);
+                                mPresenter.update(gbound, mLoadingDialog);
                                 LogUtils.e("修改");
                             } else if (nowType == 1) {
                                 //新增
-                                mPresenter.add(gbound, loadingDialog);
+                                mPresenter.add(gbound, mLoadingDialog);
                                 LogUtils.e("新增");
                             }
 
@@ -176,8 +172,8 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
             gbound.setBoundGetStatus(0);
             gbound.setVipGboundType((byte) 0);
         }
-        if (loadingDialog != null) {
-            loadingDialog.dismiss();
+        if (mLoadingDialog != null) {
+            mLoadingDialog.dismiss();
         }
         mViewBinding.etIntegralTimeLimit.addTextChangedListener(textWatcher);
         mViewBinding.etIntegralCategoryTimeLimit.addTextChangedListener(textWatcher);
@@ -313,7 +309,8 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
      * 初始化会员等级选择对话框
      */
     private void initVipLevelOptionPicker(RealmResults<Level> realmResult) {//条件选择器初始化，自定义布局
-        pvCustomOptions = new OptionsPickerView.Builder(getActivity(), new OptionsPickerView.OnOptionsSelectListener() {
+        pvCustomOptions = new OptionsPickerView.Builder(getActivity(), new OptionsPickerView
+                .OnOptionsSelectListener() {
             @Override
             public void onOptionsSelect(int options1, int option2, int options3, View v) {
                 gbound.setVipLevel(realmResult.get(options1).getVipLevel());
@@ -517,10 +514,9 @@ public class IntegralGetFragment extends BaseFragment<IntegralPresenter,
     /**
      * @param gbound
      */
-    public void setData(Gbound gbound, LoadingDialog loadingDialog) {
+    public void setData(Gbound gbound) {
         this.gbound = gbound.clone();
         this.ShowGbound = gbound;
-        this.loadingDialog = loadingDialog;
         //置状态为修改状态
         setNowType(0);
     }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/integral/fragment/IntegralIndexFragment.java

@@ -39,7 +39,6 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
     public static final int NORMAL_TYPE = 1;
     public static final int LOADMORE_TYPE = 2;
     public static final int REFRESH_TYPE = 3;
-    LoadingDialog loadingDialog = new LoadingDialog();
     private long mExitTime;//控制快速点击
 
     @Override
@@ -99,9 +98,8 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
                     mViewBinding.rbExchange.getPaint().setFakeBoldText(true);
                     mViewBinding.icTitle.tvTitle.setText("兑换积分规则");
                     showView(v.getId());
-                    LoadingDialog loadingDialog = new LoadingDialog();
-                    loadingDialog.show((BaseActivity) getActivity());
-                    mPresenter.exchangeQuery(loadingDialog);
+                    mLoadingDialog.show((BaseActivity) getActivity());
+                    mPresenter.exchangeQuery(mLoadingDialog);
 
                 }
                 break;
@@ -197,9 +195,9 @@ public class IntegralIndexFragment extends BaseFragment<IntegralPresenter,
 
         if ((System.currentTimeMillis() - mExitTime) > 1000) {
 //            integralGetDialog = new IntegralGetDialog();
-            loadingDialog.show((BaseActivity) getActivity());
+            mLoadingDialog.show((BaseActivity) getActivity());
             mPresenter.integralGetFragment = new IntegralGetFragment();
-            mPresenter.integralGetFragment.setData(gbound, loadingDialog);
+            mPresenter.integralGetFragment.setData(gbound);
             start(mPresenter.integralGetFragment);
 //            integralGetDialog.show((BaseActivity) getActivity());
             mExitTime = System.currentTimeMillis();

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ms/MsActivity.java

@@ -11,7 +11,6 @@ import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.databinding.ActivityMsBinding;
 import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.model.Pager;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.marketing.ms.fragment.AddFragment;
 import com.xingdata.zzdpos.ui.marketing.ms.fragment.EditorFragment;
 import com.xingdata.zzdpos.ui.marketing.ms.fragment.ManagerFragment;
@@ -34,8 +33,6 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
     private SearchFragment<Sku> mSearchFragment = new SearchFragment<>();
     private ScanFragment mScanFragment = new ScanFragment<>();
 
-    private LoadingDialog mLoadingDialog = new LoadingDialog();
-
     @Override
     public int getLayoutId() {
         return R.layout.activity_ms;

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleEditFragment.java

@@ -5,31 +5,39 @@ package com.xingdata.zzdpos.ui.marketing.recharge.fragment;
  */
 
 import android.app.DatePickerDialog;
+import android.graphics.Color;
 import android.view.View;
 import android.widget.DatePicker;
 import android.widget.RadioButton;
 import android.widget.TextView;
 
+import com.bigkoo.pickerview.OptionsPickerView;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentRechargeRuleEditBinding;
 import com.xingdata.zzdpos.databinding.FragmentVipLevelEditBinding;
 import com.xingdata.zzdpos.model.Level;
+import com.xingdata.zzdpos.model.Ms;
 import com.xingdata.zzdpos.model.Mscard;
 import com.xingdata.zzdpos.ui.marketing.recharge.RechargeRulePresenter;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.StringUtil;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 会员等级编辑界面
  */
 public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter, FragmentRechargeRuleEditBinding> {
     private Mscard mMscard;
+    private List<Mscard> mscards;
+    private ArrayList<String> mScards;
+
 
     @Override
     public int getLayoutId() {
@@ -39,7 +47,7 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
     @Override
     public void initView() {
         mViewBinding.infoTitle.popMenu.setVisibility(View.GONE);
-
+        iniMscard();
         if (mMscard != null) {
             mViewBinding.infoTitle.tvTitle.setText("修改充值优惠");
             mViewBinding.ruleNameLayout.setVisibility(View.GONE);
@@ -48,6 +56,7 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
             mViewBinding.sendAmt.setText(ConvertUtil.fenToYuanNoZero(mMscard.getCruleSendAmt()));
             mViewBinding.ruleBeginTime.setText(StringUtil.format(new Date(mMscard.getDateBegin())));
             mViewBinding.ruleEndTime.setText(StringUtil.format(new Date(mMscard.getDateEnd())));
+            mViewBinding.rechargNo.setText(mMscard.getCruleGradeNo().toString());
             RadioButton radioButton = mViewBinding.ruleState.findViewWithTag(mMscard.getCruleStatus().toString());
             if (radioButton != null) {
                 radioButton.setChecked(true);
@@ -55,7 +64,8 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         } else {
             mViewBinding.ruleNameLayout.setVisibility(View.GONE);
             mViewBinding.infoTitle.tvTitle.setText("新增充值优惠");
-            ((RadioButton)mViewBinding.ruleState.getChildAt(0)).setChecked(true);
+            ((RadioButton) mViewBinding.ruleState.getChildAt(1)).setChecked(true);
+            mViewBinding.rechargNo.setText(mScards.get(0));
         }
 
         mViewBinding.setOnClickListener(view -> {
@@ -66,13 +76,15 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
                         mscard.setId(mMscard.getId());
                         mscard.setCruleGradeNo(mMscard.getCruleGradeNo());
                         mscard.setIssuerMapId(mMscard.getIssuerMapId());
+                    } else {
+                        mscard.setCruleGradeNo(Byte.parseByte(mViewBinding.rechargNo.getText().toString()));
                     }
 
                     if (mViewBinding.rechargAmt.getText().length() == 0) {
                         ToastUtils.showShort("充值金额不能为空");
                         return;
                     }
-                    if (Long.parseLong(mViewBinding.rechargAmt.getText().toString())<=0) {
+                    if (Long.parseLong(mViewBinding.rechargAmt.getText().toString()) <= 0) {
                         ToastUtils.showShort("充值金额必须大于0");
                         return;
                     }
@@ -80,20 +92,20 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
                         ToastUtils.showShort("赠送金额不能为空");
                         return;
                     }
-                    if (Long.parseLong(mViewBinding.sendAmt.getText().toString())<=0) {
+                    if (Long.parseLong(mViewBinding.sendAmt.getText().toString()) <= 0) {
                         ToastUtils.showShort("赠送金额必须大于0");
                         return;
                     }
-                    if (Long.parseLong(mViewBinding.sendAmt.getText().toString())>Long.parseLong(mViewBinding.rechargAmt.getText().toString())) {
+                    if (Long.parseLong(mViewBinding.sendAmt.getText().toString()) > Long.parseLong(mViewBinding.rechargAmt.getText().toString())) {
                         ToastUtils.showShort("充值金额必须大于或者等于赠送金额");
                         return;
                     }
-                    if (StringUtil.getTimeMillis(mViewBinding.ruleBeginTime.getText().toString()) >=StringUtil.getTimeMillis(mViewBinding.ruleEndTime.getText().toString())) {
+                    if (StringUtil.getTimeMillis(mViewBinding.ruleBeginTime.getText().toString()) >= StringUtil.getTimeMillis(mViewBinding.ruleEndTime.getText().toString())) {
                         ToastUtils.showShort("开始时间不能大于或者等于结束日期");
                         return;
                     }
-                    mscard.setCruleChargeAmt(ConvertUtil.yuanToFen( mViewBinding.rechargAmt.getText().toString()));
-                    mscard.setCruleSendAmt(ConvertUtil.yuanToFen( mViewBinding.sendAmt.getText().toString()));
+                    mscard.setCruleChargeAmt(ConvertUtil.yuanToFen(mViewBinding.rechargAmt.getText().toString()));
+                    mscard.setCruleSendAmt(ConvertUtil.yuanToFen(mViewBinding.sendAmt.getText().toString()));
                     mscard.setCruleStatus(Byte.parseByte(mViewBinding.ruleState.findViewById(mViewBinding.ruleState.getCheckedRadioButtonId()).getTag().toString()));
                     mscard.setDateBegin(StringUtil.getTimeMillis(mViewBinding.ruleBeginTime.getText().toString()));
                     mscard.setDateEnd(StringUtil.getTimeMillis(mViewBinding.ruleEndTime.getText().toString()));
@@ -106,12 +118,30 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
                 case R.id.rule_end_time:
                     showDialogPick(mViewBinding.ruleEndTime);
                     break;
+
+                case R.id.recharg_No:
+
+                    ShowRechargeNo();
+                    break;
             }
         });
         mViewBinding.infoTitle.ivBack.setOnClickListener(view -> {
             pop();
         });
 
+
+    }
+
+    private void iniMscard() {
+        mScards = new ArrayList<>();
+        for (int i = 1; i < 10; i++) {
+            mScards.add(String.valueOf(i));
+        }
+        for (Mscard mscard : mscards) {
+            if (mScards.contains(mscard.getCruleGradeNo().toString())) {
+                mScards.remove(mscard.getCruleGradeNo().toString());
+            }
+        }
     }
 
     @Override
@@ -119,7 +149,9 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         return false;
 
     }
+
     //将两个选择时间的dialog放在该函数中
+
     private void showDialogPick(final View btn) {
         //获取Calendar对象，用于获取当前时间
         final Calendar calendar = Calendar.getInstance();
@@ -141,7 +173,33 @@ public class RechargeRuleEditFragment extends BaseFragment<RechargeRulePresenter
         datePickerDialog.show();
     }
 
+
+    /**
+     * 弹出选择会员P
+     *
+     * @param mScards
+     */
+    private void ShowRechargeNo() {// 弹出选择器
+        OptionsPickerView pvOptions = new OptionsPickerView.Builder(getActivity(), new
+                OptionsPickerView.OnOptionsSelectListener() {
+                    @Override
+                    public void onOptionsSelect(int options1, int options2, int options3, View v) {
+                        mViewBinding.rechargNo.setText(mScards.get(options1));
+                    }
+                }).setTitleText("请选择")
+                .setDividerColor(Color.BLACK)
+                .setTextColorCenter(Color.BLACK) //设置选中项文字颜色
+                .setContentTextSize(20)
+                .build();
+        pvOptions.setPicker(mScards);
+        pvOptions.show();
+    }
+
     public void setmMscard(Mscard mMscard) {
         this.mMscard = mMscard;
     }
+
+    public void setMscards(List<Mscard> mscards) {
+        this.mscards = mscards;
+    }
 }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/recharge/fragment/RechargeRuleListFragment.java

@@ -50,6 +50,7 @@ public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter
         mViewBinding.titleLayout.tvTitle.setText("充值优惠");
         adapter.setOnItemClickListener((mAdapter, view, position) -> {
             mPresenter.rechargeRuleEditFragment.setmMscard(adapter.getData().get(position));
+            mPresenter.rechargeRuleEditFragment.setMscards(adapter.getData());
             start( mPresenter.rechargeRuleEditFragment);
         });
         adapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.levelRecyclerView);
@@ -60,6 +61,7 @@ public class RechargeRuleListFragment extends BaseFragment<RechargeRulePresenter
             switch (view.getId()) {
                 case R.id.addRule:
                     mPresenter.rechargeRuleEditFragment.setmMscard(null);
+                    mPresenter.rechargeRuleEditFragment.setMscards(adapter.getData());
                     start( mPresenter.rechargeRuleEditFragment);
                     break;
             }

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketActivity.java

 package com.xingdata.zzdpos.ui.marketing.ticket;
 
-import android.content.Context;
 import android.view.MotionEvent;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
 
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ToastUtils;
@@ -19,7 +15,6 @@ import com.xingdata.zzdpos.util.Global;
 public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
         ActivityReturnTicketBinding>
         implements ReturnTicketContract.View {
-    LoadingDialog loadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {
@@ -66,8 +61,8 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
     @Override
     protected void onResume() {
         super.onResume();
-        loadingDialog.show(this);
-        mPresenter.truleQuery(loadingDialog);
+        mLoadingDialog.show(this);
+        mPresenter.truleQuery(mLoadingDialog);
     }
 
     private void closeLoading(LoadingDialog loadingDialog) {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerAddFragment.java

@@ -17,7 +17,6 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.DialogTicketAddSettingBinding;
 import com.xingdata.zzdpos.model.Trule;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
 import com.xingdata.zzdpos.util.ConvertUtil;
 import com.xingdata.zzdpos.util.OnClickListener;
@@ -27,7 +26,6 @@ import java.util.Calendar;
 
 public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
         DialogTicketAddSettingBinding> {
-    LoadingDialog loadingDialog = new LoadingDialog();
     //0：正常 1暂停
     private byte nowStatus = 0;
     //当前编辑的对象
@@ -102,11 +100,11 @@ public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
                                 ToastUtils.showLong("可用金额需大于优惠券面值 ");
                                 return;
                             }
-                            loadingDialog.show((BaseActivity) mContext);
+                            mLoadingDialog.show((BaseActivity) mContext);
                             if (nowType == 1) {
-                                mPresenter.add(getUiData(), loadingDialog);
+                                mPresenter.add(getUiData(), mLoadingDialog);
                             } else if (nowType == 2) {
-                                mPresenter.truleUpdate(getUiData(), loadingDialog);
+                                mPresenter.truleUpdate(getUiData(), mLoadingDialog);
                             }
                         } else {
                             ToastUtils.showLong("输入数据不能null");
@@ -136,7 +134,8 @@ public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
         trule.setTruleStatus(nowStatus);
         trule.setTruleValAmt(ConvertUtil.yuanToFen(mViewBinding.etTicketMoney.getText().toString
                 ()));
-        trule.setTruleExp(TimeUtils.string2Millis(mViewBinding.tvDate.getText().toString()+" 23:59:59"));
+        trule.setTruleExp(TimeUtils.string2Millis(mViewBinding.tvDate.getText().toString() + " " +
+                "23:59:59"));
         trule.setTruleOrderAmt(ConvertUtil.yuanToFen(mViewBinding.etRuleMoney.getText().toString
                 ()));
         if (!mViewBinding.etTicketCount.getText().toString().equals("")) {

app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerIndexFragment.java

@@ -22,7 +22,6 @@ import java.util.ArrayList;
 public class TickerIndexFragment extends BaseFragment<ReturnTicketPresenter,
         FragmentTickerMainBinding> {
     ReturnTicketAdapter returnTicketAdapter;
-    LoadingDialog loadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/SendTicketActivity.java

@@ -20,7 +20,6 @@ import java.util.List;
 public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
         ActivitySendTicketBinding>
         implements SendTicketContract.View {
-    LoadingDialog loadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java

@@ -43,7 +43,6 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
     private List<Level> levelList = new ArrayList<>();
     ReturnTicketAdapter returnTicketAdapter;
     VipGroupAdapter vipGroupAdapter;
-    LoadingDialog loadingDialog = new LoadingDialog();
     //当前优惠券点击的item id
     int nowTickerItemId = 0;
     List<Trule> truleList = new ArrayList<>();
@@ -57,8 +56,8 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
 
     @Override
     public void initView() {
-        loadingDialog.show((BaseActivity) getActivity());
-        mPresenter.truleQuery(loadingDialog);
+        mLoadingDialog.show((BaseActivity) getActivity());
+        mPresenter.truleQuery(mLoadingDialog);
         mViewBinding.icTitle.tvTitle.setText("发券");
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
@@ -91,17 +90,17 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                         if (isNull()) {
                             long tickerId = truleList
                                     .get(nowTickerItemId).getTruleMapId();
-                            loadingDialog.show((BaseActivity) getActivity());
+                            mLoadingDialog.show((BaseActivity) getActivity());
                             if (nowtype == 0) {
                                 //单独会员发券
                                 mPresenter.sendTickerBefor(null, null, nowVip.getVipId(), tickerId,
-                                        loadingDialog);
+                                        mLoadingDialog);
                             } else if (nowtype == 1) {
                                 Long tempLevelId = levelList.get(nowVipGroupId).getId();
                                 if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
                                     //选择全部会员
                                     mPresenter.sendTickerBefor(null, null, null, tickerId,
-                                            loadingDialog);
+                                            mLoadingDialog);
                                     return;
                                 }
                                 for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
@@ -111,7 +110,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                                             tempServerId != -1) {
                                         mPresenter.sendTickerBefor(tempServerId + "", null,
                                                 null, tickerId,
-                                                loadingDialog);
+                                                mLoadingDialog);
                                         return;
                                     }
                                 }
@@ -119,7 +118,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                                 mPresenter.sendTickerBefor(null, levelList.get(nowVipGroupId)
                                                 .getVipLevel() + "",
                                         null, tickerId,
-                                        loadingDialog);
+                                        mLoadingDialog);
                             }
                         }
                     }
@@ -191,17 +190,17 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
     public void sendTicker() {
         long tickerId = truleList
                 .get(nowTickerItemId).getTruleMapId();
-        loadingDialog.show((BaseActivity) getActivity());
+        mLoadingDialog.show((BaseActivity) getActivity());
         if (nowtype == 0) {
             //单独会员发券
             mPresenter.sendTicker(null, null, nowVip.getVipId(), tickerId,
-                    loadingDialog);
+                    mLoadingDialog);
         } else if (nowtype == 1) {
             Long tempLevelId = levelList.get(nowVipGroupId).getId();
             if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
                 //选择全部会员
                 mPresenter.sendTicker(null, null, null, tickerId,
-                        loadingDialog);
+                        mLoadingDialog);
                 return;
             }
             for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
@@ -211,7 +210,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
                         tempServerId != -1) {
                     mPresenter.sendTicker(tempServerId + "", null,
                             null, tickerId,
-                            loadingDialog);
+                            mLoadingDialog);
                     return;
                 }
             }
@@ -219,7 +218,7 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
             mPresenter.sendTicker(null, levelList.get(nowVipGroupId)
                             .getVipLevel() + "",
                     null, tickerId,
-                    loadingDialog);
+                    mLoadingDialog);
         }
     }
 

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/VipFragment.java

@@ -10,7 +10,6 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentSendTickerVipBinding;
 import com.xingdata.zzdpos.model.Vip;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.sendticke.SendTicketPresenter;
 import com.xingdata.zzdpos.ui.sendticke.adapter.VipAdapter;
 import com.xingdata.zzdpos.ui.settle.SettleActivity;
@@ -25,7 +24,6 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
     @SuppressLint("InflateParams")
     View emptyView;
     TextView noSeachData;
-    LoadingDialog loadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {
@@ -69,7 +67,7 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
         });
         mViewBinding.vSearch.setOnSearchListener(keyword -> {
             mViewBinding.vSearch.hideSoftInput();
-            loadingDialog.show((BaseActivity) getActivity());
+            mLoadingDialog.show((BaseActivity) getActivity());
             mPresenter.searchVip(keyword);
         });
         mViewBinding.vSearch.setHint("请输入会员手机号进行搜索");
@@ -83,8 +81,8 @@ public class VipFragment extends BaseFragment<SendTicketPresenter, FragmentSendT
      * @param vips 会员列表
      */
     public void loadVips(List<Vip> vips) {
-        if (loadingDialog != null && loadingDialog.isShowing) {
-            loadingDialog.dismiss();
+        if (mLoadingDialog != null && mLoadingDialog.isShowing) {
+            mLoadingDialog.dismiss();
         }
         if (vips.size() == 0) {
             noSeachData.setText(R.string.settle_vip_search_empty_no_seach);

app/src/main/java/com/xingdata/zzdpos/ui/settle/SettleActivity.java

@@ -13,7 +13,6 @@ import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.Vip;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.payment.PaymentActivity;
 import com.xingdata.zzdpos.ui.scan.ScanFragment;
@@ -41,7 +40,6 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
     private PasswordDialog mPasswordDialog = new PasswordDialog();
     private PayResultFragment mPayResultFragment = new PayResultFragment();
 
-    private LoadingDialog mLoadingDialog = new LoadingDialog();
     private PayingDialog mPayingDialog = new PayingDialog();
 
     private ScanFragment mScanFragment = new ScanFragment();

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

@@ -27,7 +27,6 @@ public class StatisticsActivity extends BaseActivity<StatisticsPresenter,
     private StatisticsDateFragment mStatisticsDateFragment = new StatisticsDateFragment();
     private StatisticsFragment mStatisticsFragment = new StatisticsFragment();
     private StatisticsTitleFragment mStatisticsTitleFragment = new StatisticsTitleFragment();
-    LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {

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

@@ -2,7 +2,6 @@ package com.xingdata.zzdpos.ui.statistics;
 
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.databinding.DataBindingUtil;
 import android.graphics.Paint;
@@ -10,8 +9,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
 
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.api.print.ZX_PrintPOS;
@@ -28,7 +25,6 @@ import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.main.MainActivity;
 import com.xingdata.zzdpos.ui.manage.inventory.adpter.InventoryDetailAdapter;
 import com.xingdata.zzdpos.util.ConvertUtil;
@@ -39,7 +35,6 @@ import com.xingdata.zzdpos.util.OnClickListener;
 public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPresenter,
         ActivityStatisticsDetailBinding> implements StatisticsDetailContract.View {
 
-    LoadingDialog mLoadingDialog = new LoadingDialog();
 
     @Override
     public int getLayoutId() {
@@ -183,7 +178,8 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
             @Override
             protected void myOnClickListener(View v) {
                 try {
-                    ZX_PrintPOS.getInstance(MainActivity.mainActivity).printSave(1, vipRechargeOrder);
+                    ZX_PrintPOS.getInstance(MainActivity.mainActivity).printSave(1,
+                            vipRechargeOrder);
                 } catch (Exception e) {
                     ToastUtils.showShort("打印异常");
                 }

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

@@ -22,7 +22,6 @@ import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.model.Saledetail;
 import com.xingdata.zzdpos.model.Saleorder;
 import com.xingdata.zzdpos.model.Sskugrp;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.scan.ScanFragment;
 import com.xingdata.zzdpos.ui.settle.SettleActivity;
 import com.xingdata.zzdpos.ui.store.dialog.CartDialog;
@@ -44,8 +43,6 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
     private CartDialog mCartDialog = new CartDialog();
     private MsDialog mMsDialog = new MsDialog();
 
-    private LoadingDialog mLoadingDialog = new LoadingDialog();
-
     @Override
     public int getLayoutId() {
         return R.layout.activity_store;

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

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                 xmlns:app="http://schemas.android.com/apk/res-auto"
                                                  android:layout_width="match_parent"
                                                  android:layout_height="match_parent"
                                                  android:background="@color/gray_zhouyu"

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

@@ -70,6 +70,30 @@
                         android:enabled="false" />
                 </LinearLayout>
 
+                <include layout="@layout/line_layout_margin"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@color/white"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        style="@style/default_blacktext_margin_smallstyle"
+                        android:layout_width="90dp"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/all_margin_left"
+                        android:text="充值档位" />
+
+                    <TextView
+                        android:id="@+id/recharg_No"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:layout_marginRight="@dimen/all_margin_left"
+                        android:background="@mipmap/ic_expand_left"
+                        android:gravity="center"
+                        android:onClick="@{onClickListener}" />
+                </LinearLayout>
+
                 <include layout="@layout/line_layout_margin"/>
 
                 <LinearLayout

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

@@ -103,23 +103,6 @@
         </LinearLayout>
 
         <include layout="@layout/line_layout" />
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="@dimen/all_margin_left"
-            android:orientation="horizontal">
-
-            <Button
-                android:id="@+id/onSure"
-                style="@style/button_positive_noradius"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:onClick="@{onClickListener}"
-                android:text="确认" />
-
-        </RelativeLayout>
     </LinearLayout>
 
 </layout>
\ No newline at end of file

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

@@ -120,6 +120,14 @@
 
         <include layout="@layout/line_layout" />
 
+        <TextView
+            android:layout_marginTop="@dimen/all_margin_left"
+            style="@style/textView_title"
+            android:textSize="@dimen/small_text_size"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="注：店员初始密码为000000" />
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"

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

@@ -10,6 +10,7 @@
 
         <ImageButton
             android:id="@+id/iv_back"
+            android:layout_marginLeft="@dimen/all_margin_left"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"