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

Author: xhp

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

@@ -95,7 +95,8 @@ -(NSMutableArray *)setTimeArr:(NSArray *)messageArr{
         NSMutableDictionary *user = [NSMutableDictionary dictionary];
         NIMUser   *messageUser = [[NIMSDK sharedSDK].userManager userInfo:message.from];
         [user setObject:[NSString stringWithFormat:@"%@",messageUser.userInfo.avatarUrl] forKey:@"avatar"];
-        [user setObject:[NSString stringWithFormat:@"%@", message.senderName] forKey:@"fromNick"];
+//        [user setObject:[NSString stringWithFormat:@"%@", message.senderName] forKey:@"fromNick"];
+        [user setObject:[NSString stringWithFormat:@"%@",messageUser.userInfo.nickName] forKey:@"name"];
         [user setObject:[NSString stringWithFormat:@"%@", message.from] forKey:@"_id"];
         NSArray *key = [user allKeys];
         for (NSString *tem  in key) {
@@ -657,7 +658,8 @@ -(void)refrashMessage:(NIMMessage *)message From:(NSString *)from{
     NIMUser   *user = [[NIMSDK sharedSDK].userManager userInfo:message.from];
     NSMutableDictionary *dources = [NSMutableDictionary dictionary];
     [dources setObject:[NSString stringWithFormat:@"%@",user.userInfo.avatarUrl] forKey:@"avatar"];
-    [dources setObject:[NSString stringWithFormat:@"%@", message.senderName] forKey:@"fromNick"];
+//    [dources setObject:[NSString stringWithFormat:@"%@", message.senderName] forKey:@"fromNick"];
+    [dources setObject:[NSString stringWithFormat:@"%@",user.userInfo.nickName] forKey:@"name"];
     [dources setObject:[NSString stringWithFormat:@"%@", message.from] forKey:@"_id"];
     NSArray *key = [dources allKeys];
     for (NSString *tem  in key) {
@@ -870,9 +872,7 @@ - (NSDictionary *)dealWithData:(NSDictionary *)dict{
         NSString *strOpenName = [self getUserName:strOpenId];
         strContent = [NSString stringWithFormat:@"%@领取了你的红包%@",strOpenName,lastString];
     }else{//别人发的别人领的
-        NSString *strSenderName = [self getUserName:strSendId];
-        NSString *strOpenName = [self getUserName:strOpenId];
-        strContent = [NSString stringWithFormat:@"%@领取了%@的红包",strOpenName,strSenderName];
+        return nil;
     }
     NSDictionary *dataDict = @{@"tipMsg":strContent,@"serialNo":strNo};
     return dataDict;

ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m

@@ -369,11 +369,12 @@ - (NSString *)dealWithData:(NSDictionary *)dict{
     }else if([strSendId isEqualToString:strMyId]){
         NSString *strOpenName = [self getUserName:strOpenId];
         strContent = [NSString stringWithFormat:@"%@领取了你的红包",strOpenName];
-    }else{
-        NSString *strSenderName = [self getUserName:strSendId];
-        NSString *strOpenName = [self getUserName:strOpenId];
-        strContent = [NSString stringWithFormat:@"%@领取了%@的红包",strOpenName,strSenderName];
     }
+//    else{
+//        NSString *strSenderName = [self getUserName:strSendId];
+//        NSString *strOpenName = [self getUserName:strOpenId];
+//        strContent = [NSString stringWithFormat:@"%@领取了%@的红包",strOpenName,strSenderName];
+//    }
     return strContent;
 }