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"> - - - - + + + + + + + + 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]; } }