Merge remote-tracking branch 'origin/master'

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

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

@@ -71,7 +71,7 @@ public class App extends Application {
                 .start();
 
         // 初始化异常处理
-        initEx();
+//        initEx();
 
         //初始化Fragment框架
         initFragment();

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

@@ -132,4 +132,6 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
             super.start(toFragment);
         }
     }
+
+
 }

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

 package com.xingdata.zzdpos.base;
 
-import android.app.AlertDialog;
-import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.databinding.DataBindingUtil;
@@ -21,6 +19,7 @@ import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.LogUtils;
 import com.blankj.utilcode.util.ScreenUtils;
 import com.blankj.utilcode.util.StringUtils;
+import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.databinding.DialogBaseBinding;
 
@@ -41,7 +40,8 @@ import io.reactivex.functions.Function;
  * @param <B> Fragment对应的ViewDataBinding
  * @author Zhangzhen
  */
-public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBinding> extends AppCompatDialogFragment {
+public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBinding> extends
+        AppCompatDialogFragment {
 
     private DialogBaseBinding mBaseBinding;
     private Disposable mDisp;
@@ -50,6 +50,8 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
     public P mPresenter;
     public B mViewBinding;
     public boolean isShowing;
+    private long recLen = -1;
+    private boolean shutDown = false;
 
     static {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
@@ -139,7 +141,8 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         mBaseBinding = DataBindingUtil.inflate(inflater, R.layout.dialog_base, container, false);
 
         mBaseBinding.vsCenter.getViewStub().setLayoutResource(getLayoutId());
-        mBaseBinding.vsCenter.getViewStub().setOnInflateListener((viewStub, view) -> mViewBinding = DataBindingUtil.bind(view));
+        mBaseBinding.vsCenter.getViewStub().setOnInflateListener((viewStub, view) -> mViewBinding
+                = DataBindingUtil.bind(view));
         mBaseBinding.vsCenter.getViewStub().inflate();
 
         if (!isShowTitle() || getTitle() < 0) mBaseBinding.tvTitle.setVisibility(View.GONE);
@@ -179,14 +182,7 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
     @Override
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
-        isShowing = false;
-        if (getBaseActivity() != null && getBaseActivity().mDialogs != null) {
-            getBaseActivity().mDialogs.remove(this);
-        }
-        if (null != mDisp && (!mDisp.isDisposed())) {
-            mDisp.dispose();
-        }
-
+        dismiss();
     }
 
     /**
@@ -212,6 +208,8 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
      */
     public void show(BaseActivity activity) {
         if (!isShowing) {
+            this.recLen = -1;
+            this.shutDown = false;
             super.show(activity.getSupportFragmentManager(), this.getTag());
             isShowing = true;
         }
@@ -221,16 +219,19 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
      * 显示,并在一定时间之后自动关闭
      *
      * @param activity context
-     * @param recLen   自动关闭的时间
+     * @param mRecLen  自动关闭的时间
      */
-    public void show(BaseActivity activity, int recLen) {
+    public void show(BaseActivity activity, int mRecLen) {
         if (!isShowing) {
+            this.recLen = mRecLen;
+            this.shutDown = true;
             super.show(activity.getSupportFragmentManager(), this.getTag());
             isShowing = true;
-            Observable.interval(0, 1, TimeUnit.SECONDS).take(recLen + 1).map(new Function<Long, Long>() {
+            Observable.interval(0, 1, TimeUnit.SECONDS).take(recLen + 1).map(new Function<Long,
+                    Long>() {
                 @Override
                 public Long apply(@io.reactivex.annotations.NonNull Long aLong) throws Exception {
-                    return recLen - aLong;
+                    return mRecLen - aLong;
                 }
             }).observeOn(AndroidSchedulers.mainThread()).doOnSubscribe(new Consumer<Disposable>() {
                 @Override
@@ -245,6 +246,7 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
 
                 @Override
                 public void onNext(@io.reactivex.annotations.NonNull Long aLong) {
+                    recLen = aLong;
                     LogUtils.e("对话框将在" + aLong + "S后关闭");
                 }
 
@@ -256,20 +258,20 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
                 @Override
                 public void onComplete() {
                     dismiss();
-                    if (null != mDisp) {
-                        mDisp.dispose();
-                    }
                 }
             });
         }
     }
 
-
     /**
      * 关闭
      */
     public void dismiss() {
         if (isShowing) {
+            isShowing = false;
+            if (getBaseActivity() != null && getBaseActivity().mDialogs != null) {
+                getBaseActivity().mDialogs.remove(this);
+            }
             if (null != mDisp && (!mDisp.isDisposed())) {
                 mDisp.dispose();
             }
@@ -277,6 +279,16 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         }
     }
 
+    public void toughDismiss() {
+        if (shutDown) {
+            if (recLen <= 0) {
+                dismiss();
+            } else {
+                ToastUtils.showLong(recLen + "s 后可关闭");
+            }
+        }
+    }
+
     /**
      * 设置标题
      *

app/src/main/java/com/xingdata/zzdpos/db/DBFactory.java

@@ -103,8 +103,7 @@ public class DBFactory {
 
             //skuStatus
             query.equalTo("skuStatus", 0);
-            return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just
-                    (getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
+            return Observable.just(query.findAll()).flatMap(ssskus -> Observable.just(getLimitList(ssskus, pageNum, C.PRODUCT.PAGE_SIZE)));
         }
 
 

app/src/main/java/com/xingdata/zzdpos/model/Saledetail.java

@@ -169,7 +169,7 @@ public class Saledetail implements BaseModel, BaseBean, BaseGoodPrint {
         saledetail.skuCost = 0L;
         saledetail.detailCnt = 1;
         saledetail.initialDetailAmt = saledetail.skuPrice * saledetail.detailCnt;
-        saledetail.skuOffFlag = 0;
+        saledetail.skuOffFlag = 1;
         saledetail.skuStock = 0L;
         saledetail.status = C.SKU_TYPE.NO_BARCODE;
         saledetail.spuCateId = 0L;
@@ -676,7 +676,7 @@ public class Saledetail implements BaseModel, BaseBean, BaseGoodPrint {
 
 
     public String getSpuImg() {
-        if (spuImg !=null && spuImg.contains("ngoods.png")) return "";
+        if (spuImg != null && spuImg.contains("ngoods.png")) return "";
         return spuImg;
     }
 

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

@@ -3,6 +3,7 @@ package com.xingdata.zzdpos.ui.dialog;
 
 import android.content.DialogInterface;
 import android.os.Bundle;
+import android.view.KeyEvent;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
@@ -27,13 +28,21 @@ public class LoadingDialog extends BaseDialog<BasePresenter, DialogLoadingBindin
     @Override
     public void initView() {
         this.setCancelable(false);
+        this.getDialog().setOnKeyListener(new DialogInterface.OnKeyListener() {
+            @Override
+            public boolean onKey(DialogInterface dialogInterface, int i, KeyEvent keyEvent) {
+                if (i == keyEvent.KEYCODE_BACK) {
+                    toughDismiss();
+                }
+                return true;
+            }
+        });
     }
 
     @Override
     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,7 +334,6 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
         } else {
             pop();
         }
-
     }
 
     private void closeLoading(LoadingDialog loadingDialog) {

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

@@ -160,7 +160,7 @@ public interface LoginContract {
          * @param phone    手机号
          * @param password 密码
          */
-        abstract void signIn(String phone, String password, PromptDialog promptDialog,
+        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
@@ -56,15 +54,18 @@ public class InventoryActivity extends BaseActivity<InventoryPresenter, Activity
         mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
             @Override
             protected void myOnClickListener(View v) {
+                if (mScanFragment != null && mScanFragment.isAdded()) {
+                    mScanFragment.pop();
+                    return;
+                } else {
                     if (mInventoryAddFragment != null && mInventoryAddFragment.isAdded()) {
                         mInventoryAddFragment.popThis();
                         return;
                     }
-                if (mScanFragment != null && mScanFragment.isAdded()) {
-                    mScanFragment.pop();
-                    return;
+
                 }
 
+
                 finish();
             }
         });
@@ -73,7 +74,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 +197,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/inventory/InventoryPresenter.java

@@ -140,7 +140,7 @@ public class InventoryPresenter extends InventoryContract.Presenter {
                 .subscribe(object -> {
                     mView.disInventoryDetailFragment(false);
                 }, throwable -> {
-                    ToastUtils.showShort(throwable.getMessage());
+                    ToastUtils.showShort("删除"+throwable.getMessage());
                 });
     }
 

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

@@ -97,12 +97,13 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
                 public void Ok() {
                     mPresenter.cancelInventoryAdd(mCs);
                     deleteInventoryDialog.dismiss();
+                    pop();
                 }
 
                 @Override
                 public void No() {
                     deleteInventoryDialog.dismiss();
-                    mPresenter.exitInventoryAdd();
+                    pop();
                 }
             });
         }

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;
@@ -40,7 +39,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

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;
@@ -130,7 +127,7 @@ public class MsActivity<Sku extends BaseSku> extends BaseActivity<MsPresenter, A
     }
 
     @Override
-    public void loadSkus(List<Sku> skus, boolean isRefresh) {
+    public void loadSkus(Pager<Sku> skus, boolean isRefresh) {
         mSearchFragment.loadSkus(skus, isRefresh);
     }
 

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

@@ -102,7 +102,7 @@ interface MsContract {
          * @param skus      商品对象列表
          * @param isRefresh 是否刷新
          */
-        void loadSkus(List<Sku> skus, boolean isRefresh);
+        void loadSkus(Pager<Sku> skus, boolean isRefresh);
 
         /**
          * 加载作为主体的商品信息

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

@@ -7,6 +7,7 @@ import com.xingdata.zzdpos.api.ApiFactory;
 import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.db.DBFactory;
 import com.xingdata.zzdpos.model.Ms;
+import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Area;
 import com.xingdata.zzdpos.ui.marketing.ms.model.Group;
@@ -231,8 +232,8 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
         mCompositeDisposable.add(
                 DBFactory.Store.querySku(mSkuPageNum, mSkuKeyword)
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
-                        .subscribe(ssskus -> {
-                            mView.loadSkus((List<Sku>) ssskus, mSkuPageNum == 0);
+                        .subscribe(ssskuPager -> {
+                            mView.loadSkus((Pager<Sku>) ssskuPager, mSkuPageNum == 0);
                         })
         );
     }

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

@@ -6,17 +6,15 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.blankj.utilcode.util.StringUtils;
-import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.base.BaseSku;
 import com.xingdata.zzdpos.databinding.FragmentMsSearchBinding;
+import com.xingdata.zzdpos.model.Pager;
 import com.xingdata.zzdpos.ui.marketing.ms.MsActivity;
 import com.xingdata.zzdpos.ui.marketing.ms.MsPresenter;
 import com.xingdata.zzdpos.ui.marketing.ms.adapter.SkuAdapter;
 
-import java.util.List;
-
 public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresenter, FragmentMsSearchBinding> {
 
     private int mSearchType;
@@ -66,13 +64,13 @@ public class SearchFragment<Sku extends BaseSku> extends BaseFragment<MsPresente
      * @param skus      商品
      * @param isRefresh 是否刷新
      */
-    public void loadSkus(List<Sku> skus, boolean isRefresh) {
+    public void loadSkus(Pager<Sku> skus, boolean isRefresh) {
         if (isRefresh) {
             mSkuAdapter.isUseEmpty(true);
             mSkuAdapter.setEnableLoadMore(true);
-            mSkuAdapter.setNewData(skus);
-        } else if (skus.size() > 0) mSkuAdapter.addData(skus);
-        if (skus.size() <= C.PRODUCT.PAGE_SIZE) mSkuAdapter.loadMoreEnd(isRefresh);
+            mSkuAdapter.setNewData(skus.getList());
+        } else if (skus.getList().size() > 0) mSkuAdapter.addData(skus.getList());
+        if (skus.isLastPage()) mSkuAdapter.loadMoreEnd(isRefresh);
         else mSkuAdapter.loadMoreComplete();
     }
 

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/payment/PaymentPresenter.java

@@ -8,7 +8,7 @@ public class PaymentPresenter extends PaymentContract.Presenter {
 
     @Override
     public void clickSettle(Long amt) {
-        if (amt > 99999999999L) {
+        if (amt > 99999999999L || amt <= 0) {
             mView.showMsg("您填写的金额超出范围");
         } else {
             mView.showSettle(amt);

app/src/main/java/com/xingdata/zzdpos/ui/scan/ScanFragment.java

@@ -59,11 +59,9 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P,
     @Override
     public void initView() {
         if (!titleStr.equals("")) {
-            mViewBinding.vsTitle.getViewStub().setVisibility(View.VISIBLE);
             viewStub = mViewBinding.vsTitle.getViewStub();
-            if (viewStub.getParent() != null) {
             inflated = viewStub.inflate();
-            }
+            viewStub.setVisibility(View.VISIBLE);
             inflated.findViewById(R.id.iv_back).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {

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/settle/fragment/SettleFragment.java

@@ -63,7 +63,6 @@ public class SettleFragment extends BaseFragment<SettlePresenter, FragmentSettle
         BottomSheetBehavior.from(mViewBinding.llSheet).setBottomSheetCallback(new BottomSheetBehavior.BottomSheetCallback() {
             @Override
             public void onStateChanged(@NonNull View bottomSheet, int newState) {
-
             }
 
             @Override

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/StatisticsContract.java

 package com.xingdata.zzdpos.ui.statistics;
 
-import android.content.Intent;
-
 import com.xingdata.zzdpos.base.BasePresenter;
 import com.xingdata.zzdpos.base.BaseView;
 import com.xingdata.zzdpos.model.Pager;
@@ -10,7 +8,7 @@ import com.xingdata.zzdpos.model.Smt;
 import com.xingdata.zzdpos.model.Sta;
 import com.xingdata.zzdpos.model.Ticket;
 import com.xingdata.zzdpos.model.VipRechargeOrder;
-import com.xingdata.zzdpos.ui.statistics.fragment.ms.UsedTicketListFragment;
+import com.xingdata.zzdpos.ui.statistics.fragment.ms.TicketListFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeListFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
 
@@ -23,7 +21,9 @@ public interface StatisticsContract {
 
     interface View extends BaseView {
         void isShowLoading(Boolean is);
+
         void getSmtListSucc(Pager<Smt> smtPager);
+
         /**
          * 设置统计信息
          */
@@ -83,8 +83,6 @@ public interface StatisticsContract {
         public abstract void clickDate(Integer integer);
 
 
-
-
         /**
          * 跳转营销页
          */
@@ -114,12 +112,12 @@ public interface StatisticsContract {
         /**
          * 获取已用优惠券列表
          */
-        public abstract void getTicketList(int pageNumber, UsedTicketListFragment msListFragment);
+        public abstract void getTicketList(int pageNumber, TicketListFragment msListFragment, int usedFlag);
 
         /**
          * 获取已用优惠券列表
          */
-        public abstract void getTicketList(int pageNumber, long startDate, long endDate);
+        public abstract void getTicketList(int pageNumber, long startDate, long endDate, int usedFlag);
 
         /**
          * 获取订单列表

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() {
@@ -97,8 +92,18 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
         ViewTicketBinding viewTicketBinding = DataBindingUtil.bind(mViewBinding.viewTicket
                 .getRoot());
         viewTicketBinding.tvAmt.setText(ConvertUtil.fenToYuan(ticket.getTicketValAmt(), true));
-        viewTicketBinding.setDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket
+        viewTicketBinding.setUpdateDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket
                 .getUpdateTime()));
+        viewTicketBinding.setCreateDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket
+                .getCreateTime()));
+        switch (ticket.getUsedFlag()){
+            case 1:
+                viewTicketBinding.setIsUsed(false);
+                break;
+            case 2:
+                viewTicketBinding.setIsUsed(true);
+                break;
+        }
         viewTicketBinding.setOrderNo(ticket.getUseOrderNo());
         viewTicketBinding.setVipName(ticket.getVipName());
 
@@ -173,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/statistics/StatisticsPresenter.java

 package com.xingdata.zzdpos.ui.statistics;
 
 
-import android.content.Intent;
-
 import com.blankj.utilcode.util.TimeUtils;
 import com.blankj.utilcode.util.ToastUtils;
 import com.xingdata.zzdpos.api.ApiFactory;
-import com.xingdata.zzdpos.ui.statistics.fragment.ms.UsedTicketListFragment;
+import com.xingdata.zzdpos.ui.statistics.fragment.ms.TicketListFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.ms.RechargeListFragment;
 import com.xingdata.zzdpos.ui.statistics.fragment.order.OrderListFragment;
 import com.xingdata.zzdpos.util.StringUtil;
@@ -74,8 +72,8 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
 
     @Override
     public void getRechargeList(int pageNumber, RechargeListFragment msListFragment) {
-        mView.isShowLoading(true);
-        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize).doFinally(() -> mView.isShowLoading(false))
+
+        ApiFactory.Rctrace.queryRecharge(pageNumber, nowPageSize)
                 .subscribe(vipRechargeOrderPager -> {
                     msListFragment.setData(vipRechargeOrderPager);
                 }, throwable -> {
@@ -111,9 +109,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
     }
 
     @Override
-    public void getTicketList(int pageNumber, UsedTicketListFragment msListFragment) {
-        mView.isShowLoading(true);
-        ApiFactory.Ticket.query(pageNumber, nowPageSize, 2).doFinally(() -> mView.isShowLoading(false))
+    public void getTicketList(int pageNumber, TicketListFragment msListFragment, int usedFlag) {
+
+        ApiFactory.Ticket.query(pageNumber, nowPageSize, usedFlag)
                 .subscribe(ticketPager -> {
                     msListFragment.setData(ticketPager);
                 }, throwable -> {
@@ -122,9 +120,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
     }
 
     @Override
-    public void getTicketList(int pageNumber, long startDate, long endDate) {
+    public void getTicketList(int pageNumber, long startDate, long endDate, int usedFlag) {
         mView.isShowLoading(true);
-        ApiFactory.Ticket.query(pageNumber, nowPageSize, 2, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
+        ApiFactory.Ticket.query(pageNumber, nowPageSize, usedFlag, startDate, endDate).doFinally(() -> mView.isShowLoading(false))
                 .subscribe(ticketPager -> {
                     if (ticketPager.getList() == null || ticketPager.getList().size() == 0) {
                         ToastUtils.showShort("没有查询到相关优惠券");
@@ -212,9 +210,11 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
                         getRechargeList(1, longStart, longEnd);
                         break;
                     case 1:
-                        getTicketList(1, longStart, longEnd);
+                        getTicketList(1, longStart, longEnd,TicketListFragment.NORMAL);
+                        break;
+                    case 2:
+                        getTicketList(1, longStart, longEnd,TicketListFragment.USED);
                         break;
-
                 }
             }
 

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

@@ -46,57 +46,6 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
                 mViewBinding.viewLine.setVisibility(View.GONE);
                 FragmentUtils.add(getChildFragmentManager(), mOrderMainFragment, mViewBinding.mainFrame.getId(), false, true);
 
-//                mViewBinding.icTitle.edTitle.setOnFocusChangeListener(new View.OnFocusChangeListener() {
-//                    @Override
-//                    public void onFocusChange(View view, boolean b) {
-//                        if (b) {
-//                            if (mViewBinding.viewStub.isInflated()) {
-//                                mViewBinding.viewStub.getRoot().setVisibility(View.VISIBLE);
-//                            } else {
-//                                mViewBinding.viewStub.getViewStub().inflate();
-//                                ViewSearchPaytypeBinding viewSearchPaytypeBinding = DataBindingUtil.bind(mViewBinding.viewStub.getRoot());
-//                                viewSearchPaytypeBinding.setOnClickListener(new OnClickListener() {
-//                                    @Override
-//                                    protected void myOnClickListener(View v) {
-//                                        switch (v.getId()) {
-//                                            case R.id.pay_cash:
-//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CASH);
-//                                                break;
-//                                            case R.id.pay_alipay:
-//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.ALI);
-//                                                break;
-//                                            case R.id.pay_wechat:
-//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.WECHAT);
-//                                                break;
-//                                            case R.id.pay_bank:
-//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.BANK);
-//                                                break;
-//                                            case R.id.pay_vipcard:
-//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.CARD);
-//                                                break;
-//                                            case R.id.pay_tally:
-//                                                mPresenter.getSaleOrderList(1, C.PAY_CHANNEL.TALLY);
-//                                                break;
-//                                        }
-//
-//
-//                                    }
-//                                });
-//                            }
-//
-//                        } else {
-//                            mViewBinding.viewStub.getRoot().setVisibility(View.GONE);
-//                        }
-//                    }
-//                });
-//                mViewBinding.icTitle.edTitle.setOnKeyListener((v, keyCode, event) -> {
-//                    if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
-//                        mPresenter.getSaleOrderList(1, mViewBinding.icTitle.edTitle.getText().toString());
-//                        hideSoftInput();
-//                    }
-//
-//                    return false;
-//                });
                 mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
                 mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
                 mViewBinding.icTitle.tvTitle.setText("订单列表");

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

@@ -4,14 +4,12 @@ package com.xingdata.zzdpos.ui.statistics.fragment.ms;
 import android.databinding.DataBindingUtil;
 import android.graphics.Typeface;
 import android.support.design.widget.TabLayout;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
 
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentMsMainBinding;
-import com.xingdata.zzdpos.databinding.ItemMenuBottomBinding;
 import com.xingdata.zzdpos.databinding.ItemStringBinding;
 import com.xingdata.zzdpos.ui.main.MainPresenter;
 import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
@@ -26,12 +24,11 @@ import io.reactivex.ObservableOnSubscribe;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
-import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
 
 public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBinding> {
-    private int[] titleInts = {R.string.statistics_menu_ms_recharge, R.string.statistics_menu_ms_usedTicket};
+    private int[] titleInts = {R.string.statistics_menu_ms_recharge, R.string.statistics_menu_ms_normalTicket,R.string.statistics_menu_ms_usedTicket};
     private FragmentViewAdapter mFragmentStateAdapter;
     private List<Long> dateLongs = new ArrayList<>();
     private List<BaseFragment> fragments = new ArrayList<>();
@@ -55,7 +52,8 @@ public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBi
     public void initViewPager() {
         if (fragments.size() == 0) {
             fragments.add(new RechargeListFragment());
-            fragments.add(new UsedTicketListFragment());
+            fragments.add(TicketListFragment.getTicketListFragment(TicketListFragment.NORMAL));
+            fragments.add(TicketListFragment.getTicketListFragment(TicketListFragment.USED));
 
 
             mFragmentStateAdapter = new FragmentViewAdapter(fragments, getChildFragmentManager());
@@ -84,6 +82,7 @@ public class MsMainFragment extends BaseFragment<MainPresenter, FragmentMsMainBi
         Observable.create(new ObservableOnSubscribe<View>() {
             @Override
             public void subscribe(ObservableEmitter<View> e) throws Exception {
+                e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
                 e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
                 e.onNext(getLayoutInflater().inflate(R.layout.item_string, null));
                 e.onComplete();

app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/UsedTicketListFragment.java → app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/ms/TicketListFragment.java

@@ -32,11 +32,24 @@ import io.reactivex.functions.Action;
 import io.reactivex.schedulers.Schedulers;
 
 
-public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, FragmentMsListBinding> {
-
+public class TicketListFragment extends BaseFragment<StatisticsPresenter, FragmentMsListBinding> {
+    public static final int NORMAL = 1;
+    public static final int USED = 2;
+    public static final int TIMEOUT = 3;
     private StatisticsTicketGroupAdapter mStatisticsGroupAdapter;
     private int pagerNum;
     private String monthDate;
+    private int mode;
+
+    public static TicketListFragment getTicketListFragment(int i) {
+        TicketListFragment ticketListFragment = new TicketListFragment();
+        ticketListFragment.setMode(i);
+        return ticketListFragment;
+    }
+
+    public void setMode(int i) {
+        this.mode = i;
+    }
 
     @Override
     public int getLayoutId() {
@@ -79,17 +92,17 @@ public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, Fr
         mViewBinding.srlProduct.setOnRefreshListener(this::onRefresh);
         mStatisticsGroupAdapter.setOnLoadMoreListener(this::onLoadMore, mViewBinding.statisticsRecycler);
 
-        mPresenter.getTicketList(pagerNum, this);
+        mPresenter.getTicketList(pagerNum, this, mode);
     }
 
     private void onRefresh() {
         pagerNum = 1;
-        mPresenter.getTicketList(pagerNum, this);
+        mPresenter.getTicketList(pagerNum, this, mode);
     }
 
     private void onLoadMore() {
         pagerNum++;
-        mPresenter.getTicketList(pagerNum, this);
+        mPresenter.getTicketList(pagerNum, this, mode);
     }
 
 
@@ -151,8 +164,13 @@ public class UsedTicketListFragment extends BaseFragment<StatisticsPresenter, Fr
 
     @Override
     public String getTabTitle() {
+        switch (mode) {
+            case 1:
+                return "已发优惠券";
+            case 2:
                 return "已用优惠券";
+        }
 
-
+    return "";
     }
 }

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;
@@ -60,8 +57,7 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
 
         mViewBinding.vSearch.setOnSearchListener(keyword -> mPresenter.searchSku(keyword));
 
-        mViewBinding.btnScan.setOnClickListener(view ->
-                PermissionUtils.permission(PermissionConstants.CAMERA)
+        mViewBinding.btnScan.setOnClickListener(view -> PermissionUtils.permission(PermissionConstants.CAMERA)
                 .callback(new PermissionUtils.FullCallback() {
                     @Override
                     public void onGranted(List<String> permissionsGranted) {

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

@@ -3,8 +3,11 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
                                                  android:layout_width="match_parent"
-        android:layout_height="match_parent">
+                                                 android:layout_height="match_parent"
+                                                 android:background="@color/gray_zhouyu"
+        >
 
         <include
             android:id="@+id/ic_title"
@@ -26,25 +29,25 @@
                 android:id="@+id/view_order_detail"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_order_detail" />
+                android:layout="@layout/view_order_detail"/>
 
             <ViewStub
                 android:id="@+id/view_vip_recharge"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_vip_recharge" />
+                android:layout="@layout/view_vip_recharge"/>
 
             <ViewStub
                 android:id="@+id/view_ticket"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_ticket" />
+                android:layout="@layout/view_ticket"/>
 
             <ViewStub
                 android:id="@+id/view_cs"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout="@layout/view_inventory_detail" />
+                android:layout="@layout/view_inventory_detail"/>
         </FrameLayout>
 
         <android.support.constraint.ConstraintLayout
@@ -71,7 +74,7 @@
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toLeftOf="@id/btn_return"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:targetApi="lollipop" />
+                tools:targetApi="lollipop"/>
 
             <Button
                 android:id="@+id/btn_return"
@@ -87,13 +90,13 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_goneMarginStart="@dimen/all_margin_big_big"
-                tools:targetApi="lollipop" />
+                tools:targetApi="lollipop"/>
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/view_line_L050"
                 android:background="@color/gray_huanggai"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"/>
         </android.support.constraint.ConstraintLayout>
     </android.support.constraint.ConstraintLayout>
 </layout>
\ No newline at end of file

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

@@ -49,59 +49,12 @@
             <com.xingdata.zzdpos.view.SearchBar
                 android:id="@+id/v_search"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_marginEnd="@dimen/all_margin"
-                android:gravity="center|left"
-                app:layout_constraintBottom_toTopOf="parent"
+                android:layout_height="0dp"
+                app:hint="@string/store_search_hint"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_back"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"/>
-            <!--<LinearLayout-->
-            <!--android:layout_width="0dp"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:layout_marginEnd="@dimen/all_margin"-->
-            <!--android:gravity="center|left"-->
-            <!--app:layout_constraintBottom_toTopOf="parent"-->
-            <!--app:layout_constraintLeft_toRightOf="@id/btn_back"-->
-            <!--app:layout_constraintRight_toRightOf="parent"-->
-            <!--app:layout_constraintTop_toBottomOf="parent">-->
-
-            <!--<EditText-->
-            <!--android:id="@+id/et_keyword"-->
-            <!--style="@style/searchBarEditor"-->
-            <!--android:layout_width="0dp"-->
-            <!--android:layout_marginEnd="@dimen/all_spacing"-->
-            <!--android:layout_weight="1"-->
-            <!--android:background="@drawable/shape_gray_r1"-->
-            <!--android:clickable="true"-->
-            <!--android:drawableLeft="@mipmap/ic_search"-->
-            <!--android:drawablePadding="@dimen/all_spacing"-->
-            <!--android:enabled="true"-->
-            <!--android:gravity="center|left"-->
-            <!--android:hint="@string/store_search_hint"-->
-            <!--android:maxLength="20"-->
-            <!--android:maxLines="1"-->
-            <!--android:onClick="@{OnClickListener}"-->
-            <!--android:paddingLeft="@dimen/all_padding"-->
-            <!--android:saveEnabled="false"-->
-            <!--android:textColor="@color/black_likui"-->
-            <!--android:textSize="@dimen/all_text_size_low"/>-->
-
-            <!--<TextView-->
-            <!--android:id="@+id/btn_seach"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:background="@color/transparent"-->
-            <!--android:contentDescription="@string/store_scan"-->
-            <!--android:foreground="?android:attr/actionBarItemBackground"-->
-            <!--android:gravity="center"-->
-            <!--android:onClick="@{OnClickListener}"-->
-            <!--android:text="搜索"-->
-            <!--android:textColor="@color/black_baozheng"-->
-            <!--android:textSize="@dimen/all_body_size"-->
-            <!--/>-->
-
-            <!--</LinearLayout>-->
 
             <View
                 android:layout_width="match_parent"

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

@@ -53,46 +53,6 @@
                 app:layout_constraintLeft_toRightOf="@id/btn_back"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"/>
-            <!--<LinearLayout-->
-            <!--android:layout_width="0dp"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:layout_marginEnd="@dimen/all_margin"-->
-            <!--android:gravity="center"-->
-            <!--app:layout_constraintBottom_toTopOf="parent"-->
-            <!--app:layout_constraintLeft_toRightOf="@id/btn_back"-->
-            <!--app:layout_constraintRight_toRightOf="parent"-->
-            <!--app:layout_constraintTop_toBottomOf="parent">-->
-
-            <!--<EditText-->
-            <!--android:id="@+id/et_keyword"-->
-            <!--style="@style/searchBarEditor"-->
-            <!--android:layout_width="0dp"-->
-            <!--android:layout_marginEnd="@dimen/all_spacing"-->
-            <!--android:layout_weight="1"-->
-            <!--android:focusable="true"-->
-            <!--android:hint="@string/store_search_hint"-->
-            <!--android:imeOptions="actionSearch"-->
-            <!--android:inputType="text"-->
-            <!--android:labelFor="@+id/et_search"-->
-            <!--android:saveEnabled="false"-->
-            <!--android:textColor="@color/black_likui"-->
-            <!--android:textSize="@dimen/all_text_size_low"/>-->
-
-            <!--<TextView-->
-            <!--android:id="@+id/btn_seach"-->
-            <!--android:layout_width="wrap_content"-->
-            <!--android:layout_height="match_parent"-->
-            <!--android:background="@color/transparent"-->
-            <!--android:contentDescription="@string/store_scan"-->
-            <!--android:foreground="?android:attr/actionBarItemBackground"-->
-            <!--android:gravity="center"-->
-            <!--android:onClick="@{OnClickListener}"-->
-            <!--android:text="搜索"-->
-            <!--android:textColor="@color/black_baozheng"-->
-            <!--android:textSize="@dimen/all_body_size"-->
-            <!--/>-->
-
-            <!--</LinearLayout>-->
 
             <View
                 android:layout_width="match_parent"

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

@@ -250,6 +250,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="9"
+                android:paddingLeft="@dimen/all_bounced_padding"
+                android:paddingRight="@dimen/all_bounced_padding"
                 android:visibility="visible"/>
 
         </LinearLayout>

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

@@ -437,7 +437,7 @@
                         android:id="@+id/ll_point"
                         android:layout_width="match_parent"
                         android:layout_height="@dimen/title_height"
-                        android:clickable="@{!defualtVip}"
+                        android:clickable="@{avlPoints>0}"
                         android:foreground="?android:attr/selectableItemBackground"
                         android:gravity="center"
                         android:paddingEnd="@dimen/all_margin"

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

@@ -2,9 +2,10 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.constraint.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="horizontal"
         android:paddingEnd="@dimen/all_margin"
         android:paddingStart="@dimen/all_margin"
         android:paddingTop="@dimen/all_margin">
@@ -21,32 +22,31 @@
             android:text="@string/ms_type_dis"
             android:textColor="@color/white_caocao" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/all_spacing"
+            android:layout_marginStart="@dimen/all_margin"
+            android:orientation="vertical">
+
             <TextView
                 android:id="@+id/tv_description"
-            android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/all_margin"
-            android:gravity="center_vertical"
                 android:textColor="@color/black_baozheng"
-            android:textSize="@dimen/all_body_size"
-            app:layout_constraintLeft_toRightOf="@id/tv_type"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@id/tv_type" />
+                android:textSize="@dimen/all_body_size" />
 
             <TextView
                 android:id="@+id/tv_info"
-            android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/all_spacing"
                 android:layout_marginTop="@dimen/all_spacing"
                 android:textColor="@color/black_likui"
-            android:textSize="@dimen/all_caption_size"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="@id/tv_description"
-            app:layout_constraintRight_toRightOf="@id/tv_description"
-            app:layout_constraintTop_toBottomOf="@id/tv_description" />
+                android:textSize="@dimen/all_caption_size" />
+
+        </LinearLayout>
 
-    </android.support.constraint.ConstraintLayout>
+    </LinearLayout>
 
 </layout>
 

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

@@ -7,9 +7,12 @@
         <import type="android.view.View" />
 
         <variable
-            name="date"
+            name="updateDate"
             type="String" />
 
+        <variable
+            name="createDate"
+            type="String" />
 
         <variable
             name="orderNo"
@@ -19,6 +22,10 @@
             name="vipName"
             type="String" />
 
+        <variable
+            name="isUsed"
+            type="Boolean" />
+
     </data>
 
     <FrameLayout
@@ -118,6 +125,35 @@
                                 android:singleLine="true"
                                 android:text="@{vipName}"
                                 android:textColor="@color/black_likui" />
+
+                        </LinearLayout>
+
+                        <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="horizontal"
+                            android:weightSum="3">
+
+                            <TextView
+                                style="@style/dialog_textView_body_low"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1"
+                                android:singleLine="true"
+                                android:text="发券时间："
+                                android:textSize="@dimen/all_text_size_low"
+                                android:visibility="@{isUsed?View.GONE:View.VISIBLE}" />
+
+                            <TextView
+                                style="@style/dialog_textView_body_small"
+                                android:layout_width="0dp"
+                                android:layout_height="wrap_content"
+                                android:layout_weight="2"
+                                android:gravity="right|center_vertical"
+                                android:singleLine="true"
+                                android:text="@{createDate}"
+                                android:textColor="@color/black_likui"
+                                android:visibility="@{isUsed?View.GONE:View.VISIBLE}" />
                         </LinearLayout>
 
                         <LinearLayout
@@ -133,7 +169,8 @@
                                 android:layout_weight="1"
                                 android:singleLine="true"
                                 android:text="使用时间："
-                                android:textSize="@dimen/all_text_size_low" />
+                                android:textSize="@dimen/all_text_size_low"
+                                android:visibility="@{isUsed?View.VISIBLE:View.GONE}" />
 
                             <TextView
                                 style="@style/dialog_textView_body_small"
@@ -142,8 +179,9 @@
                                 android:layout_weight="2"
                                 android:gravity="right|center_vertical"
                                 android:singleLine="true"
-                                android:text="@{date}"
-                                android:textColor="@color/black_likui" />
+                                android:text="@{updateDate}"
+                                android:textColor="@color/black_likui"
+                                android:visibility="@{isUsed?View.VISIBLE:View.GONE}" />
                         </LinearLayout>
 
                         <LinearLayout
@@ -159,7 +197,8 @@
                                 android:layout_weight="1"
                                 android:singleLine="true"
                                 android:text="销售单号："
-                                android:textSize="@dimen/all_text_size_low" />
+                                android:textSize="@dimen/all_text_size_low"
+                                android:visibility="@{isUsed?View.VISIBLE:View.GONE}" />
 
                             <TextView
                                 style="@style/dialog_textView_body_small"
@@ -169,7 +208,8 @@
                                 android:gravity="right|center_vertical"
                                 android:singleLine="true"
                                 android:text="@{orderNo}"
-                                android:textColor="@color/black_likui" />
+                                android:textColor="@color/black_likui"
+                                android:visibility="@{isUsed?View.VISIBLE:View.GONE}" />
                         </LinearLayout>
 
 

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

@@ -665,6 +665,7 @@
     <string name="statistics_menu_ms">营销</string>
     <string name="statistics_menu_ms_recharge">充值记录</string>
     <string name="statistics_menu_ms_usedTicket">已用优惠券</string>
+    <string name="statistics_menu_ms_normalTicket">已发优惠券</string>
     <string name="statistics_todayAmt_hint">今日销售额</string>
     <string name="statistics_todayOrder_hint">今日订单数</string>
     <string name="statistics_todayRecharge_hint">今日充值</string>