From 05c357884f1f8376232fffa1f8b6e70ab55e2c69 Mon Sep 17 00:00:00 2001
From: wu736139669 <wu736139669@736139669@qq.com>
Date: Sun, 28 Jun 2015 22:53:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xcdebugger/Breakpoints_v2.xcbkptlist      | 48 ++++++++++++-------
 Ash_AWord/AppDelegate.m                       |  6 ---
 .../Chat/ChatMainViewController.m             |  4 +-
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 32f01b4..7fb4084 100644
--- a/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Ash_AWord.xcworkspace/xcuserdata/xmfish.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -467,22 +467,6 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Ash_AWord/AppDelegate.m"
-            timestampString = "457177104.347518"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "146"
-            endingLineNumber = "146"
-            landmarkName = "-application:didReceiveRemoteNotification:fetchCompletionHandler:"
-            landmarkType = "5">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -531,5 +515,37 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m"
+            timestampString = "457195872.725068"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "1012"
+            endingLineNumber = "1012"
+            landmarkName = "-routerEventWithName:userInfo:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Ash_AWord/ViewControllers/Chat/ChatMainViewController.m"
+            timestampString = "457195903.27565"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "982"
+            endingLineNumber = "982"
+            landmarkName = "-routerEventWithName:userInfo:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/Ash_AWord/AppDelegate.m b/Ash_AWord/AppDelegate.m
index 0482b97..1b2a110 100644
--- a/Ash_AWord/AppDelegate.m
+++ b/Ash_AWord/AppDelegate.m
@@ -126,9 +126,6 @@
 // 打印收到的apns信息
 -(void)didReceiveRemoteNotification:(NSDictionary *)userInfo
 {
-    NSError *parseError = nil;
-    NSData  *jsonData = [NSJSONSerialization dataWithJSONObject:userInfo
-                                                        options:NSJSONWritingPrettyPrinted error:&parseError];
     
     NSString* info = [[userInfo objectForKey:@"aps"] objectForKey:@"alert"];
     _otherUserId = [userInfo objectForKey:@"f"];
@@ -142,9 +139,6 @@
 }
 - (void)application:(UIApplication*)application didReceiveRemoteNotification:(NSDictionary*)userInfo fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler
 {
-    NSError *parseError = nil;
-    NSData  *jsonData = [NSJSONSerialization dataWithJSONObject:userInfo
-                                                        options:NSJSONWritingPrettyPrinted error:&parseError];
     
     NSString* info = [[userInfo objectForKey:@"aps"] objectForKey:@"alert"];
     _otherUserId = [userInfo objectForKey:@"f"];
diff --git a/Ash_AWord/ViewControllers/Chat/ChatMainViewController.m b/Ash_AWord/ViewControllers/Chat/ChatMainViewController.m
index 1936a56..c68a958 100644
--- a/Ash_AWord/ViewControllers/Chat/ChatMainViewController.m
+++ b/Ash_AWord/ViewControllers/Chat/ChatMainViewController.m
@@ -154,7 +154,7 @@
             if (!error)
             {
                 //由于加入黑名单成功后会刷新黑名单，所以此处不需要再更改好友列表
-                [MBProgressHUD errorHudWithView:self.view label:@"成功加入，可以在设置->黑名单中删除。" hidesAfter:2.0];
+                [MBProgressHUD errorHudWithView:self.view label:@"成功加入，可以在设置->黑名单中删除。" hidesAfter:3.0];
             }
             else
             {
@@ -1014,7 +1014,7 @@
         }
         PersonalInfoViewController* personalInfoViewController = [[PersonalInfoViewController alloc] init];
         personalInfoViewController.hidesBottomBarWhenPushed = YES;
-        personalInfoViewController.otherUserId = _otherUserId;
+        personalInfoViewController.otherUserId = model.username;
         [[AppDelegate visibleViewController].navigationController pushViewController:personalInfoViewController animated:YES];
     }
 }