消费者端

版本更新fixd

mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseActivity.java

@@ -56,7 +56,6 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
     private int viewModelId;
     private MaterialDialog dialog;
 
-    /*空值情况*/
     private NUllDialog nullDialog;
 
     @Override
@@ -133,7 +132,6 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
      **/
     //注册ViewModel与View的契约UI回调事件
     protected void registorUIChangeLiveDataCallBack() {
-
         //加载对话框显示
         viewModel.getUC().getShowDialogEventNoTouch().observe(this, new Observer<String>() {
             @Override
@@ -234,8 +232,30 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
     }
 
     /**
-     * =====================================================================禁止返回
-     **/
+     * 触发禁用返回键
+     */
+    public void showNoTouchDialog(String title) {
+        if (StringUtils.isEmpty(title)) {
+            if (nullDialog != null) {
+                nullDialog.show();
+            } else {
+                nullDialog = new NUllDialog(this);
+                nullDialog.show();
+            }
+        } else {
+            if (dialog != null) {
+                dialog = dialog.getBuilder().title(title).build();
+                dialog.show();
+            } else {
+                MaterialDialog.Builder builder = MaterialDialogUtils.showIndeterminateProgressNoTouchDialog(this, title, true);
+                dialog = builder.show();
+            }
+        }
+    }
+
+        /**
+         * =====================================================================禁止返回
+         **/
     //注册ViewModel与View的契约UI回调事件
     protected void registorUIChangeLiveDataCallBackNoTouch() {
         //加载对话框消失
@@ -366,29 +386,6 @@ public abstract class BaseActivity<V extends ViewDataBinding, VM extends BaseVie
 
     }
 
-    /**
-     * 触发禁用返回键
-     */
-    public void showNoTouchDialog(String title) {
-        if (StringUtils.isEmpty(title)) {
-            if (nullDialog != null) {
-                nullDialog.show();
-            } else {
-                nullDialog = new NUllDialog(this);
-                nullDialog.show();
-            }
-        } else {
-            if (dialog != null) {
-                dialog = dialog.getBuilder().title(title).build();
-                dialog.show();
-            } else {
-                MaterialDialog.Builder builder = MaterialDialogUtils.showIndeterminateProgressNoTouchDialog(this, title, true);
-                dialog = builder.show();
-            }
-        }
-
-
-    }
 
     public void showCommTextDialog(RefuseDialogBean bean, CommTextDialog.onAcceptCallBack callBack) {
         CommTextDialog textDialog = new CommTextDialog(this, bean, callBack);

mvvmhabit/src/main/java/me/goldze/mvvmhabit/base/BaseFragment.java

@@ -50,8 +50,9 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
     protected VM viewModel;
     private int viewModelId;
     private MaterialDialog dialog;
-    /*空值情况*/
+
     private NUllDialog nullDialog;
+
     Fragment f = this;
 
     @Override
@@ -141,7 +142,6 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
     protected void registorUIChangeLiveDataCallBack() {
 
 
-        //加载对话框显示
         //加载对话框显示
         viewModel.getUC().getShowDialogEventNoTouch().observe(this, new Observer<String>() {
             @Override
@@ -221,26 +221,6 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
         });
     }
 
-    public void showCommTextDialog(RefuseDialogBean bean, CommTextDialog.onAcceptCallBack callBack) {
-        CommTextDialog textDialog = new CommTextDialog(getContext(), bean, callBack);
-        textDialog.show();
-    }
-
-    public void startPhoto(boolean hasCamera, SelectCallback callback) {
-        EasyPhotos.createAlbum(this, hasCamera, false, GlideEngine.getInstance()).setCount(1)
-                .setFileProviderAuthority(getAppProcessName(getContext()) + ".fileProvider")
-                .start(callback);
-    }
-
-    public void showDialog(String title) {
-        if (dialog != null) {
-            dialog = dialog.getBuilder().title(title).build();
-            dialog.show();
-        } else {
-            MaterialDialog.Builder builder = MaterialDialogUtils.showIndeterminateProgressDialog(getActivity(), title, true);
-            dialog = builder.show();
-        }
-    }
     /**
      * 触发禁用返回键
      */
@@ -264,6 +244,29 @@ public abstract class BaseFragment<V extends ViewDataBinding, VM extends BaseVie
 
 
     }
+
+
+    public void showCommTextDialog(RefuseDialogBean bean, CommTextDialog.onAcceptCallBack callBack) {
+        CommTextDialog textDialog = new CommTextDialog(getContext(), bean, callBack);
+        textDialog.show();
+    }
+
+    public void startPhoto(boolean hasCamera, SelectCallback callback) {
+        EasyPhotos.createAlbum(this, hasCamera, false, GlideEngine.getInstance()).setCount(1)
+                .setFileProviderAuthority(getAppProcessName(getContext()) + ".fileProvider")
+                .start(callback);
+    }
+
+    public void showDialog(String title) {
+        if (dialog != null) {
+            dialog = dialog.getBuilder().title(title).build();
+            dialog.show();
+        } else {
+            MaterialDialog.Builder builder = MaterialDialogUtils.showIndeterminateProgressDialog(getActivity(), title, true);
+            dialog = builder.show();
+        }
+    }
+
     public void dismissDialog() {
         if (dialog != null && dialog.isShowing()) {
             dialog.dismiss();

xxviewlibrary/src/main/java/com/xx/xxviewlibrary/comm/CommTextDialog.kt

 package com.xx.xxviewlibrary.comm
 
 import android.content.Context
+import android.content.DialogInterface
 import android.text.TextUtils
 import android.view.Gravity
 import android.view.View
@@ -10,33 +11,47 @@ import com.xx.xxviewlibrary.base.xxBaseDialog
 import com.xx.xxviewlibrary.databinding.DialogCommTextBinding
 import me.jessyan.autosize.utils.AutoSizeUtils
 
-class CommTextDialog(context: Context, var bean : RefuseDialogBean, var callback: onAcceptCallBack): xxBaseDialog<DialogCommTextBinding>(context) {
+class CommTextDialog(context: Context, var bean: RefuseDialogBean, var callback: onAcceptCallBack) :
+    xxBaseDialog<DialogCommTextBinding>(context) {
+    var dismissBack: Boolean = true;
     override fun InitView(): DialogSet {
-        return DialogSet(R.layout.dialog_comm_text,false,
-            Gravity.CENTER_HORIZONTAL or Gravity.CENTER_VERTICAL,true,AutoSizeUtils.dp2px(context,285.0F),
-            WindowManager.LayoutParams.WRAP_CONTENT)
+        return DialogSet(
+            R.layout.dialog_comm_text,
+            false,
+            Gravity.CENTER_HORIZONTAL or Gravity.CENTER_VERTICAL,
+            true,
+            AutoSizeUtils.dp2px(context, 285.0F),
+            WindowManager.LayoutParams.WRAP_CONTENT
+        )
     }
 
     override fun InitData() {
-        binding.model=bean
-        binding.dialog=this
-
-      /*  if (TextUtils.isEmpty(bean.refuseTxt))
-        {
-            binding.btnRefuse.visibility=View.GONE
-        }*/
+        binding.model = bean
+        binding.dialog = this
+        /*关闭弹窗监听事件,使其手机返回上一级功能和取消功能一致*/
+        setOnDismissListener {
+            if (dismissBack) {
+                /*调用取消功能*/
+                callback.refuseBack()
+            }
+        }
+
+        /*  if (TextUtils.isEmpty(bean.refuseTxt))
+          {
+              binding.btnRefuse.visibility=View.GONE
+          }*/
 
     }
 
-    fun refuseClick(view : View)
-    {
+    fun refuseClick(view: View) {
         callback.refuseBack()
+        dismissBack = false
         dismiss()
     }
 
-    fun acceptClick(view : View)
-    {
+    fun acceptClick(view: View) {
         callback.acceptBack()
+        dismissBack = false
         dismiss()
     }
 
@@ -44,4 +59,4 @@ class CommTextDialog(context: Context, var bean : RefuseDialogBean, var callback
         fun acceptBack()
         fun refuseBack()
     }
-}
+}
\ No newline at end of file