Merge commit '1f615362134ab370cb48075bb22f9f27e2f977a6'

MoLice · MoLice · commit 5e59bdea71b3 · 2017-03-14T16:01:49.000+08:00
diff --git a/QMUI/QMUIKit.podspec b/QMUI/QMUIKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "QMUIKit"
-  s.version          = "1.3.2"
+  s.version          = "1.3.3"
   s.summary          = "致力于提高项目 UI 开发效率的解决方案"
   s.description      = <<-DESC
                        QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设计目的是用于辅助快速搭建一个具备基本设计还原效果的 iOS 项目，同时利用自身提供的丰富控件及兼容处理， 让开发者能专注于业务需求而无需耗费精力在基础代码的设计上。不管是新项目的创建，或是已有项目的维护，均可使开发效率和项目质量得到大幅度提升。
@@ -20,6 +20,6 @@ Pod::Spec.new do |s|
   # s.ios.exclude_files = 'Classes/osx'
   # s.osx.exclude_files = 'Classes/ios'
   # s.public_header_files = 'Classes/**/*.h'
-  s.frameworks       = 'Foundation', 'UIKit', 'CoreGraphics'
+  s.frameworks       = 'Foundation', 'UIKit', 'CoreGraphics', 'Photos'
 
 end
diff --git a/QMUI/QMUIKit/UIComponents/QMUIModalPresentationViewController.m b/QMUI/QMUIKit/UIComponents/QMUIModalPresentationViewController.m
@@ -275,7 +275,6 @@ - (void)setDimmingView:(UIView *)dimmingView {
 - (void)initDefaultDimmingViewWithoutAddToView {
     if (!self.dimmingView) {
         _dimmingView = [[UIView alloc] init];
-        self.dimmingView.alpha = 0.0;
         self.dimmingView.backgroundColor = UIColorMask;
         [self addTapGestureRecognizerToDimmingViewIfNeeded];
         if ([self isViewLoaded]) {
@@ -284,11 +283,6 @@ - (void)initDefaultDimmingViewWithoutAddToView {
     }
 }
 
-- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
-    [super touchesBegan:touches withEvent:event];
-    NSLog(@"");
-}
-
 // 要考虑用户可能创建了自己的dimmingView，则tap手势也要重新添加上去
 - (void)addTapGestureRecognizerToDimmingViewIfNeeded {
     if (!self.dimmingView) {
diff --git a/QMUI/QMUIKit/UIKitExtensions/QMUITextField.h b/QMUI/QMUIKit/UIKitExtensions/QMUITextField.h
@@ -32,6 +32,7 @@
  *  1. 自定义 placeholderColor。
  *  2. 自定义 UITextField 的文字 padding。
  *  3. 支持限制输入的文字的长度。
+ *  4. 修复 iOS 10 之后 UITextField 输入中文超过文本框宽度后再删除，文字往下掉的 bug。
  */
 @interface QMUITextField : UITextField
 
diff --git a/QMUI/QMUIKit/UIKitExtensions/QMUITextView.h b/QMUI/QMUIKit/UIKitExtensions/QMUITextView.h
@@ -14,9 +14,10 @@
 
 @optional
 /**
- *  输入框高度发生变化时的回调，仅当 `autoResizable` 属性为 YES 时才有效
+ *  输入框高度发生变化时的回调，仅当 `autoResizable` 属性为 YES 时才有效。
+ *  @note 只有当内容高度与当前输入框的高度不一致时才会调用到这里，所以无需在内部做高度是否变化的判断。
  */
-- (void)textView:(QMUITextView *)textView contentHeightAfterTextChanged:(CGFloat)height;
+- (void)textView:(QMUITextView *)textView newHeightAfterTextChanged:(CGFloat)height;
 
 /**
  *  用户点击键盘的 return 按钮时的回调（return 按钮本质上是输入换行符“\n”）
@@ -92,7 +93,7 @@
 
 /**
  *  是否支持自动拓展高度，默认为NO
- *  @see textView:contentHeightAfterTextChanged:
+ *  @see textView:newHeightAfterTextChanged:
  */
 @property(nonatomic, assign) BOOL autoResizable;
 
diff --git a/QMUI/QMUIKit/UIKitExtensions/QMUITextView.m b/QMUI/QMUIKit/UIKitExtensions/QMUITextView.m
@@ -304,8 +304,8 @@ - (void)handleTextChanged:(id)sender {
             
             
             // 通知delegate去更新textView的高度
-            if ([textView.originalDelegate respondsToSelector:@selector(textView:contentHeightAfterTextChanged:)]) {
-                [textView.originalDelegate textView:self contentHeightAfterTextChanged:resultHeight];
+            if ([textView.originalDelegate respondsToSelector:@selector(textView:newHeightAfterTextChanged:)] && resultHeight != CGRectGetHeight(self.bounds)) {
+                [textView.originalDelegate textView:self newHeightAfterTextChanged:resultHeight];
             }
         }
         
diff --git a/QMUI/QMUIKit/UIMainFrame/QMUINavigationController.h b/QMUI/QMUIKit/UIMainFrame/QMUINavigationController.h
@@ -90,4 +90,19 @@
  *  初始化时调用的方法，会在 initWithNibName:bundle: 和 initWithCoder: 这两个指定的初始化方法中被调用，所以子类如果需要同时支持两个初始化方法，则建议把初始化时要做的事情放到这个方法里。否则仅需重写要支持的那个初始化方法即可。
  */
 - (void)didInitialized NS_REQUIRES_SUPER;
+
+@end
+
+@interface QMUINavigationController (UISubclassingHooks)
+
+/**
+ *  每个界面Controller在即将展示的时候被调用，在`UINavigationController`的方法`navigationController:willShowViewController:animated:`中会自动被调用，同时因为如果把一个界面dismiss后回来此时并不会调用`navigationController:willShowViewController`，所以需要在`viewWillAppear`里面也会调用一次。
+ */
+- (void)willShowViewController:(nonnull UIViewController *)viewController NS_REQUIRES_SUPER;
+
+/**
+ *  同上
+ */
+- (void)didShowViewController:(nonnull UIViewController *)viewController NS_REQUIRES_SUPER;
+
 @end
diff --git a/QMUI/QMUIKit/UIMainFrame/QMUINavigationController.m b/QMUI/QMUIKit/UIMainFrame/QMUINavigationController.m
@@ -71,8 +71,12 @@ - (void)viewDidLoad {
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
-    // 在这里为什么还需要调用一次，是因为如果把一个界面dismiss后回来这里，此时并不会调用navigationController:willShowViewController，但会调用viewWillAppear
-    [self renderStyleInNavigationController:self currentViewController:self.topViewController];
+    [self willShowViewController:self.topViewController];
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    [self didShowViewController:self.topViewController];
 }
 
 - (UIViewController *)popViewControllerAnimated:(BOOL)animated {
@@ -255,7 +259,7 @@ - (void)handleInteractivePopGestureRecognizer:(UIScreenEdgePanGestureRecognizer
 // 注意如果实现了某一个navigationController的delegate方法，必须同时检查并且调用delegateProxy相对应的方法
 
 - (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    [self renderStyleInNavigationController:navigationController currentViewController:viewController];
+    [self willShowViewController:viewController];
     if ([self.delegateProxy respondsToSelector:_cmd]) {
         [self.delegateProxy navigationController:navigationController willShowViewController:viewController animated:animated];
     }
@@ -264,6 +268,7 @@ - (void)navigationController:(UINavigationController *)navigationController will
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
     self.viewControllerPopping = nil;
     self.isViewControllerTransiting = NO;
+    [self didShowViewController:viewController];
     if ([self.delegateProxy respondsToSelector:_cmd]) {
         [self.delegateProxy navigationController:navigationController didShowViewController:viewController animated:animated];
     }
@@ -300,3 +305,17 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
 }
 
 @end
+
+
+@implementation QMUINavigationController (UISubclassingHooks)
+
+- (void)willShowViewController:(UIViewController *)viewController {
+    // 子类可以重写
+    [self renderStyleInNavigationController:self currentViewController:viewController];
+}
+
+- (void)didShowViewController:(UIViewController *)viewController {
+    // 子类可以重写
+}
+
+@end
diff --git a/QMUI/README.md b/QMUI/README.md
@@ -40,7 +40,7 @@ QMUI iOS 是一个致力于提高项目 UI 开发效率的解决方案，其设
 #### Podfile
 ```
 platform :ios, '7.0'
-pod 'QMUIKit', '~>1.3.2'
+pod 'QMUIKit', '~>1.3.3'
 ```
 如果你的项目支持 iOS 8+，建议使用QMUI的动态库：
 
@@ -61,7 +61,7 @@ pod setup （这个步骤比较费时，请耐心等一等）
 
 #### Cartfile
 ```
-github "QMUI/QMUI_iOS" ~>1.3.2
+github "QMUI/QMUI_iOS" ~>1.3.3
 ```
 ### 作为子项目
 具体请查看我们的[开始使用](http://qmuiteam.com/ios/page/start.html#qw_downloadForUse)文档。

Original file line number	Diff line number	Diff line change
`@@ -304,8 +304,8 @@ - (void)handleTextChanged:(id)sender {`
`304`	`304`
`305`	`305`
`306`	`306`	`// 通知delegate去更新textView的高度`
`307`		`- if ([textView.originalDelegate respondsToSelector:@selector(textView:contentHeightAfterTextChanged:)]) {`
`308`		`- [textView.originalDelegate textView:self contentHeightAfterTextChanged:resultHeight];`
	`307`	`+ if ([textView.originalDelegate respondsToSelector:@selector(textView:newHeightAfterTextChanged:)] && resultHeight != CGRectGetHeight(self.bounds)) {`
	`308`	`+ [textView.originalDelegate textView:self newHeightAfterTextChanged:resultHeight];`
`309`	`309`	`}`
`310`	`310`	`}`
`311`	`311`