Skip to content

Commit 938d820

Browse files
guangyaoguangyao
authored andcommitted
Fix 兼容系统通知消息
1 parent 6b07b33 commit 938d820

File tree

1 file changed

+11
-28
lines changed

1 file changed

+11
-28
lines changed

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -291,23 +291,14 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
291291
case CustomMessgeTypeUrl: //链接
292292
case CustomMessgeTypeAccountNotice: //账户通知,与账户金额相关变动
293293
{
294-
NSMutableDictionary *notiUser = [NSMutableDictionary dictionary];
295-
[notiUser setObject:[NSString stringWithFormat:@"%@",messageUser.userInfo.avatarUrl] forKey:@"avatar"];
296-
[notiUser setObject:[NSString stringWithFormat:@"%@",messageUser.userInfo.nickName] forKey:@"name"];
297-
[notiUser setObject:[NSString stringWithFormat:@"%@", message.from] forKey:@"_id"];
298-
[dic setObject:notiUser forKey:@"user"];
299-
[dic setObject:[NSString stringWithFormat:@"%@", message.text] forKey:@"content"];
300-
[dic setObject:[NSString stringWithFormat:@"%d", message.isOutgoingMsg] forKey:@"direct"];
301-
[dic setObject:[NSString stringWithFormat:@"%f", message.timestamp] forKey:@"createdAt"];
302-
[dic setObject:[NSString stringWithFormat:@"%@", message.messageId] forKey:@"_id"];
303294
[dic setObject:[NSString stringWithFormat:@"%d",message.isRemoteRead] forKey:@"isRemoteRead"];
304-
[dic setObject:[NSString stringWithFormat:@"%ld", message.messageType] forKey:@"msgType"];
295+
// [dic setObject:[NSString stringWithFormat:@"%ld", message.messageType] forKey:@"msgType"];
305296
if (obj.custType == CustomMessgeTypeAccountNotice) {
306-
[dic setObject:obj.dataDict forKey:@"accountNoticeObj"];
307-
[dic setObject:@"account_notice" forKey:@"custType"];
297+
[dic setObject:obj.dataDict forKey:@"extend"];
298+
[dic setObject:@"account_notice" forKey:@"msgType"];
308299
}else{
309-
[dic setObject:obj.dataDict forKey:@"urlObj"];
310-
[dic setObject:@"url" forKey:@"custType"];
300+
[dic setObject:obj.dataDict forKey:@"extend"];
301+
[dic setObject:@"url" forKey:@"msgType"];
311302
}
312303
}
313304
break;
@@ -932,25 +923,17 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from isStart:(BOOL)
932923
case CustomMessgeTypeAccountNotice: //账户通知,与账户金额相关变动
933924
case CustomMessgeTypeUrl: //链接
934925
{
935-
NSMutableDictionary *notiUser = [NSMutableDictionary dictionary];
936-
[notiUser setObject:[NSString stringWithFormat:@"%@",user.userInfo.avatarUrl] forKey:@"avatar"];
937-
[notiUser setObject:[NSString stringWithFormat:@"%@",user.userInfo.nickName] forKey:@"name"];
938-
[notiUser setObject:[NSString stringWithFormat:@"%@", message.from] forKey:@"_id"];
939-
[dic2 setObject:notiUser forKey:@"user"];
940-
[dic2 setObject:[NSString stringWithFormat:@"%@", message.text] forKey:@"content"];
941-
[dic2 setObject:[NSString stringWithFormat:@"%d", message.isOutgoingMsg] forKey:@"direct"];
942-
[dic2 setObject:[NSString stringWithFormat:@"%f", message.timestamp] forKey:@"createdAt"];
943-
[dic2 setObject:[NSString stringWithFormat:@"%@", message.messageId] forKey:@"_id"];
944926
[dic2 setObject:[NSString stringWithFormat:@"%d",message.isRemoteRead] forKey:@"isRemoteRead"];
945-
[dic2 setObject:[NSString stringWithFormat:@"%ld", message.messageType] forKey:@"msgType"];
927+
// [dic2 setObject:[NSString stringWithFormat:@"%ld", message.messageType] forKey:@"msgType"];
946928
if (obj.custType == CustomMessgeTypeAccountNotice) {
947-
[dic2 setObject:obj.dataDict forKey:@"accountNoticeObj"];
948-
[dic2 setObject:@"account_notice" forKey:@"custType"];
929+
[dic2 setObject:obj.dataDict forKey:@"extend"];
930+
[dic2 setObject:@"account_notice" forKey:@"msgType"];
949931
}else{
950-
[dic2 setObject:obj.dataDict forKey:@"urlObj"];
951-
[dic2 setObject:@"url" forKey:@"custType"];
932+
[dic2 setObject:obj.dataDict forKey:@"extend"];
933+
[dic2 setObject:@"url" forKey:@"msgType"];
952934
}
953935
}
936+
954937
break;
955938
default:
956939
break;

0 commit comments

Comments
 (0)