推送的bug

wanghengheng · wanghengheng · commit ae9a23f2fa5f · 2015-01-16T14:53:30.000+08:00
diff --git a/Coding_iOS/AppDelegate.m b/Coding_iOS/AppDelegate.m
@@ -83,8 +83,7 @@ - (void)completionStartAnimationWithOptions:(NSDictionary *)launchOptions{
     if ([Login isLogin]) {
         NSDictionary *remoteNotification = [launchOptions valueForKey:UIApplicationLaunchOptionsRemoteNotificationKey];
         if (remoteNotification) {
-            NSDictionary *apsInfo = [remoteNotification objectForKey:@"aps"];
-            [BaseViewController handleNotificationInfo:apsInfo];
+            [BaseViewController handleNotificationInfo:remoteNotification];
         }
     }
     
@@ -164,7 +163,7 @@ - (void)application:(UIApplication *)application didReceiveRemoteNotification:(N
         //If the application state was inactive, this means the user pressed an action button
         // from a notification.
         [XGPush handleReceiveNotification:userInfo];
-
+        
         [BaseViewController handleNotificationInfo:userInfo];
     }else if ([application applicationState] == UIApplicationStateActive){
 //        kTipAlert(@"UIApplicationStateActive");
diff --git a/Coding_iOS/Coding_iOS-Info.plist b/Coding_iOS/Coding_iOS-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.1.2015011517</string>
+	<string>2.0.1.2015011612</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIFileSharingEnabled</key>
diff --git a/Coding_iOS/Controllers/RootControllers/BaseViewController.m b/Coding_iOS/Controllers/RootControllers/BaseViewController.m
@@ -132,6 +132,9 @@ + (UIViewController *)analyseVCFromLinkStr:(NSString *)linkStr{
     }
 }
 + (void)presentLinkStr:(NSString *)linkStr{
+    if (!linkStr || linkStr.length == 0) {
+        return;
+    }
     UIViewController *vc = [self analyseVCFromLinkStr:linkStr];
     if (vc) {
         [self presentViewController:vc];
diff --git a/Coding_iOS/Controllers/WebViewController.m b/Coding_iOS/Controllers/WebViewController.m
@@ -68,6 +68,12 @@ + (instancetype)webVCWithUrlStr:(NSString *)curUrlStr{
 
 #pragma M UI
 - (void)configLeftBarButtonItems{
+    //推送过来的
+    if (self.navigationItem.leftBarButtonItems.count == 1 && [self.navigationItem.leftBarButtonItem.title isEqualToString:@"关闭"]) {
+        return;
+    }
+    
+    //正常push进来的
     NSInteger preCount = self.navigationItem.leftBarButtonItems.count;
     NSInteger curCount = self.myWebView.canGoBack? 3 : 2;
     if (preCount != curCount) {

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,9 @@ + (UIViewController )analyseVCFromLinkStr:(NSString )linkStr{`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`+ (void)presentLinkStr:(NSString *)linkStr{`
	`135`	`+ if (!linkStr \|\| linkStr.length == 0) {`
	`136`	`+ return;`
	`137`	`+ }`
`135`	`138`	`UIViewController *vc = [self analyseVCFromLinkStr:linkStr];`
`136`	`139`	`if (vc) {`
`137`	`140`	`[self presentViewController:vc];`