1.5.1 修复[LEEAlert clearQueue]问题

lixiang1994 · Sep 3, 2021 · 0caa261 · 0caa261
1 parent 5eb93f0
commit 0caa261
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/Framework/LEEAlert/LEEAlert.xcodeproj/project.pbxproj b/Framework/LEEAlert/LEEAlert.xcodeproj/project.pbxproj
@@ -297,7 +297,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.alert;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -325,7 +325,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.0;
+				MARKETING_VERSION = 1.5.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.alert;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

diff --git a/LEEAlert.podspec b/LEEAlert.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "LEEAlert"
-s.version      = "1.5.0"
+s.version      = "1.5.1"
 s.summary      = "优雅的Alert ActionSheet"
 
 s.homepage     = "https://github.com/lixiang1994/LEEAlert"

diff --git a/LEEAlert/LEEAlert.h b/LEEAlert/LEEAlert.h
@@ -12,7 +12,7 @@
  *
  *  @author LEE
  *  @copyright    Copyright © 2016 - 2020年 lee. All rights reserved.
- *  @version    V1.4.3
+ *  @version    V1.5.1
  */
 
 #import <Foundation/Foundation.h>

diff --git a/LEEAlert/LEEAlert.m b/LEEAlert/LEEAlert.m
@@ -12,7 +12,7 @@
  *
  *  @author LEE
  *  @copyright    Copyright © 2016 - 2020年 lee. All rights reserved.
- *  @version    V1.4.3
+ *  @version    V1.5.1
  */
 
 #import "LEEAlert.h"
@@ -1014,8 +1014,13 @@ + (void)continueQueueDisplay{
 }
 
 + (void)clearQueue{
+    if ([self isQueueEmpty]) return;
+
+    LEEBaseConfig * _Nullable last = [LEEAlert shareManager].queueArray.lastObject;
 
     [[LEEAlert shareManager].queueArray removeAllObjects];
+
+    if ([last respondsToSelector:@selector(close)]) [last performSelector:@selector(close)];
 }
 
 + (BOOL)isQueueEmpty{
@@ -3691,6 +3696,8 @@ - (UIView *)actionSheetView{
 
 @interface LEEBaseConfig ()<LEEAlertProtocol>
 
+@property (nonatomic, assign) BOOL isShowing;
+
 - (void)show;
 
 @end
@@ -3708,6 +3715,8 @@ - (nonnull instancetype)init
 
     if (self) {
 
+        self.isShowing = NO;
+
         __weak typeof(self) weakSelf = self;
 
         self.config.modelFinishConfig = ^{
@@ -3778,6 +3787,8 @@ - (void)show{
         }
 
         [[LEEAlert shareManager].leeWindow makeKeyAndVisible];
+
+        self.isShowing = YES;
     }
 
     if ([self.config.modelPresentation isKindOfClass:LEEPresentationViewController.class]) {
@@ -3799,6 +3810,8 @@ - (void)show{
         [LEEAlert shareManager].viewController.view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
 
         [[LEEAlert shareManager].viewController didMoveToParentViewController:presentation.viewController];
+
+        self.isShowing = YES;
     }
 
     __weak typeof(self) weakSelf = self;
@@ -3833,6 +3846,8 @@ - (void)show{
 
 - (void)close{
 
+    if (!self.isShowing) return;
+
     if ([self.config.modelPresentation isKindOfClass:LEEPresentationWindow.class]) {
 
         [LEEAlert shareManager].leeWindow.hidden = YES;

diff --git a/LEEAlert/LEEAlertHelper.h b/LEEAlert/LEEAlertHelper.h
@@ -13,7 +13,7 @@
  *
  *  @author LEE
  *  @copyright    Copyright © 2016 - 2020年 lee. All rights reserved.
- *  @version    V1.4.3
+ *  @version    V1.5.1
  */
 
 #ifndef LEEAlertHelper_h

diff --git a/UPDATELOG.md b/UPDATELOG.md
@@ -1,6 +1,11 @@
 
 # LEEAlert - 更新日志
 
+V1.5.1
+==============
+修复`[LEEAlert clearQueue]`问题
+
+
 V1.5.0
 ==============
 移除`.LeeWindowLevel(UIWindowLevel)`设置