1.6.2

lixiang1994 · Oct 27, 2022 · a3fec28 · a3fec28
1 parent 5aba309
commit a3fec28
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 13 deletions.
diff --git a/LEEAlert.podspec b/LEEAlert.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "LEEAlert"
-s.version      = "1.6.1"
+s.version      = "1.6.2"
 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.6.1
+ *  @version    V1.6.2
  */
 
 #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.6.1
+ *  @version    V1.6.2
  */
 
 #import "LEEAlert.h"
@@ -2820,12 +2820,17 @@ - (void)buttonAction:(LEEActionButton *)sender{
 
     if (isClose) {
 
-        if (self.config.modelShouldActionClickClose && !self.config.modelShouldActionClickClose(index)) return;
-
-        [self closeAnimationsWithCompletionBlock:^{
+        if (self.config.modelShouldActionClickClose && self.config.modelShouldActionClickClose(index)) {
+
+            [self closeAnimationsWithCompletionBlock:^{
+
+                if (clickBlock) clickBlock();
+            }];
+
+        } else {
 
             if (clickBlock) clickBlock();
-        }];
+        }
 
     } else {
 
@@ -3701,12 +3706,17 @@ - (void)buttonAction:(LEEActionButton *)sender{
 
     if (isClose) {
 
-        if (self.config.modelShouldActionClickClose && !self.config.modelShouldActionClickClose(index)) return;
-
-        [self closeAnimationsWithCompletionBlock:^{
+        if (self.config.modelShouldActionClickClose && self.config.modelShouldActionClickClose(index)) {
+
+            [self closeAnimationsWithCompletionBlock:^{
+
+                if (clickBlock) clickBlock();
+            }];
+
+        } else {
 
             if (clickBlock) clickBlock();
-        }];
+        }
 
     } else {
 
@@ -4080,6 +4090,10 @@ - (void)show{
         if (@available(iOS 13.0, *)) {
             [LEEAlert shareManager].leeWindow.overrideUserInterfaceStyle = self.config.modelUserInterfaceStyle;
 
+        }
+
+        if (@available(iOS 16.0, *)) {
+
         } else {
             [[LEEAlert shareManager].leeWindow makeKeyAndVisible];
         }
@@ -4148,7 +4162,11 @@ - (void)close{
 
         [LEEAlert shareManager].leeWindow.hidden = YES;
 
-        [[LEEAlert shareManager].leeWindow resignKeyWindow];
+        if (@available(iOS 16.0, *)) {
+
+        } else {
+            [[LEEAlert shareManager].leeWindow resignKeyWindow];
+        }
 
         [LEEAlert shareManager].leeWindow.rootViewController = nil;
     }

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.6.1
+ *  @version    V1.6.2
  */
 
 #ifndef LEEAlertHelper_h

diff --git a/UPDATELOG.md b/UPDATELOG.md
@@ -1,6 +1,10 @@
 
 # LEEAlert - 更新日志
 
+V1.6.2
+==============
+`leeShouldActionClickClose` 返回False时 Action的点击事件回调也会被调用
+
 V1.6.1
 ==============
 尝试解决iOS16 Window旋转问题