Skip to content

Commit 03f99bf

Browse files
guangyaoguangyao
authored andcommitted
显示抢红包记录
1 parent 2ccd37b commit 03f99bf

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

ios/RNNeteaseIm/RNNeteaseIm/ContactViewController.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ -(void)getFriendList:(Success )success error:(Error )error{
8686
[groupedMembers addObject:dic];
8787
[tmp setObject:groupedMembers forKey:groupTitle];
8888
}
89-
if (tmp) {
89+
if (tmp.count) {
9090
success(tmp);
9191
}else{
9292
error(@"网络错误");
@@ -285,7 +285,9 @@ - (void)setMembers:(NSArray *)members
285285
}
286286

287287
NIMModel *model = [NIMModel initShareMD];
288-
model.contactList = tmp;
288+
if (tmp.count) {
289+
model.contactList = tmp;
290+
}
289291
}
290292

291293
//通讯录删除好友

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,9 @@ - (NSDictionary *)dealWithData:(NSDictionary *)dict{
860860
NSString *strOpenName = [self getUserName:strOpenId];
861861
strContent = [NSString stringWithFormat:@"%@领取了你的红包%@",strOpenName,lastString];
862862
}else{//别人发的别人领的
863-
return nil;
863+
NSString *strSenderName = [self getUserName:strSendId];
864+
NSString *strOpenName = [self getUserName:strOpenId];
865+
strContent = [NSString stringWithFormat:@"%@领取了%@的红包",strOpenName,strSenderName];
864866
}
865867
NSDictionary *dataDict = @{@"tipMsg":strContent,@"serialNo":strNo};
866868
return dataDict;

ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,10 @@ - (NSString *)dealWithData:(NSDictionary *)dict{
369369
}else if([strSendId isEqualToString:strMyId]){
370370
NSString *strOpenName = [self getUserName:strOpenId];
371371
strContent = [NSString stringWithFormat:@"%@领取了你的红包",strOpenName];
372+
}else{
373+
NSString *strSenderName = [self getUserName:strSendId];
374+
NSString *strOpenName = [self getUserName:strOpenId];
375+
strContent = [NSString stringWithFormat:@"%@领取了%@的红包",strOpenName,strSenderName];
372376
}
373377
return strContent;
374378
}

0 commit comments

Comments
 (0)