Fix iOS9- crash issues;

cuzv · Apr 7, 2017 · b67dba6 · b67dba6
1 parent 9e41f71
commit b67dba6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,4 +21,10 @@
 ### 0.2.2
 
 - Fixed typo;
-- Use macro;
+- Use macro;
+
+### 0.2.3
+
+- Fix available issue for iOS10 lower versions.
+
+  
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 [![License](https://img.shields.io/badge/license-MIT-lightgrey.svg)](https://github.com/cuzv/RRNavigationBar/blob/master/LICENSE)
-[![CocoaPods Compatible](https://img.shields.io/badge/CocoaPods-v0.2.2-green.svg)](https://github.com/CocoaPods/CocoaPods)
+[![CocoaPods Compatible](https://img.shields.io/badge/CocoaPods-v0.2.3-green.svg)](https://github.com/CocoaPods/CocoaPods)
 [![Weibo](https://img.shields.io/badge/Weibo-cuzval-yellowgreen.svg)](http://weibo.com/cuzval/)
 [![Twitter](https://img.shields.io/twitter/url/http/shields.io.svg?style=social)](http://twitter.com/mochxiao)
 

diff --git a/Sources/UINavigationController+RRNavigationBar.m b/Sources/UINavigationController+RRNavigationBar.m
@@ -161,16 +161,29 @@ - (void)navigationController:(UINavigationController *)navigationController will
     }
 
     // If cancel pop, needs recover.
-    __weak typeof(self) weak_self = self;
+    static dispatch_once_t onceToken;
+    static BOOL iOSVersionGreaterThanOrEqualTo10 = NO;
+    dispatch_once(&onceToken, ^{
+        iOSVersionGreaterThanOrEqualTo10 = UIDevice.currentDevice.systemVersion.floatValue >= 10;
+    });
     id <UIViewControllerTransitionCoordinator> transitionCoordinator = self._visibleTopViewController.transitionCoordinator;
-    [transitionCoordinator notifyWhenInteractionChangesUsingBlock:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+    __weak typeof(self) weak_self = self;
+    void (^handleCancel)(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) = ^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
         if (context.isCancelled) {
             RRLog(@"Canceled");
             __strong typeof(weak_self) strong_self = weak_self;
             [strong_self _handleDidShowViewController:strong_self._visibleTopViewController];
         }
-    }];
-
+    };
+    if (iOSVersionGreaterThanOrEqualTo10) {
+        [transitionCoordinator notifyWhenInteractionChangesUsingBlock:handleCancel];
+    } else {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+        [transitionCoordinator notifyWhenInteractionEndsUsingBlock:handleCancel];
+#pragma clang diagnostic pop
+    }
+
     viewController.rr_navigationBar._rr_transiting = YES;
     viewController.rr_navigationBar._rr_equalOtherNavigationBarInTransiting = NO;
     viewController.rr_navigationBar.hidden = NO;