Merge remote-tracking branch 'origin/master'

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

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

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

@@ -405,8 +405,10 @@ public class C {
             private static final String ROOT_URL = PKG + "scsku/";
 
             public static final String query = ROOT_URL + "query";
+            public static final String queryAndSpu = ROOT_URL + "queryAndSpu";
         }
 
+
         public final class VER {
             //检测版本
             public static final String getLastVer = PKG + "ver/getLastVer";
@@ -483,7 +485,7 @@ public class C {
     public final class PRODUCT {
         public static final int PAGE_SIZE = 12;
         //服务器每页数据条数
-        public static final int SERVER_PAGE_SIZE = 5;
+        public static final int SERVER_PAGE_SIZE = 200;
     }
 
     public final class MS {

app/src/main/java/com/xingdata/zzdpos/api/ApiService.java

@@ -446,7 +446,7 @@ interface ApiService {
     Observable<HttpMessage<Mscard>> addMscard(@Body Mscard m);
 
 
-    @POST(C.URL.SCSKU.query)
+    @POST(C.URL.SCSKU.queryAndSpu)
     Observable<HttpMessage<Pager<Sssku>>> queryScsku(@Query("spuBarcode") String barcode);
 
 

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

@@ -62,13 +62,16 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
     }
 
     protected void initPresenter() {
-        if (this instanceof BaseView && this.getClass().getGenericSuperclass() instanceof ParameterizedType
-                && ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0) {
+        if (!(this instanceof BaseView)) {
+            throw new RuntimeException(getClass().getSimpleName() + "需要实现继承自BaseView的行为接口");
+        }
+        if (!(this.getClass().getGenericSuperclass() instanceof ParameterizedType && ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments().length > 0)) {
+            throw new RuntimeException(getClass().getSimpleName() + "在继承时,需要注明泛型类");
+        }
         Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments()[0];
         mPresenter = InstanceUtil.getInstance(mPresenterClass);
         mPresenter.setIntent(getIntent()).setView(this).build();
     }
-    }
 
     @Override
     protected void onDestroy() {

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

@@ -20,7 +20,8 @@ import java.util.List;
  * @param <B> Item对应的ViewDataBinding
  * @author Zhangzhen
  */
-public abstract class BaseAdapter<T, B extends ViewDataBinding> extends BaseQuickAdapter<T, BaseViewHolder> {
+public abstract class BaseAdapter<T, B extends ViewDataBinding> extends BaseQuickAdapter<T,
+        BaseViewHolder> {
 
     public BaseAdapter(@LayoutRes int layoutResId, @Nullable List<T> data) {
         super(layoutResId, data);
@@ -35,7 +36,8 @@ public abstract class BaseAdapter<T, B extends ViewDataBinding> extends BaseQuic
 
     @Override
     protected View getItemView(int layoutResId, ViewGroup parent) {
-        ViewDataBinding binding = DataBindingUtil.inflate(mLayoutInflater, layoutResId, parent, false);
+        ViewDataBinding binding = DataBindingUtil.inflate(mLayoutInflater, layoutResId, parent,
+                false);
         if (binding == null) return super.getItemView(layoutResId, parent);
         View view = binding.getRoot();
         view.setTag(R.id.BaseQuickAdapter_databinding_support, binding);

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

@@ -188,10 +188,6 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         dismiss();
     }
 
-    /**
-     * 初始化
-     */
-    public abstract void initView();
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
@@ -204,6 +200,12 @@ public abstract class BaseDialog<P extends BasePresenter, B extends ViewDataBind
         }
     }
 
+
+    /**
+     * 初始化
+     */
+    public abstract void initView();
+
     /**
      * 显示
      *

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

@@ -83,6 +83,7 @@ public class DBFactory {
 
         /**
          * 分页查询商品
+         * .
          *
          * @param pageNum 页面
          * @param keyword 关键字
@@ -115,7 +116,6 @@ public class DBFactory {
         public static Observable<Pager<Ussku>> queryUSku() {
             RealmQuery<Ussku> query = DB.getInstance().get(MainPresenter.class).where(Ussku.class);
             query.equalTo("skuStatus", 0);
-
             return Observable.just(query.findAll())
                     .flatMap(usskus -> {
                         Pager<Ussku> usskuPager = new Pager<>();

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

@@ -4,12 +4,13 @@ package com.xingdata.zzdpos.ui.login.fragment;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.view.View;
+import android.view.inputmethod.EditorInfo;
 
+import com.blankj.utilcode.util.KeyboardUtils;
 import com.xingdata.zzdpos.R;
 import com.xingdata.zzdpos.base.BaseActivity;
 import com.xingdata.zzdpos.base.BaseFragment;
 import com.xingdata.zzdpos.databinding.FragmentSmsCodeBinding;
-import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.util.OnClickListener;
 

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

@@ -103,7 +103,7 @@ public class SsskuPresenter extends SsskuContract.Presenter {
                                         mView.backToManagerFragment();
                                         mView.showEditorFragment(sssku, C.SKU_EDITOR_MODE.UNKNOWN);
                                     }
-                                })
+                                }, throwable -> mView.showMsg(throwable.getMessage()))
         );
     }
 

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

@@ -106,7 +106,7 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
                     for (int i = 0; i < levels.size(); i++) {
                         users.add(new User(1, levels.get(i).getVipLevelName(), levels.get(i).getVipLevel()));
                     }
-                });
+                }, throwable -> mView.showMsg(throwable.getMessage()));
     }
 
     @Override
@@ -226,7 +226,7 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
      * 获取营销计划
      */
     private void getMs() {
-        mCompositeDisposable.add(ApiFactory.Ms.query(mPageNum).subscribe(msPager -> mView.loadMss(msPager, mPageNum == 1)));
+        mCompositeDisposable.add(ApiFactory.Ms.query(mPageNum).subscribe(msPager -> mView.loadMss(msPager, mPageNum == 1), throwable -> mView.showMsg(throwable.getMessage())));
     }
 
 
@@ -238,9 +238,10 @@ public class MsPresenter<Sku extends BaseSku> extends MsContract.Presenter<Sku>
         mCompositeDisposable.add(
                 DBFactory.Store.querySku(mSkuPageNum, mSkuKeyword)
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
-                        .subscribe(ssskuPager -> {
-                            mView.loadSkus((Pager<Sku>) ssskuPager, mSkuPageNum == 0);
-                        })
+                        .subscribe(
+                                ssskuPager -> mView.loadSkus((Pager<Sku>) ssskuPager, mSkuPageNum == 0)
+                                , throwable -> mView.showMsg(throwable.getMessage())
+                        )
         );
     }
 

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

@@ -112,8 +112,7 @@ public class SettlePresenter extends SettleContract.Presenter {
     public void initSettle() {
         DBFactory.Settle.queryPays().subscribe(
                 pays -> mView.loadPays(pays),
-                throwable -> {
-                }
+                throwable -> mView.showMsg(throwable.getMessage())
         );
         mView.setSettleFragmentBySettleMode(mSettleMode);
     }
@@ -132,7 +131,7 @@ public class SettlePresenter extends SettleContract.Presenter {
             this.processMs();
             //计算价格
             this.reprice();
-        });
+        }, throwable -> mView.showMsg(throwable.getMessage()));
     }
 
     @Override
@@ -178,8 +177,7 @@ public class SettlePresenter extends SettleContract.Presenter {
                     this.mTickets = tickets;
                     this.searchAvlTicket();
                 },
-                throwable -> {
-                });
+                throwable -> mView.showMsg(throwable.getMessage()));
     }
 
     @Override

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

@@ -221,7 +221,7 @@ public class StorePresenter extends StoreContract.Presenter {
                             sskugrps.add(0, sskugrp);
 
                             mView.loadSkugrps(sskugrps);
-                        })
+                        }, throwable -> mView.showMsg(throwable.getMessage()))
         );
     }
 
@@ -236,7 +236,7 @@ public class StorePresenter extends StoreContract.Presenter {
                         mMss.get(i).setOnApplyListener(mOnApplyListener);
                     }
                     mView.loadMss(mMss);
-                })
+                }, throwable -> mView.showMsg(throwable.getMessage()))
         );
     }
 
@@ -249,7 +249,7 @@ public class StorePresenter extends StoreContract.Presenter {
         mCompositeDisposable.add(
                 DBFactory.Store.querySku(mStorePageNum, mSkuGrpId)
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
-                        .subscribe(ssskus -> mView.loadSkus(ssskus, mStorePageNum == 0))
+                        .subscribe(ssskus -> mView.loadSkus(ssskus, mStorePageNum == 0), throwable -> mView.showMsg(throwable.getMessage()))
         );
     }
 
@@ -262,7 +262,7 @@ public class StorePresenter extends StoreContract.Presenter {
         mCompositeDisposable.add(
                 DBFactory.Store.queryUSku()
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
-                        .subscribe(usskus -> mView.loadSkus(usskus, true))
+                        .subscribe(usskus -> mView.loadSkus(usskus, true), throwable -> mView.showMsg(throwable.getMessage()))
         );
     }
 
@@ -275,7 +275,7 @@ public class StorePresenter extends StoreContract.Presenter {
         mCompositeDisposable.add(
                 DBFactory.Store.querySku(mSearchPageNum, mKeyword)
                         .doOnSubscribe(subscription -> mView.dismissLoadingDialog())
-                        .subscribe(ssskus -> mView.loadSearchResult(ssskus, mSearchPageNum == 0))
+                        .subscribe(ssskus -> mView.loadSearchResult(ssskus, mSearchPageNum == 0), throwable -> mView.showMsg(throwable.getMessage()))
         );
     }