Ver Fonte

0.0.44.beta12

kongzue há 3 anos atrás
pai
commit
60bf997263

+ 10 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java

@@ -514,6 +514,9 @@ public class BottomDialog extends BaseDialog {
         
         @Override
         public void refreshView() {
+            if (boxRoot == null || getContext() == null) {
+                return;
+            }
             if (backgroundColor != -1) {
                 tintColor(bkg, backgroundColor);
                 if (blurView != null && cancelBlurView != null) {
@@ -673,8 +676,13 @@ public class BottomDialog extends BaseDialog {
     }
     
     public void dismiss() {
-        if (dialogImpl == null) return;
-        dialogImpl.doDismiss(null);
+        runOnMain(new Runnable() {
+            @Override
+            public void run() {
+                if (dialogImpl == null) return;
+                dialogImpl.doDismiss(null);
+            }
+        });
     }
     
     public DialogLifecycleCallback<BottomDialog> getDialogLifecycleCallback() {

+ 10 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/CustomDialog.java

@@ -227,6 +227,9 @@ public class CustomDialog extends BaseDialog {
         
         @Override
         public void refreshView() {
+            if (boxRoot == null || getContext() == null) {
+                return;
+            }
             RelativeLayout.LayoutParams rlp;
             rlp = ((RelativeLayout.LayoutParams) boxCustom.getLayoutParams());
             if (rlp == null) {
@@ -362,8 +365,13 @@ public class CustomDialog extends BaseDialog {
     }
     
     public void dismiss() {
-        if (dialogImpl == null) return;
-        dialogImpl.doDismiss(null);
+        runOnMain(new Runnable() {
+            @Override
+            public void run() {
+                if (dialogImpl == null) return;
+                dialogImpl.doDismiss(null);
+            }
+        });
     }
     
     public DialogLifecycleCallback<CustomDialog> getDialogLifecycleCallback() {

+ 10 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/FullScreenDialog.java

@@ -240,6 +240,9 @@ public class FullScreenDialog extends BaseDialog {
         
         @Override
         public void refreshView() {
+            if (boxRoot == null || getContext() == null) {
+                return;
+            }
             if (backgroundColor != -1) {
                 tintColor(bkg, backgroundColor);
             }
@@ -349,8 +352,13 @@ public class FullScreenDialog extends BaseDialog {
     }
     
     public void dismiss() {
-        if (dialogImpl == null) return;
-        dialogImpl.doDismiss(null);
+        runOnMain(new Runnable() {
+            @Override
+            public void run() {
+                if (dialogImpl == null) return;
+                dialogImpl.doDismiss(null);
+            }
+        });
     }
     
     public DialogLifecycleCallback<FullScreenDialog> getDialogLifecycleCallback() {

+ 10 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageDialog.java

@@ -458,6 +458,9 @@ public class MessageDialog extends BaseDialog {
         
         public void refreshView() {
             log("#refreshView");
+            if (boxRoot == null || getContext() == null) {
+                return;
+            }
             if (backgroundColor != -1) {
                 tintColor(bkg, backgroundColor);
                 if (style instanceof MaterialStyle) {
@@ -709,8 +712,13 @@ public class MessageDialog extends BaseDialog {
     }
     
     public void dismiss() {
-        if (dialogImpl == null) return;
-        dialogImpl.doDismiss(dialogImpl.bkg);
+        runOnMain(new Runnable() {
+            @Override
+            public void run() {
+                if (dialogImpl == null) return;
+                dialogImpl.doDismiss(dialogImpl.bkg);
+            }
+        });
     }
     
     public DialogLifecycleCallback<MessageDialog> getDialogLifecycleCallback() {

+ 10 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/PopMenu.java

@@ -439,6 +439,9 @@ public class PopMenu extends BaseDialog {
         
         @Override
         public void refreshView() {
+            if (boxRoot == null || getContext() == null) {
+                return;
+            }
             if (listMenu.getAdapter() == null) {
                 listMenu.setAdapter(menuListAdapter);
             } else {
@@ -528,8 +531,13 @@ public class PopMenu extends BaseDialog {
     }
     
     public void dismiss() {
-        if (dialogImpl == null) return;
-        dialogImpl.doDismiss(null);
+        runOnMain(new Runnable() {
+            @Override
+            public void run() {
+                if (dialogImpl == null) return;
+                dialogImpl.doDismiss(null);
+            }
+        });
     }
     
     @Override

+ 10 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/PopTip.java

@@ -539,6 +539,9 @@ public class PopTip extends BaseDialog {
         
         @Override
         public void refreshView() {
+            if (boxRoot == null || getContext() == null) {
+                return;
+            }
             if (backgroundColor != -1) {
                 tintColor(boxBody, backgroundColor);
             }
@@ -683,8 +686,13 @@ public class PopTip extends BaseDialog {
     }
     
     public void dismiss() {
-        if (dialogImpl == null) return;
-        dialogImpl.doDismiss(null);
+        runOnMain(new Runnable() {
+            @Override
+            public void run() {
+                if (dialogImpl == null) return;
+                dialogImpl.doDismiss(null);
+            }
+        });
     }
     
     public DialogLifecycleCallback<PopTip> getDialogLifecycleCallback() {

+ 4 - 2
DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java

@@ -318,6 +318,7 @@ public class WaitDialog extends BaseDialog {
                     bkg.post(new Runnable() {
                         @Override
                         public void run() {
+                            if (getContext() == null) return;
                             int enterAnimResId = R.anim.anim_dialogx_default_enter;
                             if (overrideEnterAnimRes != 0) {
                                 enterAnimResId = overrideEnterAnimRes;
@@ -413,8 +414,9 @@ public class WaitDialog extends BaseDialog {
         private float oldProgress;
         
         public void refreshView() {
-            if (bkg == null) return;
-            if (getContext() == null) return;
+            if (boxRoot == null || getContext() == null) {
+                return;
+            }
             
             bkg.setMaxWidth(getMaxWidth());
             

+ 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.beta11
+BUILD_VERSION=0.0.44.beta12
 BUILD_VERSION_INT=43