fixed the crash on iOS8.2 and Xcode 8.2.

dito010 · Dec 15, 2016 · 4474f3a · 4474f3a
1 parent 8988d0d
commit 4474f3a
Show file tree

Hide file tree

Showing 40 changed files with 12 additions and 12 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/JPNavigationControllerDemo/.DS_Store b/JPNavigationControllerDemo/.DS_Store
diff --git a/JPNavigationController/.DS_Store → ...llerDemo/JPNavigationController/.DS_Store b/JPNavigationController/.DS_Store → ...llerDemo/JPNavigationController/.DS_Store
diff --git a/...nController/JPAnimatedTransitioningBase.h → ...nController/JPAnimatedTransitioningBase.h b/...nController/JPAnimatedTransitioningBase.h → ...nController/JPAnimatedTransitioningBase.h
diff --git a/...nController/JPAnimatedTransitioningBase.m → ...nController/JPAnimatedTransitioningBase.m b/...nController/JPAnimatedTransitioningBase.m → ...nController/JPAnimatedTransitioningBase.m
diff --git a/...PFullScreenPopGestureRecognizerDelegate.h → ...PFullScreenPopGestureRecognizerDelegate.h b/...PFullScreenPopGestureRecognizerDelegate.h → ...PFullScreenPopGestureRecognizerDelegate.h
diff --git a/...PFullScreenPopGestureRecognizerDelegate.m → ...PFullScreenPopGestureRecognizerDelegate.m b/...PFullScreenPopGestureRecognizerDelegate.m → ...PFullScreenPopGestureRecognizerDelegate.m
diff --git a/...ontroller/JPImage.bundle/backImage@2x.png → ...ontroller/JPImage.bundle/backImage@2x.png b/...ontroller/JPImage.bundle/backImage@2x.png → ...ontroller/JPImage.bundle/backImage@2x.png
diff --git a/...ontroller/JPImage.bundle/backImage@3x.png → ...ontroller/JPImage.bundle/backImage@3x.png b/...ontroller/JPImage.bundle/backImage@3x.png → ...ontroller/JPImage.bundle/backImage@3x.png
diff --git a/...onController/JPImage.bundle/shadow@2x.png → ...onController/JPImage.bundle/shadow@2x.png b/...onController/JPImage.bundle/shadow@2x.png → ...onController/JPImage.bundle/shadow@2x.png
diff --git a/...onController/JPImage.bundle/shadow@3x.png → ...onController/JPImage.bundle/shadow@3x.png b/...onController/JPImage.bundle/shadow@3x.png → ...onController/JPImage.bundle/shadow@3x.png
diff --git a/JPNavigationController/JPLinkContainerView.h → ...avigationController/JPLinkContainerView.h b/JPNavigationController/JPLinkContainerView.h → ...avigationController/JPLinkContainerView.h
diff --git a/JPNavigationController/JPLinkContainerView.m → ...avigationController/JPLinkContainerView.m b/JPNavigationController/JPLinkContainerView.m → ...avigationController/JPLinkContainerView.m
diff --git a/...ationController/JPManageSinglePopVCTool.h → ...ationController/JPManageSinglePopVCTool.h b/...ationController/JPManageSinglePopVCTool.h → ...ationController/JPManageSinglePopVCTool.h
diff --git a/...ationController/JPManageSinglePopVCTool.m → ...ationController/JPManageSinglePopVCTool.m b/...ationController/JPManageSinglePopVCTool.m → ...ationController/JPManageSinglePopVCTool.m
diff --git a/JPNavigationController/JPNavigationBar.h → .../JPNavigationController/JPNavigationBar.h b/JPNavigationController/JPNavigationBar.h → .../JPNavigationController/JPNavigationBar.h
diff --git a/JPNavigationController/JPNavigationBar.m → .../JPNavigationController/JPNavigationBar.m b/JPNavigationController/JPNavigationBar.m → .../JPNavigationController/JPNavigationBar.m
diff --git a/...gationController/JPNavigationController.h → ...gationController/JPNavigationController.h b/...gationController/JPNavigationController.h → ...gationController/JPNavigationController.h
diff --git a/...gationController/JPNavigationController.m → ...gationController/JPNavigationController.m b/...gationController/JPNavigationController.m → ...gationController/JPNavigationController.m
diff --git a/...ionController/JPNavigationControllerKit.h → ...ionController/JPNavigationControllerKit.h b/...ionController/JPNavigationControllerKit.h → ...ionController/JPNavigationControllerKit.h
diff --git a/...oller/JPNavigationInteractiveTransition.h → ...oller/JPNavigationInteractiveTransition.h b/...oller/JPNavigationInteractiveTransition.h → ...oller/JPNavigationInteractiveTransition.h
diff --git a/...oller/JPNavigationInteractiveTransition.m → ...oller/JPNavigationInteractiveTransition.m b/...oller/JPNavigationInteractiveTransition.m → ...oller/JPNavigationInteractiveTransition.m
diff --git a/...nController/JPPushAnimatedTransitioning.h → ...nController/JPPushAnimatedTransitioning.h b/...nController/JPPushAnimatedTransitioning.h → ...nController/JPPushAnimatedTransitioning.h
diff --git a/...nController/JPPushAnimatedTransitioning.m → ...nController/JPPushAnimatedTransitioning.m b/...nController/JPPushAnimatedTransitioning.m → ...nController/JPPushAnimatedTransitioning.m
diff --git a/JPNavigationController/JPSnapTool.h → ...rDemo/JPNavigationController/JPSnapTool.h b/JPNavigationController/JPSnapTool.h → ...rDemo/JPNavigationController/JPSnapTool.h
diff --git a/JPNavigationController/JPSnapTool.m → ...rDemo/JPNavigationController/JPSnapTool.m b/JPNavigationController/JPSnapTool.m → ...rDemo/JPNavigationController/JPSnapTool.m
diff --git a/...onController/JPWarpNavigationController.h → ...onController/JPWarpNavigationController.h b/...onController/JPWarpNavigationController.h → ...onController/JPWarpNavigationController.h
diff --git a/...onController/JPWarpNavigationController.m → ...onController/JPWarpNavigationController.m b/...onController/JPWarpNavigationController.m → ...onController/JPWarpNavigationController.m
diff --git a/...vigationController/JPWarpViewController.h → ...vigationController/JPWarpViewController.h b/...vigationController/JPWarpViewController.h → ...vigationController/JPWarpViewController.h
diff --git a/...vigationController/JPWarpViewController.m → ...vigationController/JPWarpViewController.m b/...vigationController/JPWarpViewController.m → ...vigationController/JPWarpViewController.m
diff --git a/...gationController+JPFullScreenPopGesture.h → ...gationController+JPFullScreenPopGesture.h b/...gationController+JPFullScreenPopGesture.h → ...gationController+JPFullScreenPopGesture.h
diff --git a/...gationController+JPFullScreenPopGesture.m → ...gationController+JPFullScreenPopGesture.m b/...gationController+JPFullScreenPopGesture.m → ...gationController+JPFullScreenPopGesture.m
@@ -17,7 +17,7 @@ -(void)setJp_interactivePopMaxAllowedInitialDistanceToLeftEdge:(CGFloat)jp_inter
     jp_interactivePopMaxAllowedInitialDistanceToLeftEdge = MAX(0, jp_interactivePopMaxAllowedInitialDistanceToLeftEdge);
     SEL key = @selector(jp_interactivePopMaxAllowedInitialDistanceToLeftEdge);
     CGFloat distance = jp_interactivePopMaxAllowedInitialDistanceToLeftEdge;
-    objc_setAssociatedObject(self, key, @(MAX(0, distance)), OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, key, @(MAX(0, distance)), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     UINavigationController *nav = self.navigationController;
     if (nav) {
         NSDictionary *dict = @{
@@ -76,7 +76,7 @@ -(JPNavigationController *)jp_rootNavigationController{
 }
 
 -(void)setJp_pushDelegate:(id<JPNavigationControllerDelegate>)jp_pushDelegate{
-    objc_setAssociatedObject(self, @selector(jp_pushDelegate), jp_pushDelegate, OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, @selector(jp_pushDelegate), jp_pushDelegate, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 -(id<JPNavigationControllerDelegate>)jp_pushDelegate{

diff --git a/...ontroller/UINavigationController+JPLink.h → ...ontroller/UINavigationController+JPLink.h b/...ontroller/UINavigationController+JPLink.h → ...ontroller/UINavigationController+JPLink.h
diff --git a/...ontroller/UINavigationController+JPLink.m → ...ontroller/UINavigationController+JPLink.m b/...ontroller/UINavigationController+JPLink.m → ...ontroller/UINavigationController+JPLink.m
@@ -11,7 +11,7 @@
 @implementation UINavigationController (JPLink)
 
 -(void)setJp_linkViewHeight:(CGFloat)jp_linkViewHeight{
-    objc_setAssociatedObject(self, @selector(jp_linkViewHeight), @(jp_linkViewHeight), OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, @selector(jp_linkViewHeight), @(jp_linkViewHeight), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     [self handleAddLinkView];
 }
 
@@ -20,7 +20,7 @@ -(CGFloat)jp_linkViewHeight{
 }
 
 -(void)setJp_linkView:(UIView *)jp_linkView{
-    objc_setAssociatedObject(self, @selector(jp_linkView), jp_linkView, OBJC_ASSOCIATION_ASSIGN);    
+    objc_setAssociatedObject(self, @selector(jp_linkView), jp_linkView, OBJC_ASSOCIATION_RETAIN_NONATOMIC);    
     [self handleAddLinkView];
 }
 

diff --git a/...UIViewController+JPNavigationController.h → ...UIViewController+JPNavigationController.h b/...UIViewController+JPNavigationController.h → ...UIViewController+JPNavigationController.h
diff --git a/...UIViewController+JPNavigationController.m → ...UIViewController+JPNavigationController.m b/...UIViewController+JPNavigationController.m → ...UIViewController+JPNavigationController.m
@@ -10,15 +10,15 @@
 @implementation UIViewController (JPNavigationController)
 
 -(void)setJp_navigationController:(JPNavigationController *)jp_navigationController{
-    objc_setAssociatedObject(self, @selector(jp_navigationController), jp_navigationController, OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, @selector(jp_navigationController), jp_navigationController, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 -(JPNavigationController *)jp_navigationController{
     return objc_getAssociatedObject(self, _cmd);
 }
 
 -(void)setJp_warpViewController:(JPWarpViewController *)jp_warpViewController{
-    objc_setAssociatedObject(self, @selector(jp_warpViewController), jp_warpViewController, OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, @selector(jp_warpViewController), jp_warpViewController, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 -(JPWarpViewController *)jp_warpViewController{

diff --git a/...tionControllerDemo.xcworkspace/xcuserdata/lava.xcuserdatad/UserInterfaceState.xcuserstate b/...tionControllerDemo.xcworkspace/xcuserdata/lava.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...tionControllerDemo/JPNavigationController/UINavigationController+JPFullScreenPopGesture.m b/...tionControllerDemo/JPNavigationController/UINavigationController+JPFullScreenPopGesture.m
@@ -17,7 +17,7 @@ -(void)setJp_interactivePopMaxAllowedInitialDistanceToLeftEdge:(CGFloat)jp_inter
     jp_interactivePopMaxAllowedInitialDistanceToLeftEdge = MAX(0, jp_interactivePopMaxAllowedInitialDistanceToLeftEdge);
     SEL key = @selector(jp_interactivePopMaxAllowedInitialDistanceToLeftEdge);
     CGFloat distance = jp_interactivePopMaxAllowedInitialDistanceToLeftEdge;
-    objc_setAssociatedObject(self, key, @(MAX(0, distance)), OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, key, @(MAX(0, distance)), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     UINavigationController *nav = self.navigationController;
     if (nav) {
         NSDictionary *dict = @{
@@ -76,7 +76,7 @@ -(JPNavigationController *)jp_rootNavigationController{
 }
 
 -(void)setJp_pushDelegate:(id<JPNavigationControllerDelegate>)jp_pushDelegate{
-    objc_setAssociatedObject(self, @selector(jp_pushDelegate), jp_pushDelegate, OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, @selector(jp_pushDelegate), jp_pushDelegate, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 -(id<JPNavigationControllerDelegate>)jp_pushDelegate{

diff --git a/...lerDemo/JPNavigationControllerDemo/JPNavigationController/UINavigationController+JPLink.m b/...lerDemo/JPNavigationControllerDemo/JPNavigationController/UINavigationController+JPLink.m
@@ -11,7 +11,7 @@
 @implementation UINavigationController (JPLink)
 
 -(void)setJp_linkViewHeight:(CGFloat)jp_linkViewHeight{
-    objc_setAssociatedObject(self, @selector(jp_linkViewHeight), @(jp_linkViewHeight), OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, @selector(jp_linkViewHeight), @(jp_linkViewHeight), OBJC_ASSOCIATION_RETAIN_NONATOMIC);
     [self handleAddLinkView];
 }
 
@@ -20,7 +20,7 @@ -(CGFloat)jp_linkViewHeight{
 }
 
 -(void)setJp_linkView:(UIView *)jp_linkView{
-    objc_setAssociatedObject(self, @selector(jp_linkView), jp_linkView, OBJC_ASSOCIATION_ASSIGN);    
+    objc_setAssociatedObject(self, @selector(jp_linkView), jp_linkView, OBJC_ASSOCIATION_RETAIN_NONATOMIC);    
     [self handleAddLinkView];
 }
 

diff --git a/...NavigationControllerDemo/JPNavigationController/UIViewController+JPNavigationController.m b/...NavigationControllerDemo/JPNavigationController/UIViewController+JPNavigationController.m
@@ -10,15 +10,15 @@
 @implementation UIViewController (JPNavigationController)
 
 -(void)setJp_navigationController:(JPNavigationController *)jp_navigationController{
-    objc_setAssociatedObject(self, @selector(jp_navigationController), jp_navigationController, OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, @selector(jp_navigationController), jp_navigationController, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 -(JPNavigationController *)jp_navigationController{
     return objc_getAssociatedObject(self, _cmd);
 }
 
 -(void)setJp_warpViewController:(JPWarpViewController *)jp_warpViewController{
-    objc_setAssociatedObject(self, @selector(jp_warpViewController), jp_warpViewController, OBJC_ASSOCIATION_ASSIGN);
+    objc_setAssociatedObject(self, @selector(jp_warpViewController), jp_warpViewController, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
 }
 
 -(JPWarpViewController *)jp_warpViewController{