Merge remote-tracking branch 'origin/master'

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

@@ -72,7 +72,6 @@ public class App extends Application {
 
         // 初始化异常处理
 //        initEx();
-
         //初始化Fragment框架
         initFragment();
 
@@ -118,13 +117,13 @@ public class App extends Application {
      */
 
     private void initFragment() {
-        Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(BuildConfig.DEBUG)
-                .handleException(e -> {
-                }).install();
-//正式版本
-//        Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE)
+//        Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE).debug(BuildConfig.DEBUG)
 //                .handleException(e -> {
 //                }).install();
+//正式版本
+        Fragmentation.builder().stackViewMode(Fragmentation.BUBBLE)
+                .handleException(e -> {
+                }).install();
     }
 
     /**

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

@@ -58,7 +58,7 @@ public class C {
     }
 
     public static final class URL {
-//        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
+        //        public static final String BASE_URL = "http://demo.51zzd.cn:8080/";
         public static final String TEMP_PAY_URL = "http://demo.51zzd.cn/";
 
         public static final String BASE_URL = "http://121.40.56.52:8080/";
@@ -591,4 +591,8 @@ public class C {
         public static final String PAYING = "0098";
         public static final String SUCC = "0000";
     }
+
+    public final class SYSTEM {
+        public static final String DIALOGISDISMISS = "DIALOGISDISMISS";
+    }
 }

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

@@ -9,7 +9,9 @@ import android.support.v7.app.AppCompatDelegate;
 import android.view.KeyEvent;
 import android.view.View;
 
+import com.blankj.utilcode.util.SPUtils;
 import com.hwangjr.rxbus.RxBus;
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.util.InstanceUtil;
 
@@ -133,5 +135,11 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
         }
     }
 
-
+    @Override
+    protected void onResume() {
+        if (SPUtils.getInstance().getBoolean(C.SYSTEM.DIALOGISDISMISS)) {
+            mLoadingDialog.dismiss();
+        }
+        super.onResume();
+    }
 }

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

@@ -15,11 +15,14 @@ import android.view.Window;
 import android.view.WindowManager;
 
 import com.blankj.utilcode.util.ActivityUtils;
+import com.blankj.utilcode.util.AppUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
 import com.blankj.utilcode.util.LogUtils;
+import com.blankj.utilcode.util.SPUtils;
 import com.blankj.utilcode.util.ScreenUtils;
 import com.blankj.utilcode.util.StringUtils;
 import com.blankj.utilcode.util.ToastUtils;
+import com.xingdata.zzdpos.C;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.databinding.DialogBaseBinding;
 
@@ -207,11 +210,15 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
      * @param activity context
      */
     public void show(BaseActivity activity) {
-        if (!isShowing) {
-            this.recLen = -1;
-            this.shutDown = false;
-            super.show(activity.getSupportFragmentManager(), this.getTag());
-            isShowing = true;
+        if (AppUtils.isAppForeground()) {
+            if (!isShowing) {
+                this.recLen = -1;
+                this.shutDown = false;
+                super.show(activity.getSupportFragmentManager(), this.getTag());
+                isShowing = true;
+            }
+        } else {
+            LogUtils.e("当前app属于后台，不可打开Dialog");
         }
     }
 
@@ -222,44 +229,49 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
      * @param mRecLen  自动关闭的时间
      */
     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>() {
-                @Override
-                public Long apply(@io.reactivex.annotations.NonNull Long aLong) throws Exception {
-                    return mRecLen - aLong;
-                }
-            }).observeOn(AndroidSchedulers.mainThread()).doOnSubscribe(new Consumer<Disposable>() {
-                @Override
-                public void accept(Disposable disposable) throws Exception {
-                    mDisp = disposable;
-                }
-            }).subscribe(new Observer<Long>() {
-                @Override
-                public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
-                    mDisp = d;
-                }
-
-                @Override
-                public void onNext(@io.reactivex.annotations.NonNull Long aLong) {
-                    recLen = aLong;
-                    LogUtils.e("对话框将在" + aLong + "S后关闭");
-                }
-
-                @Override
-                public void onError(@io.reactivex.annotations.NonNull Throwable e) {
-
-                }
-
-                @Override
-                public void onComplete() {
-                    dismiss();
-                }
-            });
+        if (AppUtils.isAppForeground()) {
+            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>() {
+                    @Override
+                    public Long apply(@io.reactivex.annotations.NonNull Long aLong) throws
+                            Exception {
+                        return mRecLen - aLong;
+                    }
+                }).observeOn(AndroidSchedulers.mainThread()).doOnSubscribe(new Consumer<Disposable>() {
+                    @Override
+                    public void accept(Disposable disposable) throws Exception {
+                        mDisp = disposable;
+                    }
+                }).subscribe(new Observer<Long>() {
+                    @Override
+                    public void onSubscribe(@io.reactivex.annotations.NonNull Disposable d) {
+                        mDisp = d;
+                    }
+
+                    @Override
+                    public void onNext(@io.reactivex.annotations.NonNull Long aLong) {
+                        recLen = aLong;
+                        LogUtils.e("对话框将在" + aLong + "S后关闭");
+                    }
+
+                    @Override
+                    public void onError(@io.reactivex.annotations.NonNull Throwable e) {
+
+                    }
+
+                    @Override
+                    public void onComplete() {
+                        dismiss();
+                    }
+                });
+            }
+        } else {
+            LogUtils.e("当前app属于后台，不可打开Dialog");
         }
     }
 
@@ -267,15 +279,20 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
      * 关闭
      */
     public void dismiss() {
-        if (isShowing) {
-            isShowing = false;
-            if (getBaseActivity() != null && getBaseActivity().mDialogs != null) {
-                getBaseActivity().mDialogs.remove(this);
-            }
-            if (null != mDisp && (!mDisp.isDisposed())) {
-                mDisp.dispose();
+        if (AppUtils.isAppForeground()) {
+            if (isShowing) {
+                isShowing = false;
+                if (getBaseActivity() != null && getBaseActivity().mDialogs != null) {
+                    getBaseActivity().mDialogs.remove(this);
+                }
+                if (null != mDisp && (!mDisp.isDisposed())) {
+                    mDisp.dispose();
+                }
+                super.dismiss();
             }
-            super.dismiss();
+        } else {
+            SPUtils.getInstance().put(C.SYSTEM.DIALOGISDISMISS, true);
+            LogUtils.e("当前app属于后台，不可关闭Dialog");
         }
     }
 

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

 package com.xingdata.zzdpos.ui.login;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -384,5 +385,10 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
                 SystemUtil.getVersionName();
         mViewBinding.tvSn.setText(str);
     }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+    }
 }
 

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

@@ -13,7 +13,6 @@ import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.ActivityMainBinding;
 import com.xingdata.zzdpos.databinding.ItemMenuBottomBinding;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.main.adapter.FragmentViewAdapter;
 import com.xingdata.zzdpos.ui.main.dialog.HandoverDialog;
 import com.xingdata.zzdpos.ui.main.fragment.CasherFragment;

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

@@ -34,7 +34,12 @@ public class OtherSelectAdapter extends BaseAdapter<Ossku, ItemOtherSelectBindin
         mViewBinding.setShopName(item.getShopName());
         mViewBinding.setStock("库存:" + item.getSkuStock() + item.getSpuUnitName());
         mViewBinding.setAddress(item.getCityProvName() + item.getCityName() + item.getCityCountyName() + item.getCityAddress());
-        mViewBinding.setPhone(item.getContactMob() + "");
+        if (item.getContactTel() != null && item.getContactTel().length() != 0) {
+            mViewBinding.setPhone(item.getContactTel());
+        } else {
+            mViewBinding.setPhone(item.getContactMob() + "");
+        }
+
 //        mViewBinding.tvAddress.setText(item.getCityAddress());
 //        mViewBinding.tvTel.setText(item.getContactTel());
     }

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

@@ -308,6 +308,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                             if (mPageNum == 1 && mSkuGrpId == 0L)
                                 mView.loadSsskuCount(ssskuPager.getTotalRow());
                             mView.loadSkus(ssskuPager, mPageNum == 1);
+                        }, throwable -> {
                         })
         );
     }
@@ -320,7 +321,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
         mCompositeDisposable.add(
                 ApiFactory.Sssku.querySssku(mSearchPageNum, mKeyword)
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
-                        .subscribe(ssskuPager -> mView.loadSearchResult(ssskuPager, mSearchPageNum == 1))
+                        .subscribe(ssskuPager -> mView.loadSearchResult(ssskuPager, mSearchPageNum == 1), throwable -> {
+                        })
         );
     }
 
@@ -331,6 +333,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
         mCompositeDisposable.add(
                 ApiFactory.Sskugrp.querySskugrp().subscribe(sskugrpPager -> {
                             mView.loadSkugrps(sskugrpPager.getList());
+                        }, throwable -> {
                         }
                 )
         );
@@ -341,7 +344,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
      */
     private void getReplenish() {
         mCompositeDisposable.add(
-                ApiFactory.Psb.preOrder().subscribe(ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()))
+                ApiFactory.Psb.preOrder().subscribe(ssskuPager -> mView.loadReplenishCount(ssskuPager.getTotalRow()), throwable -> {
+                })
         );
     }
 
@@ -350,7 +354,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
      */
     private void getCor() {
         mCompositeDisposable.add(
-                ApiFactory.Cor.queryAll().subscribe(cors -> mView.loadCors(cors))
+                ApiFactory.Cor.queryAll().subscribe(cors -> mView.loadCors(cors), throwable -> {
+                })
         );
     }
 }

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

@@ -92,6 +92,7 @@ public class TypeGiftView<Sku extends BaseSku> extends BaseTypeView<ViewTypeGift
         if (sku != null) {
             mViewBinding.setName(sku.getSpuName());
             mViewBinding.setPrice(ConvertUtil.fenToYuan(sku.getSkuRetailPrice1(), true));
+            mViewBinding.tvProductPic.setImageURI(sku.getSpuImg());
             mViewBinding.llProduct.setVisibility(View.VISIBLE);
         } else {
             mViewBinding.llProduct.setVisibility(View.GONE);