Merge branch 'master' of github.com:reactnativecomponent/react-native-netease-im

xhp · xhp · commit 262ed47a6165 · 2017-07-19T16:10:29.000+08:00
diff --git a/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m b/ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m
@@ -361,9 +361,10 @@ -(void)sendMessage:(NSString *)mess andApnsMembers:(NSArray *)members{
         NIMMessageApnsMemberOption *apnsMemberOption = [[NIMMessageApnsMemberOption alloc]init];
         apnsMemberOption.userIds = members;
         apnsMemberOption.forcePush = YES;
+        apnsMemberOption.apnsContent = @"有人@了你";
         message.apnsMemberOption = apnsMemberOption;
-        message.apnsContent = @"有人@了你";
     }
+    message.apnsContent = mess;
     //发送消息
     [[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];
 }

Original file line number	Diff line number	Diff line change
`@@ -361,9 +361,10 @@ -(void)sendMessage:(NSString )mess andApnsMembers:(NSArray )members{`
`361`	`361`	`NIMMessageApnsMemberOption *apnsMemberOption = [[NIMMessageApnsMemberOption alloc]init];`
`362`	`362`	`apnsMemberOption.userIds = members;`
`363`	`363`	`apnsMemberOption.forcePush = YES;`
	`364`	`+ apnsMemberOption.apnsContent = @"有人@了你";`
`364`	`365`	`message.apnsMemberOption = apnsMemberOption;`
`365`		`- message.apnsContent = @"有人@了你";`
`366`	`366`	`}`
	`367`	`+ message.apnsContent = mess;`
`367`	`368`	`//发送消息`
`368`	`369`	`[[NIMSDK sharedSDK].chatManager sendMessage:message toSession:_session error:nil];`
`369`	`370`	`}`