Răsfoiți Sursa

0.0.44.beta3

kongzue 3 ani în urmă
părinte
comite
ba5796a40a

+ 12 - 1
DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java

@@ -397,6 +397,17 @@ public class WaitDialog extends BaseDialog {
                     return false;
                 }
             });
+            
+            if (isCancelable()) {
+                boxRoot.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        doDismiss(v);
+                    }
+                });
+            } else {
+                boxRoot.setOnClickListener(null);
+            }
         }
         
         private float oldProgress;
@@ -715,7 +726,7 @@ public class WaitDialog extends BaseDialog {
         if (overrideCancelable != null) {
             return overrideCancelable == BOOLEAN.TRUE;
         }
-        return cancelable;
+        return false;
     }
     
     public WaitDialog setCancelable(boolean cancelable) {

+ 6 - 0
DialogX/src/main/java/com/kongzue/dialogx/interfaces/BaseDialog.java

@@ -160,6 +160,9 @@ public abstract class BaseDialog {
                                 error(((BaseDialog) view.getTag()).dialogKey() + "已处于显示状态,请勿重复执行 show() 指令。");
                                 return;
                             }
+                            if (view.getParent() != null) {
+                                ((ViewGroup) view.getParent()).removeView(view);
+                            }
                             rootFrameLayout.get().addView(view);
                         }
                     });
@@ -221,6 +224,9 @@ public abstract class BaseDialog {
                                 error(((BaseDialog) view.getTag()).dialogKey() + "已处于显示状态,请勿重复执行 show() 指令。");
                                 return;
                             }
+                            if (view.getParent() != null) {
+                                ((ViewGroup) view.getParent()).removeView(view);
+                            }
                             activityRootView.addView(view);
                         }
                     });

+ 1 - 1
gradle.properties

@@ -18,5 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 
-BUILD_VERSION=0.0.44.beta2
+BUILD_VERSION=0.0.44.beta3
 BUILD_VERSION_INT=43