Merge commit '138fff60904d4de1bab9d9275ee98f90e0c964ee'

MoLice · MoLice · commit b038f05fa040 · 2017-03-07T11:58:36.000+08:00
diff --git a/QMUI/QMUIKit/UIComponents/QMUIModalPresentationViewController.m b/QMUI/QMUIKit/UIComponents/QMUIModalPresentationViewController.m
@@ -48,6 +48,7 @@ + (void)initialize {
 @interface QMUIModalPresentationViewController ()
 
 @property(nonatomic, strong) QMUIModalPresentationWindow *containerWindow;
+@property(nonatomic, weak) UIWindow *previousKeyWindow;
 
 @property(nonatomic, assign) BOOL appearAnimated;
 @property(nonatomic, copy) void (^appearCompletionBlock)(BOOL finished);
@@ -197,8 +198,10 @@ - (void)viewWillDisappear:(BOOL)animated {
     void (^didHiddenCompletion)(BOOL finished) = ^(BOOL finished) {
         
         if (self.containerWindow) {
+            [self.previousKeyWindow makeKeyWindow];
             self.containerWindow.hidden = YES;
             self.containerWindow.rootViewController = nil;
+            self.previousKeyWindow = nil;
             [self endAppearanceTransition];
         }
         
@@ -384,17 +387,17 @@ - (void)showingAnimationWithCompletion:(void (^)(BOOL))completion {
 }
 
 - (void)showWithAnimated:(BOOL)animated completion:(void (^)(BOOL))completion {
-    // makeKeyAndVisible导致的viewWillAppear:必定animated是NO的，所以这里用额外的变量保存这个animated的值
+    // makeKeyAndVisible 导致的 viewWillAppear: 必定 animated 是 NO 的，所以这里用额外的变量保存这个 animated 的值
     self.appearAnimated = animated;
     self.appearCompletionBlock = completion;
-    
+    self.previousKeyWindow = [UIApplication sharedApplication].keyWindow;
     if (!self.containerWindow) {
         self.containerWindow = [[QMUIModalPresentationWindow alloc] init];
         self.containerWindow.windowLevel = UIWindowLevelQMUIAlertView;
         self.containerWindow.backgroundColor = UIColorClear;// 避免横竖屏旋转时出现黑色
     }
     self.containerWindow.rootViewController = self;
-    self.containerWindow.hidden = NO;
+    [self.containerWindow makeKeyAndVisible];
 }
 
 - (void)hidingAnimationWithCompletion:(void (^)(BOOL))completion {
diff --git a/QMUI/QMUIKit/UIKitExtensions/UIView+QMUI.m b/QMUI/QMUIKit/UIKitExtensions/UIView+QMUI.m
@@ -212,7 +212,7 @@ - (void)qmui_addSubview:(UIView *)view {
 }
 
 - (BOOL)qmui_becomeFirstResponder {
-    if (IS_SIMULATOR && ![self isKindOfClass:[UIWindow class]]) {
+    if (IS_SIMULATOR && ![self isKindOfClass:[UIWindow class]] && self.window && !self.window.keyWindow) {
         [self QMUISymbolicUIViewBecomeFirstResponderWithoutKeyWindow];
     }
     return [self qmui_becomeFirstResponder];

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ - (void)qmui_addSubview:(UIView *)view {`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`- (BOOL)qmui_becomeFirstResponder {`
`215`		`- if (IS_SIMULATOR && ![self isKindOfClass:[UIWindow class]]) {`
	`215`	`+ if (IS_SIMULATOR && ![self isKindOfClass:[UIWindow class]] && self.window && !self.window.keyWindow) {`
`216`	`216`	`[self QMUISymbolicUIViewBecomeFirstResponderWithoutKeyWindow];`
`217`	`217`	`}`
`218`	`218`	`return [self qmui_becomeFirstResponder];`