发布1.0.6

调整内部方法名解决与Masonry冲突问题增加头部点击关闭设置修复在与键盘同时弹出时被键盘遮挡的BUG 调整键盘显示时的适配处理 (原来会在键盘弹出后才进行调整 , 现在与键盘同时进行)
lixiang1994 · Jun 21, 2017 · eba7f8a · eba7f8a
1 parent bade40f
commit eba7f8a
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 44 deletions.
diff --git a/Framework/LEEAlert/Info.plist b/Framework/LEEAlert/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.5</string>
+	<string>1.0.6</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

diff --git a/LEEAlert.podspec b/LEEAlert.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "LEEAlert"
-s.version      = "1.0.5"
+s.version      = "1.0.6"
 s.summary      = "优雅的Alert ActionSheet"
 
 s.homepage     = "https://github.com/lixiang1994/LEEAlert"
@@ -13,7 +13,7 @@ s.author       = { "LEE" => "[email protected]" }
 s.platform     = :ios
 s.platform     = :ios, "8.0"
 
-s.source       = { :git => "https://github.com/lixiang1994/LEEAlert.git", :tag => "1.0.5"}
+s.source       = { :git => "https://github.com/lixiang1994/LEEAlert.git", :tag => "1.0.6"}
 
 s.source_files  = "LEEAlert/**/*.{h,m}"
 

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

diff --git a/LEEAlert/LEEAlert.m b/LEEAlert/LEEAlert.m
@@ -13,7 +13,7 @@
  *
  *  @author LEE
  *  @copyright    Copyright © 2016 - 2017年 lee. All rights reserved.
- *  @version    V1.0.5
+ *  @version    V1.0.6
  */
 
 #import "LEEAlert.h"
@@ -1482,45 +1482,25 @@ - (void)viewDidLoad{
 
     [super viewDidLoad];
 
+    [self configNotification];
+
     [self configAlert];
 }
 
 - (void)configNotification{
 
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShown:) name:UIKeyboardWillShowNotification object:nil];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil];
-
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillChangeFrame:) name:UIKeyboardWillChangeFrameNotification object:nil];
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidChangeFrame:) name:UIKeyboardDidChangeFrameNotification object:nil];
-}
-
-- (void)keyboardWillShown:(NSNotification *)notify{
-
-    keyboardFrame = [[[notify userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
-
-    isShowingKeyboard = YES;
-}
-
-- (void)keyboardWillHidden:(NSNotification *)notify{
-
-    keyboardFrame = [[[notify userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
-
-    isShowingKeyboard = NO;
 }
 
 - (void)keyboardWillChangeFrame:(NSNotification *)notify{
 
-}
-
-- (void)keyboardDidChangeFrame:(NSNotification *)notify{
-
     double duration = [[[notify userInfo] objectForKey:UIKeyboardAnimationDurationUserInfoKey] doubleValue];
 
     keyboardFrame = [[[notify userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue];
 
-    [UIView beginAnimations:@"keyboardDidChangeFrame" context:NULL];
+    isShowingKeyboard = keyboardFrame.origin.y < SCREEN_HEIGHT;
+
+    [UIView beginAnimations:@"keyboardWillChangeFrame" context:NULL];
 
     [UIView setAnimationDuration:duration];
 
@@ -1559,18 +1539,20 @@ - (void)updateAlertLayoutWithViewWidth:(CGFloat)viewWidth ViewHeight:(CGFloat)vi
 
             CGFloat tempAlertViewHeight = keyboardY - alertViewHeight < 20 ? keyboardY - 20 : alertViewHeight;
 
+            CGFloat tempAlertViewY = keyboardY - tempAlertViewHeight - 10;
+
+            CGFloat originalAlertViewY = (viewHeight - alertViewFrame.size.height) * 0.5f;
+
             alertViewFrame.size.height = tempAlertViewHeight;
 
             alertViewFrame.size.width = alertViewMaxWidth;
 
             alertViewFrame.origin.x = (viewWidth - alertViewFrame.size.width) * 0.5f;
 
-            alertViewFrame.origin.y = keyboardY - alertViewFrame.size.height - 10;
+            alertViewFrame.origin.y = tempAlertViewY < originalAlertViewY ? tempAlertViewY : originalAlertViewY;
 
             self.alertView.frame = alertViewFrame;
 
-            [self.alertView setContentOffset:CGPointZero animated:NO];
-
             [self.alertView scrollRectToVisible:[self findFirstResponder:self.alertView].frame animated:YES];
         }
 
@@ -1586,7 +1568,7 @@ - (void)updateAlertLayoutWithViewWidth:(CGFloat)viewWidth ViewHeight:(CGFloat)vi
 
         alertViewFrame.origin.x = (viewWidth - alertViewMaxWidth) * 0.5f;
 
-        alertViewFrame.origin.y = (viewHeight - alertViewFrame.size.height) / 2;
+        alertViewFrame.origin.y = (viewHeight - alertViewFrame.size.height) * 0.5f;
 
         self.alertView.frame = alertViewFrame;
     }
@@ -1595,6 +1577,8 @@ - (void)updateAlertLayoutWithViewWidth:(CGFloat)viewWidth ViewHeight:(CGFloat)vi
 
 - (void)updateAlertItemsLayout{
 
+    [UIView setAnimationsEnabled:NO];
+
     alertViewHeight = 0.0f;
 
     CGFloat alertViewMaxWidth = self.config.modelMaxWidthBlock(self.orientationType);
@@ -1711,6 +1695,8 @@ - (void)updateAlertItemsLayout{
     }
 
     self.alertView.contentSize = CGSizeMake(alertViewMaxWidth, alertViewHeight);
+
+    [UIView setAnimationsEnabled:YES];
 }
 
 - (void)configAlert{
@@ -1893,8 +1879,6 @@ - (void)configAlert{
 
         if (weakSelf) {
 
-            [weakSelf configNotification];
-
             [weakSelf updateAlertLayout];
         }
 
@@ -2150,10 +2134,6 @@ - (void)viewDidLoad{
     [self configActionSheet];
 }
 
-- (void)configNotification{
-
-}
-
 - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator{
 
     [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
@@ -2172,6 +2152,7 @@ - (void)updateActionSheetLayoutWithViewWidth:(CGFloat)viewWidth ViewHeight:(CGFl
 
     CGFloat actionSheetViewMaxHeight = self.config.modelMaxHeightBlock(self.orientationType);
 
+    [UIView setAnimationsEnabled:NO];
 
     __block CGFloat actionSheetViewHeight = 0.0f;
 
@@ -2261,6 +2242,8 @@ - (void)updateActionSheetLayoutWithViewWidth:(CGFloat)viewWidth ViewHeight:(CGFl
 
     self.actionSheetView.contentSize = CGSizeMake(actionSheetViewMaxWidth, actionSheetViewHeight);
 
+    [UIView setAnimationsEnabled:YES];
+
     CGFloat cancelActionTotalHeight = self.actionSheetCancelAction ? self.actionSheetCancelAction.actionHeight + self.config.modelActionSheetCancelActionSpaceWidth : 0.0f;
 
     CGRect actionSheetViewFrame = self.actionSheetView.frame;
@@ -2499,8 +2482,6 @@ - (void)configActionSheet{
 
         if (weakSelf) {
 
-            [weakSelf configNotification];
-
             [weakSelf updateActionSheetLayout];
         }
 

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

diff --git a/LEEAlertDemo/LEEAlertDemo/AlertTableViewController.m b/LEEAlertDemo/LEEAlertDemo/AlertTableViewController.m
@@ -142,7 +142,7 @@ - (void)base:(NSInteger)index{
                 tf = textField; //赋值
             })
             .LeeAction(@"好的", ^{
-
+                
                 [tf resignFirstResponder];
             })
             .LeeCancelAction(@"取消", nil) // 点击事件的Block如果不需要可以传nil

diff --git a/UPDATELOG.md b/UPDATELOG.md
@@ -1,6 +1,13 @@
 
 # LEEAlert - 更新日志
 
+V1.0.6
+==============
+调整内部方法名 解决与Masonry冲突问题
+增加头部点击关闭设置
+修复在与键盘同时弹出时 被键盘遮挡的BUG
+调整键盘显示时的适配处理 (原来会在键盘弹出后才进行调整 , 现在与键盘同时进行)
+
 V1.0.5
 ==============
 修复actionsheet的action默认无分隔线的BUG