Browse Source

0.0.40.debug5

kongzue 4 years ago
parent
commit
36909f2fff

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

@@ -343,7 +343,7 @@ public class BottomDialog extends BaseDialog {
                 @Override
                 public void onDismiss() {
                     isShow = false;
-                    getDialogLifecycleCallback().onDismiss(me);
+                    if (!preShowFlag)getDialogLifecycleCallback().onDismiss(me);
                 }
             });
             

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

@@ -143,7 +143,7 @@ public class CustomDialog extends BaseDialog {
                 @Override
                 public void onDismiss() {
                     isShow = false;
-                    getDialogLifecycleCallback().onDismiss(me);
+                    if (!preShowFlag) getDialogLifecycleCallback().onDismiss(me);
                 }
             });
             

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

@@ -143,7 +143,7 @@ public class FullScreenDialog extends BaseDialog {
                 @Override
                 public void onDismiss() {
                     isShow = false;
-                    getDialogLifecycleCallback().onDismiss(me);
+                    if (!preShowFlag) getDialogLifecycleCallback().onDismiss(me);
                 }
             });
             

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

@@ -367,7 +367,7 @@ public class MessageDialog extends BaseDialog {
                 @Override
                 public void onDismiss() {
                     isShow = false;
-                    getDialogLifecycleCallback().onDismiss(me);
+                    if (!preShowFlag) getDialogLifecycleCallback().onDismiss(me);
                 }
             });
             

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

@@ -297,7 +297,7 @@ public class PopTip extends BaseDialog {
         }
         dialogView = createView(layoutResId);
         dialogImpl = new DialogImpl(dialogView);
-        if (dialogView!=null)dialogView.setTag(me);
+        if (dialogView != null) dialogView.setTag(me);
         show(dialogView);
     }
     
@@ -333,7 +333,7 @@ public class PopTip extends BaseDialog {
         }
         dialogView = createView(layoutResId);
         dialogImpl = new DialogImpl(dialogView);
-        if (dialogView!=null)dialogView.setTag(me);
+        if (dialogView != null) dialogView.setTag(me);
         show(activity, dialogView);
     }
     
@@ -426,7 +426,7 @@ public class PopTip extends BaseDialog {
                 public void onDismiss() {
                     if (popTipList != null) popTipList.remove(PopTip.this);
                     isShow = false;
-                    getDialogLifecycleCallback().onDismiss(me);
+                    if (!preShowFlag) getDialogLifecycleCallback().onDismiss(me);
                 }
             });
             
@@ -572,7 +572,7 @@ public class PopTip extends BaseDialog {
                         public void run() {
                             dismiss(dialogView);
                         }
-                    },exitAnimDuration == -1 ? exitAnim.getDuration() : exitAnimDuration);
+                    }, exitAnimDuration == -1 ? exitAnim.getDuration() : exitAnimDuration);
                 }
             });
         }
@@ -865,7 +865,7 @@ public class PopTip extends BaseDialog {
         enterAnimDuration = 0;
         dialogView = createView(layoutResId);
         dialogImpl = new DialogImpl(dialogView);
-        if (dialogView!=null)dialogView.setTag(me);
+        if (dialogView != null) dialogView.setTag(me);
         show(dialogView);
     }
 }

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

@@ -393,7 +393,7 @@ public class WaitDialog extends BaseDialog {
                 public void onDismiss() {
                     isShow = false;
                     dialogImpl = null;
-                    getDialogLifecycleCallback().onDismiss(me());
+                    if (!preShowFlag) getDialogLifecycleCallback().onDismiss(me());
                     me.clear();
                 }
             });
@@ -756,7 +756,7 @@ public class WaitDialog extends BaseDialog {
     
     /**
      * 获取当前 WaitDialog 显示状态
-     *
+     * <p>
      * 值的含义:
      * -1:  WaitDialog 等待状态
      * 0:   TipDialog 无状态(与 WaitDialog 等待状态相同)

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

@@ -126,6 +126,8 @@ public abstract class BaseDialog {
         baseDialog.dialogView = new WeakReference<>(view);
         baseDialog.preShowFlag = false;
         
+        log(baseDialog.dialogKey() + ".preShow");
+        
         if (rootFrameLayout == null || rootFrameLayout.get() == null) return;
         runOnMain(new Runnable() {
             @Override

+ 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.40.beta5
+BUILD_VERSION=0.0.40.debug5
 BUILD_VERSION_INT=39