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

Author: xhp

ios/RNNeteaseIm/RNNeteaseIm/ContactViewController.m

@@ -320,7 +320,7 @@ -(void)adduserId:(NSString *)userId andVerifyType:(NSString *)strType andMag:(NS
     NSString *myID = [NIMSDK sharedSDK].loginManager.currentAccount;
     NIMUser *user = [[NIMSDK sharedSDK].userManager userInfo:myID];
     NSString *apnsContent = [NSString stringWithFormat:@"%@ %@",user.userInfo.nickName,apnsText];
-    NSDictionary *dataDict = @{@"type":@"1",@"data":@{@"content":msg}};
+    NSDictionary *dataDict = @{@"type":@"1",@"data":@{@"content":[NSString stringWithFormat:@"%@",msg]}};
         [[NIMSDK sharedSDK].userManager requestFriend:request completion:^(NSError *error) {
             if (!error) {
                 success(successText);

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

@@ -654,7 +654,6 @@ - (void)recordAudioDidCancelled {
 - (void)recordAudioProgress:(NSTimeInterval)currentTime{
     NIMModel *model = [NIMModel initShareMD];
     NSDictionary *Audic = @{@"currentTime":[NSString stringWithFormat:@"%f",currentTime],@"recordPower":[NSString stringWithFormat:@"%f",[[NIMSDK sharedSDK].mediaManager recordPeakPower]]};
-    NSLog(@"---------%@",Audic);
     model.audioDic = Audic;
 }
 

ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m

@@ -147,7 +147,7 @@ -(void)getRecentContactListsuccess:(SUCCESS)suc andError:(ERROR)err{
     NSMutableArray *sessionList = [NSMutableArray array];
     for (NIMRecentSession *recent in NIMlistArr) {
         NSMutableDictionary *dic = [NSMutableDictionary dictionary];
-        [dic setObject:recent.session.sessionId forKey:@"contactId"];
+        [dic setObject:[NSString stringWithFormat:@"%@",recent.session.sessionId] forKey:@"contactId"];
         [dic setObject:[NSString stringWithFormat:@"%ld", recent.session.sessionType] forKey:@"sessionType"];
         //未读
         [dic setObject:[NSString stringWithFormat:@"%ld", recent.unreadCount] forKey:@"unreadCount"];
@@ -192,7 +192,7 @@ -(void)getResouces{
 
         if (recent.session.sessionType == NIMSessionTypeP2P) {
             NSMutableDictionary *dic = [NSMutableDictionary dictionary];
-            [dic setObject:recent.session.sessionId forKey:@"contactId"];
+            [dic setObject:[NSString stringWithFormat:@"%@",recent.session.sessionId] forKey:@"contactId"];
             [dic setObject:[NSString stringWithFormat:@"%ld", recent.session.sessionType] forKey:@"sessionType"];
             //未读
             NSString *strUnreadCount = [NSString stringWithFormat:@"%ld", recent.unreadCount];
@@ -223,7 +223,7 @@ -(void)getResouces{
         else{
             if ( [[NIMSDK sharedSDK].teamManager isMyTeam:recent.lastMessage.session.sessionId]) {
                 NSMutableDictionary *dic = [NSMutableDictionary dictionary];
-                [dic setObject:recent.session.sessionId forKey:@"contactId"];
+                [dic setObject:[NSString stringWithFormat:@"%@",recent.session.sessionId] forKey:@"contactId"];
                 [dic setObject:[NSString stringWithFormat:@"%ld", recent.session.sessionType] forKey:@"sessionType"];
                 //未读
                 NSString *strUnreadCount = [NSString stringWithFormat:@"%ld", recent.unreadCount];
@@ -255,7 +255,6 @@ -(void)getResouces{
         }
     }
 
-//    [NIMModel initShareMD].recentListArr = sessionList;
     NSDictionary *recentDict = @{@"recents":sessionList,@"unreadCount":[NSString stringWithFormat:@"%zd",allUnreadNum]};
     [NIMModel initShareMD].recentDict = recentDict;
 }

ios/RNNeteaseIm/RNNeteaseIm/NoticeViewController.m

@@ -19,9 +19,6 @@ @interface NoticeViewController ()<NIMUserManagerDelegate,NIMSystemNotificationM
 
 @implementation NoticeViewController
 
-- (void)dealloc{
-    NSLog(@"NoticeViewController----dealloc");
-}
 
 +(instancetype)initWithNoticeViewController{
     static NoticeViewController *notVC = nil;
@@ -64,11 +61,8 @@ -(void)initWithDelegate{
                     [[NIMSDK sharedSDK].systemNotificationManager markNotificationsAsRead:notices];
                     [[[NIMSDK sharedSDK] systemNotificationManager] deleteNotification:notices];
                 }
-
             }
         }
-        
-        
     }
 
     [self ReFrash];
@@ -114,18 +108,17 @@ - (void)onReceiveSystemNotification:(NIMSystemNotification *)notification{
         if (attach.operationType == NIMUserOperationVerify) {//如果是通过添加好友请求，标为已读并删除
             [[NIMSDK sharedSDK].systemNotificationManager markNotificationsAsRead:notification];
             [[[NIMSDK sharedSDK] systemNotificationManager] deleteNotification:notification];
+            return;
         }
     }
 
-    
     if (_notifications.count) {
         for (NIMSystemNotification *notices in _notifications) {
 
             if ([notices.sourceID isEqualToString:notification.sourceID]) {
 
                 [[[NIMSDK sharedSDK] systemNotificationManager] deleteNotification:notices];
                 [_notifications removeObject:notices];
-                
             }
         }
     }

ios/RNNeteaseIm/RNNeteaseIm/TeamViewController.m

@@ -32,7 +32,7 @@ -(void)initWithDelegate{
     NSMutableArray *teamArr = [NSMutableArray array];
     for (NIMTeam *team in _myTeams) {
         NSMutableDictionary *dic = [NSMutableDictionary dictionary];
-        [dic setObject:team.teamId forKey:@"teamId"];
+        [dic setObject:[NSString stringWithFormat:@"%@",team.teamId] forKey:@"teamId"];
         [dic setObject:[NSString stringWithFormat:@"%@", team.teamName] forKey:@"name"];
         [dic setObject:[NSString stringWithFormat:@"%@", team.avatarUrl ] forKey:@"avatar"];
         [dic setObject:[NSString stringWithFormat:@"%ld", team.type] forKey:@"type"];