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

Author: xhp

ios/RNNeteaseIm/RNNeteaseIm/ContactViewController.m

@@ -86,7 +86,7 @@ -(void)getFriendList:(Success )success error:(Error )error{
         [groupedMembers addObject:dic];
         [tmp setObject:groupedMembers forKey:groupTitle];
     }
-    if (tmp) {
+    if (tmp.count) {
         success(tmp);
     }else{
         error(@"网络错误");
@@ -285,7 +285,9 @@ - (void)setMembers:(NSArray *)members
     }
 
     NIMModel *model = [NIMModel initShareMD];
-    model.contactList = tmp;
+    if (tmp.count) {
+        model.contactList = tmp;
+    }
 }
 
 //通讯录删除好友

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

@@ -860,7 +860,9 @@ - (NSDictionary *)dealWithData:(NSDictionary *)dict{
         NSString *strOpenName = [self getUserName:strOpenId];
         strContent = [NSString stringWithFormat:@"%@领取了你的红包%@",strOpenName,lastString];
     }else{//别人发的别人领的
-        return nil;
+        NSString *strSenderName = [self getUserName:strSendId];
+        NSString *strOpenName = [self getUserName:strOpenId];
+        strContent = [NSString stringWithFormat:@"%@领取了%@的红包",strOpenName,strSenderName];
     }
     NSDictionary *dataDict = @{@"tipMsg":strContent,@"serialNo":strNo};
     return dataDict;

ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m

@@ -369,6 +369,10 @@ - (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];
     }
     return strContent;
 }