修改弹出控制器后，再pop到跟控制的小bug

ZYN · ZYN · commit af9ac9c34683 · 2016-08-30T11:52:46.000+08:00
diff --git a/YNNavigationController.xcodeproj/project.pbxproj b/YNNavigationController.xcodeproj/project.pbxproj
@@ -10,6 +10,7 @@
 		2E28B02E1D52F20300C63612 /* NSObject+YNAssociateObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E28B02D1D52F20300C63612 /* NSObject+YNAssociateObject.m */; };
 		2E28B0311D5314B600C63612 /* YNScreenShotView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E28B0301D5314B600C63612 /* YNScreenShotView.m */; };
 		2E28B0341D5314FF00C63612 /* UIViewController+YNNavigationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E28B0331D5314FF00C63612 /* UIViewController+YNNavigationViewController.m */; };
+		2E2D39AF1D75350C00612B72 /* GoodsShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E2D39AE1D75350C00612B72 /* GoodsShareViewController.m */; };
 		2E3F26091D49DBA40042E303 /* TestNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2E3F26081D49DBA30042E303 /* TestNavigationController.m */; };
 		2E3F26101D49ED8B0042E303 /* back-@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2E3F260E1D49ED8B0042E303 /* back-@2x.png */; };
 		2E3F26111D49ED8B0042E303 /* back-@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 2E3F260F1D49ED8B0042E303 /* back-@3x.png */; };
@@ -33,6 +34,8 @@
 		2E28B0301D5314B600C63612 /* YNScreenShotView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = YNScreenShotView.m; sourceTree = "<group>"; };
 		2E28B0321D5314FF00C63612 /* UIViewController+YNNavigationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+YNNavigationViewController.h"; sourceTree = "<group>"; };
 		2E28B0331D5314FF00C63612 /* UIViewController+YNNavigationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+YNNavigationViewController.m"; sourceTree = "<group>"; };
+		2E2D39AD1D75350C00612B72 /* GoodsShareViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GoodsShareViewController.h; sourceTree = "<group>"; };
+		2E2D39AE1D75350C00612B72 /* GoodsShareViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GoodsShareViewController.m; sourceTree = "<group>"; };
 		2E3F26071D49DBA30042E303 /* TestNavigationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TestNavigationController.h; sourceTree = "<group>"; };
 		2E3F26081D49DBA30042E303 /* TestNavigationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TestNavigationController.m; sourceTree = "<group>"; };
 		2E3F260E1D49ED8B0042E303 /* back-@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back-@2x.png"; sourceTree = "<group>"; };
@@ -178,6 +181,8 @@
 		2EA0929B1D48586A000C75C5 /* GoodShare(商品分享) */ = {
 			isa = PBXGroup;
 			children = (
+				2E2D39AD1D75350C00612B72 /* GoodsShareViewController.h */,
+				2E2D39AE1D75350C00612B72 /* GoodsShareViewController.m */,
 			);
 			path = "GoodShare(商品分享)";
 			sourceTree = "<group>";
@@ -291,6 +296,7 @@
 				2EA092951D484F66000C75C5 /* YNNavigationController.m in Sources */,
 				2E3F26181D4AF5960042E303 /* ProductAddressDetailViewController.m in Sources */,
 				2EA092AA1D485C5C000C75C5 /* ProductDetailViewController.m in Sources */,
+				2E2D39AF1D75350C00612B72 /* GoodsShareViewController.m in Sources */,
 				2EA092981D4851F4000C75C5 /* BaseViewController.m in Sources */,
 				2EA092781D484ECD000C75C5 /* AppDelegate.m in Sources */,
 				2EA092751D484ECD000C75C5 /* main.m in Sources */,
diff --git a/YNNavigationController.xcodeproj/xcuserdata/zyn.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/YNNavigationController.xcodeproj/xcuserdata/zyn.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -3,22 +3,6 @@
    type = "1"
    version = "2.0">
    <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "YNNavigationController/Demo/Home(&#x9996;&#x9875;)/ProductList(&#x5546;&#x54c1;&#x5217;&#x8868;)/ProductListViewController.m"
-            timestampString = "491451873.436969"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "31"
-            endingLineNumber = "31"
-            landmarkName = "-tapOnClick"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -58,13 +42,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "YNNavigationController/Libs/YNNavigationController/YNNavigationController.m"
-            timestampString = "491985851.15445"
+            timestampString = "494221615.910606"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "421"
-            endingLineNumber = "421"
-            landmarkName = "-popToViewController:animated:"
-            landmarkType = "5">
+            startingLineNumber = "428"
+            endingLineNumber = "428">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -74,13 +56,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "YNNavigationController/Libs/YNNavigationController/YNNavigationController.m"
-            timestampString = "491985851.15445"
+            timestampString = "494221615.910606"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "423"
-            endingLineNumber = "423"
-            landmarkName = "@implementation YNNavigationController"
-            landmarkType = "3">
+            startingLineNumber = "430"
+            endingLineNumber = "430">
          </BreakpointContent>
       </BreakpointProxy>
       <BreakpointProxy
@@ -90,11 +70,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "YNNavigationController/Libs/YNNavigationController/YNNavigationController.m"
-            timestampString = "491985851.15445"
+            timestampString = "494221615.910606"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "407"
-            endingLineNumber = "407"
+            startingLineNumber = "414"
+            endingLineNumber = "414"
             landmarkName = "-popToViewController:animated:"
             landmarkType = "5">
          </BreakpointContent>
@@ -282,11 +262,11 @@
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             filePath = "YNNavigationController/Libs/YNNavigationController/YNNavigationController.m"
-            timestampString = "491985851.15445"
+            timestampString = "494221615.910606"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "405"
-            endingLineNumber = "405"
+            startingLineNumber = "412"
+            endingLineNumber = "412"
             landmarkName = "-popToViewController:animated:"
             landmarkType = "5">
          </BreakpointContent>
@@ -355,5 +335,37 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "YNNavigationController/Demo/TestNavigationController.m"
+            timestampString = "494220895.148789"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "28"
+            endingLineNumber = "28"
+            landmarkName = "-pushViewController:animated:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "YNNavigationController/Libs/YNNavigationController/YNNavigationController.m"
+            timestampString = "494221624.027347"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "405"
+            endingLineNumber = "405"
+            landmarkName = "-popToRootViewControllerAnimated:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/YNNavigationController/Demo/Discover(发现)/DiscoverGoodProduct(发现好商品)/GoodShare(商品分享)/GoodsShareViewController.h b/YNNavigationController/Demo/Discover(发现)/DiscoverGoodProduct(发现好商品)/GoodShare(商品分享)/GoodsShareViewController.h
@@ -0,0 +1,13 @@
+//
+//  GoodsShareViewController.h
+//  YNNavigationController
+//
+//  Created by ZYN on 16/8/30.
+//  Copyright © 2016年 Yongneng Zheng. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+@interface GoodsShareViewController : BaseViewController
+
+@end
diff --git a/YNNavigationController/Demo/Discover(发现)/DiscoverGoodProduct(发现好商品)/GoodShare(商品分享)/GoodsShareViewController.m b/YNNavigationController/Demo/Discover(发现)/DiscoverGoodProduct(发现好商品)/GoodShare(商品分享)/GoodsShareViewController.m
@@ -0,0 +1,51 @@
+//
+//  GoodsShareViewController.m
+//  YNNavigationController
+//
+//  Created by ZYN on 16/8/30.
+//  Copyright © 2016年 Yongneng Zheng. All rights reserved.
+//
+
+#import "GoodsShareViewController.h"
+
+@interface GoodsShareViewController ()
+
+@end
+
+@implementation GoodsShareViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    self.title = @"商品分享";
+    UIButton *btn = [[UIButton alloc]initWithFrame:self.view.bounds];
+    [btn setTitle:@"点我，快点我" forState:UIControlStateNormal];
+    [btn addTarget:self action:@selector(tapOnClick) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:btn];
+}
+
+
+- (void)tapOnClick{
+    
+    [self.navigationController popToRootViewControllerAnimated:YES];
+    
+    
+}
+
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
diff --git a/YNNavigationController/Demo/Discover(发现)/DiscoverViewController.m b/YNNavigationController/Demo/Discover(发现)/DiscoverViewController.m
@@ -7,6 +7,7 @@
 //
 
 #import "DiscoverViewController.h"
+#import "GoodsShareViewController.h"
 
 @interface DiscoverViewController ()
 
@@ -25,12 +26,27 @@ - (void)viewDidLoad{
     
     self.title = @"发现";
     
+    self.view.backgroundColor = [UIColor greenColor];
     
+    UIButton *btn = [[UIButton alloc]initWithFrame:self.view.bounds];
+    [btn setTitle:@"点我，快点我" forState:UIControlStateNormal];
+    [btn addTarget:self action:@selector(tapOnClick) forControlEvents:UIControlEventTouchUpInside];
+    [self.view addSubview:btn];
     
     
     
     
 }
 
+- (void)tapOnClick{
+    
+    GoodsShareViewController *v= [[GoodsShareViewController alloc]init];
+
+    
+    [self.navigationController pushViewController:v animated:YES];
+    
+    
+    
+}
 
 @end
diff --git a/YNNavigationController/Demo/Home(首页)/ProductList(商品列表)/ProductDetail(商品详情)/AddressDetail(详细地址)/ProductAddressDetailViewController.m b/YNNavigationController/Demo/Home(首页)/ProductList(商品列表)/ProductDetail(商品详情)/AddressDetail(详细地址)/ProductAddressDetailViewController.m
@@ -62,9 +62,9 @@ - (void)tapOnClick{
 }
 
 - (void)tapOnClick2{
-    
-    [(YNNavigationController *)self.navigationController yn_popToRootViewControllerWithCompletionBlock:nil];
-//    [self.navigationController popToRootViewControllerAnimated:YES];
+//    
+//    [(YNNavigationController *)self.navigationController yn_popToRootViewControllerWithCompletionBlock:nil];
+    [self.navigationController popToRootViewControllerAnimated:YES];
 }
 
 - (void)popToPre{
diff --git a/YNNavigationController/Demo/Home(首页)/ProductList(商品列表)/ProductListViewController.m b/YNNavigationController/Demo/Home(首页)/ProductList(商品列表)/ProductListViewController.m
@@ -8,7 +8,8 @@
 
 #import "ProductListViewController.h"
 #import "ProductDetailViewController.h"
-#import "YNNavigationController.h"
+#import "DiscoverViewController.h"
+#import "TestNavigationController.h"
 
 @implementation ProductListViewController
 - (void)viewDidLoad{
@@ -30,6 +31,15 @@ - (void)tapOnClick{
 
     [self.navigationController pushViewController:[[ProductDetailViewController alloc]init] animated:YES];
     
+    
+//    DiscoverViewController * v = [[DiscoverViewController alloc]init];
+//    
+//    TestNavigationController *NA = [[TestNavigationController alloc]initWithRootViewController:v];
+//    
+//    [self presentViewController:NA animated:YES completion:nil];
+    
+    
+    
 }
 
 
diff --git a/YNNavigationController/Demo/TestNavigationController.m b/YNNavigationController/Demo/TestNavigationController.m
@@ -25,13 +25,11 @@ - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)ani
 
     viewController.hidesBottomBarWhenPushed = YES;
     
-    [super pushViewController:viewController animated:animated];
-    
     if (self.childViewControllers.count) {
         UIBarButtonItem *left = [self.class barButtonItemWithImage:[UIImage imageNamed:@"back-.png"] ImageH:[UIImage imageNamed:@"back-"] target:self action:@selector(popToPre) forControlEvents:UIControlEventTouchUpInside];
         viewController.navigationItem.leftBarButtonItem = left;
     }
-    
+      [super pushViewController:viewController animated:animated];
 }
 
 - (void)popToPre{
diff --git a/YNNavigationController/Libs/YNNavigationController/YNNavigationController.m b/YNNavigationController/Libs/YNNavigationController/YNNavigationController.m
@@ -46,7 +46,7 @@ - (void)viewDidLoad{
 
 - (void)panGesListener:(UIPanGestureRecognizer *)panGes{
     
-    if (self.viewControllers.count == 1) return;
+    if (self.viewControllers.count <= 1) return;
     UIViewController *lastViewController = [self.viewControllers lastObject];
     UIView *topView = self.view;
     
@@ -392,8 +392,15 @@ - (UIViewController *)popViewControllerAnimated:(BOOL)animated{
 
 - (NSArray<UIViewController *> *)popToRootViewControllerAnimated:(BOOL)animated{
 
-    [YN_SHOTVIEW.arrayScreenShots removeAllObjects];
-    YN_SHOTVIEW.imgView.image = nil;
+    
+    for (int i = 0; i < self.viewControllers.count - 1; i++) {
+        [YN_SHOTVIEW.arrayScreenShots removeLastObject];
+        UIImage *image = [YN_SHOTVIEW.arrayScreenShots lastObject];
+        
+        YN_SHOTVIEW.imgView.image = image;
+        
+    }
+    
     
     return [super popToRootViewControllerAnimated:animated];
     

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,9 @@ - (void)tapOnClick{`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`- (void)tapOnClick2{`
`65`		`-`
`66`		`- [(YNNavigationController *)self.navigationController yn_popToRootViewControllerWithCompletionBlock:nil];`
`67`		`-// [self.navigationController popToRootViewControllerAnimated:YES];`
	`65`	`+//`
	`66`	`+// [(YNNavigationController *)self.navigationController yn_popToRootViewControllerWithCompletionBlock:nil];`
	`67`	`+ [self.navigationController popToRootViewControllerAnimated:YES];`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`- (void)popToPre{`
Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,11 @@ - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)ani`
`25`	`25`
`26`	`26`	`viewController.hidesBottomBarWhenPushed = YES;`
`27`	`27`
`28`		`- [super pushViewController:viewController animated:animated];`
`29`		`-`
`30`	`28`	`if (self.childViewControllers.count) {`
`31`	`29`	`UIBarButtonItem *left = [self.class barButtonItemWithImage:[UIImage imageNamed:@"back-.png"] ImageH:[UIImage imageNamed:@"back-"] target:self action:@selector(popToPre) forControlEvents:UIControlEventTouchUpInside];`
`32`	`30`	`viewController.navigationItem.leftBarButtonItem = left;`
`33`	`31`	`}`
`34`		`-`
	`32`	`+ [super pushViewController:viewController animated:animated];`
`35`	`33`	`}`
`36`	`34`
`37`	`35`	`- (void)popToPre{`