Merge remote-tracking branch 'origin/master'

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

@@ -10,6 +10,7 @@ import android.view.KeyEvent;
 import android.view.View;
 
 import com.hwangjr.rxbus.RxBus;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.util.InstanceUtil;
 
 import java.lang.reflect.ParameterizedType;
@@ -27,12 +28,13 @@ import me.yokeyword.fragmentation.SupportActivity;
  * @author Zhangzhen
  */
 
-public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBinding> extends SupportActivity {
+public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBinding> extends
+        SupportActivity {
 
     public Context mContext;
     public P mPresenter;
     public B mViewBinding;
-
+    public LoadingDialog mLoadingDialog;
     public List<BaseDialog> mDialogs;
 
     static {
@@ -49,6 +51,9 @@ public abstract class BaseActivity<P extends BasePresenter, B extends ViewDataBi
         mDialogs = new ArrayList<>();
         View rootView = getLayoutInflater().inflate(this.getLayoutId(), null, false);
         mViewBinding = DataBindingUtil.bind(rootView);
+        if (mLoadingDialog == null) {
+            mLoadingDialog = new LoadingDialog();
+        }
         super.setContentView(rootView);
         RxBus.get().register(mContext);
         initPresenter();
@@ -57,9 +62,12 @@ 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) {
-            Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass().getGenericSuperclass())).getActualTypeArguments()[0];
+        if (this instanceof BaseView && this.getClass().getGenericSuperclass() instanceof
+                ParameterizedType
+                && ((ParameterizedType) (this.getClass().getGenericSuperclass()))
+                .getActualTypeArguments().length > 0) {
+            Class mPresenterClass = (Class) ((ParameterizedType) (this.getClass()
+                    .getGenericSuperclass())).getActualTypeArguments()[0];
             mPresenter = InstanceUtil.getInstance(mPresenterClass);
             mPresenter.setIntent(getIntent()).setView(this).build();
         }

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

@@ -13,6 +13,7 @@ import android.view.ViewGroup;
 
 import com.blankj.utilcode.util.ActivityUtils;
 import com.blankj.utilcode.util.KeyboardUtils;
+import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 
 import me.yokeyword.fragmentation.SupportFragment;
 
@@ -23,10 +24,12 @@ import me.yokeyword.fragmentation.SupportFragment;
  * @param <B> Fragment对应的ViewDataBinding
  * @author Zhangzhen
  */
-public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBinding> extends SupportFragment {
+public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBinding> extends
+        SupportFragment {
     public Context mContext;
     public P mPresenter;
     public B mViewBinding;
+    public LoadingDialog mLoadingDialog;
 
     static {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
@@ -36,9 +39,11 @@ public abstract class BaseFragment<P extends BasePresenter, B extends ViewDataBi
 
     @Nullable
     @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle
+            savedInstanceState) {
         mContext = ActivityUtils.getTopActivity();
         mPresenter = (P) ((BaseActivity) getActivity()).mPresenter;
+        mLoadingDialog = ((BaseActivity) getActivity()).mLoadingDialog;
         return getFragmentView(inflater, container);
     }
 

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

@@ -20,7 +20,6 @@ import io.realm.Realm;
 public abstract class BasePresenter<V> {
     protected V mView;
     protected CompositeDisposable mCompositeDisposable = new CompositeDisposable();
-
     private Realm mRealm;
 
     BasePresenter setView(V v) {

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

@@ -20,7 +20,6 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
 import com.xingdata.zzdpos.ui.dialog.PromptDialog;
 import com.xingdata.zzdpos.ui.login.LoginPresenter;
 import com.xingdata.zzdpos.util.OnClickListener;
-import com.xingdata.zzdpos.util.SystemUtil;
 import com.xingdata.zzdpos.view.PopupWindowDownList;
 
 

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

@@ -45,7 +45,7 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
     EditFragmentQueryShopAdapter queryShopAdapter;
     EditFragmentImgShopAdapter editFragmentImgShopAdapter;
     private long mExitTime;
-    LoadingDialog loadingDialog = new LoadingDialog();
+    public LoadingDialog loadingDialog = new LoadingDialog();
     List<Sssku> listData = new ArrayList<>();
     //需要提交给服务器的对象
     private UsskuParam mUsskuParam;
@@ -62,7 +62,6 @@ public class BaleEditFragment extends BaseFragment<BalePresenter, FragmentBaleEd
     @SuppressLint("StringFormatMatches")
     @Override
     public void initView() {
-
         if (nowType == 1) {
             //添加
             listData.clear();