修复已知bug

mylhyl · Jan 9, 2020 · d937c87 · d937c87
1 parent 8068066
commit d937c87
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
 
 # 引入
 ```xml
- implementation 'com.mylhyl:circleDialog:5.0.6'
+ implementation 'com.mylhyl:circleDialog:5.0.7'
 ```
 如果版本号后面有-alpha，那说明最后一个版本是预览版，可能存在bug谨慎使用，稳定版则没有-alpha后缀  
 例如  

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/BaseCircleDialog.java b/circledialog/src/main/java/com/mylhyl/circledialog/BaseCircleDialog.java
@@ -52,11 +52,13 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
     @Override
     public void onDismiss(DialogInterface dialog) {
         super.onDismiss(dialog);
-        if (mParams != null && mParams.circleListeners.dismissListener != null) {
-            mParams.circleListeners.dismissListener.onDismiss(dialog);
-        }
-        if (mParams != null && mParams.circleListeners.cancelListener != null) {
-            mParams.circleListeners.cancelListener.onCancel(dialog);
+        if (mParams != null) {
+            if (mParams.circleListeners.dismissListener != null) {
+                mParams.circleListeners.dismissListener.onDismiss(dialog);
+            }
+            if (mParams.circleListeners.cancelListener != null) {
+                mParams.circleListeners.cancelListener.onCancel(dialog);
+            }
         }
         mParams = null;
         mController = null;
@@ -123,11 +125,14 @@ public void onActivityCreated(Bundle savedInstanceState) {
 
     @Override
     public void onShow(DialogInterface dialog) {
-        if (mParams != null && mParams.circleListeners.showListener != null) {
-            mParams.circleListeners.showListener.onShow(dialog);
+        if (mParams != null) {
+            if (mParams.circleListeners.showListener != null) {
+                mParams.circleListeners.showListener.onShow(dialog);
+            }
+            if (mParams.popupParams != null && mParams.dialogParams.width != 0) {
+                resizeSize();
+            }
         }
-        if (mParams.popupParams != null && mParams.dialogParams.width != 0)
-            resizeSize();
     }
 
     void resizeSize() {

diff --git a/circledialog/src/main/java/com/mylhyl/circledialog/params/ProgressParams.java b/circledialog/src/main/java/com/mylhyl/circledialog/params/ProgressParams.java
@@ -1,12 +1,9 @@
 package com.mylhyl.circledialog.params;
 
 import android.graphics.Typeface;
-import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import androidx.annotation.RequiresApi;
-
 import com.mylhyl.circledialog.res.values.CircleColor;
 import com.mylhyl.circledialog.res.values.CircleDimen;
 
@@ -94,7 +91,6 @@ public ProgressParams[] newArray(int size) {
      *
      * @since 5.0.5
      */
-    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
     public int indeterminateColor;
 
     public ProgressParams() {