From 6d73e40075a485fdd17916f7af2255a3f36d24fd Mon Sep 17 00:00:00 2001 From: Pasco Date: Thu, 3 Sep 2015 01:47:33 +0800 Subject: [PATCH] fix bugs --- Default-568h@2x.png | Bin 0 -> 18594 bytes SCNavigation.xcodeproj/project.pbxproj | 8 ++++---- .../SCNavigation/SCNavigationController.m | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 Default-568h@2x.png diff --git a/Default-568h@2x.png b/Default-568h@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0891b7aabfcf3422423b109c8beed2bab838c607 GIT binary patch literal 18594 zcmeI4X;f257Jx&9fS`ixvS;&$x8J@slQFSel)6zJN=?13FB7H(lQjRkSy8x_-S~tvu2gzn1oS+dLcF#eqtq$ z%tf9TTvX?`)R@}3uBI;jzS-=ZR-Td&MHaS&;!0?Ni*#$#`n*~CcQK)Q9vAQ~TUpnI!j)a2biYK^R)M~A5wUDZhx?ULMX z3x1P&qt=trOY6P2U67L=m=U?F|5#Uj(eCueNTZaHs_ceWiHeET+j+tp3Jt9g(ekqP z2WOvfR{qV+9r+o4J5?qK>7;;^+I7tGv-i)es$X_D=EoKF+S?zsyj^oRFElP}c}JT< zd8SUs-?O?}2YD#ngKbnHgzHBcboxK_2r9l(?eNCl-pEzkJm}fY?WC*jnS?VBE4EpY zO$fEejz6fU;W2Kl>JeQBZBl-%Irg`obSlg*@4QB;Dd1H7^Oi5wvt4d{RZ!8Og?^aE z)k0$1g+V3fd(gdQ3d&q2q-FL*uy#}|bc^=VhFsl0jBgUGJ+-s3U8MK9A!YJJMxpci z5hJ%|{DwV48fZn0{n5l$N_KcSb#NKE4plB`9I6Zt=Z!~-zw0{9tg$L&Ju1F0X)Cy8 zKF;(&lJ>x)Jw(=;p~sF(Sd9VWGwFE2rnyS9!f^DZ8+aCLq zQ};>lcJ1GDLqjm6Hd>|Eabno@P`~Bn(~6^aD_#yoEH(a?Nm1S<;S+hSxI5d16^<1lEM3NPFi zkqPrpL)+ zgnseFikg`gJVBha1&7C4;O6>h=dt~`ND+;Zd?W(4v2JIb7Pt>Td42%M-Ju-XAH#Pns762L}K3 zDhvsRqN0Ni(1UrishD2YvV?4*h2iFj$+&N||Fn$4n|^NSU+o?~jq`0jVQt8T9l{7b zXiwwODFh2V!Q6sqP9S>WH$oOf$N~=d0-bqTlD61!=`&0eAP-F>XN?*|gtOXX{ zQVTWyYo4ZK0GAw!GHf|pz9`D;-bbb*5LBX*{bnz|+)$@&P9|ORM2o?95{;ejvo&r- zq8cBhTN6nn)7~W>54U)%-F_-b?YKdfk5I8MHcuzBD5)!;yv#Z&R&^y=@=>VTIMy#r zX&U<=BsPkdqcMe<_}2+>H%XKyrr5ZR8_KVe>ZqYN z^=^~TFD};;rHJ$U;{~w^hYojl4hRI@SH$^K{YEo=sg)WY87r!*7blQK&qnpDo0`Vn zkl)9u9g=mCh&ZCJS(L4yN3k0kQ zuvg$h2KEEk51T+O0JQ+r0`R>g{jvqM0Mr6d3qUOZwE!?PI7HY@CE|dr sfw?Q;rAv?G4&^^8-z_>&sWXMxvD*gPOU4CBe-*@OtE+wfmVJNyHv)PfH~;_u literal 0 HcmV?d00001 diff --git a/SCNavigation.xcodeproj/project.pbxproj b/SCNavigation.xcodeproj/project.pbxproj index 2168e39..4fa907d 100644 --- a/SCNavigation.xcodeproj/project.pbxproj +++ b/SCNavigation.xcodeproj/project.pbxproj @@ -31,6 +31,7 @@ 29670A2E199D9EEF00B4A59B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 29670A2C199D9EEF00B4A59B /* InfoPlist.strings */; }; 29670A30199D9EEF00B4A59B /* SCNavigationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 29670A2F199D9EEF00B4A59B /* SCNavigationTests.m */; }; 299114F31B0AD5F700E08BAE /* UIViewController+SCNavigation.m in Sources */ = {isa = PBXBuildFile; fileRef = 299114F21B0AD5F700E08BAE /* UIViewController+SCNavigation.m */; }; + A6C2F8CD1B976D330085BCA9 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A6C2F8CC1B976D330085BCA9 /* Default-568h@2x.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -84,6 +85,7 @@ 29670A2F199D9EEF00B4A59B /* SCNavigationTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SCNavigationTests.m; sourceTree = ""; }; 299114F11B0AD5F700E08BAE /* UIViewController+SCNavigation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIViewController+SCNavigation.h"; sourceTree = ""; }; 299114F21B0AD5F700E08BAE /* UIViewController+SCNavigation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIViewController+SCNavigation.m"; sourceTree = ""; }; + A6C2F8CC1B976D330085BCA9 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -165,6 +167,7 @@ 296709F8199D9EEE00B4A59B = { isa = PBXGroup; children = ( + A6C2F8CC1B976D330085BCA9 /* Default-568h@2x.png */, 29670A0A199D9EEE00B4A59B /* SCNavigation */, 29670A29199D9EEF00B4A59B /* SCNavigationTests */, 29670A03199D9EEE00B4A59B /* Frameworks */, @@ -316,6 +319,7 @@ 29670A1D199D9EEE00B4A59B /* Images.xcassets in Resources */, 2929701519A38945007B5A02 /* navi_mask@2x.png in Resources */, 2929701619A38945007B5A02 /* navi_shadow@2x.png in Resources */, + A6C2F8CD1B976D330085BCA9 /* Default-568h@2x.png in Resources */, 29670A0F199D9EEE00B4A59B /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -461,8 +465,6 @@ 29670A34199D9EEF00B4A59B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SCNavigation/SCNavigation-Prefix.pch"; INFOPLIST_FILE = "SCNavigation/SCNavigation-Info.plist"; @@ -475,8 +477,6 @@ 29670A35199D9EEF00B4A59B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "SCNavigation/SCNavigation-Prefix.pch"; INFOPLIST_FILE = "SCNavigation/SCNavigation-Info.plist"; diff --git a/SCNavigation/SCNavigation/SCNavigationController.m b/SCNavigation/SCNavigation/SCNavigationController.m index 0409ecf..76f0cfc 100644 --- a/SCNavigation/SCNavigation/SCNavigationController.m +++ b/SCNavigation/SCNavigation/SCNavigationController.m @@ -91,10 +91,10 @@ - (void)pushViewController:(UIViewController *)viewController animated:(BOOL)ani - (UIViewController *)popViewControllerAnimated:(BOOL)animated { - if (self.isTransiting) { - self.isTransiting = NO; - return nil; - } +// if (self.isTransiting) { +// self.isTransiting = NO; +// return nil; +// } return [super popViewControllerAnimated:animated];