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

@@ -485,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/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/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;