Fix 黑名单和清空历史记录的问题

Author: guangyao

ios/RNNeteaseIm/RNNeteaseIm/BankListViewController.m

@@ -32,7 +32,8 @@ -(void)initWithDelegate{
 }
 -(void)getBlackList{
     NSMutableArray *list = [[NSMutableArray alloc] init];
-    for (NIMUser *user in [NIMSDK sharedSDK].userManager.myBlackList) {
+    NSArray *blackList = [NIMSDK sharedSDK].userManager.myBlackList;
+    for (NIMUser *user in blackList) {
         NIMKitInfo *info = [[NIMKit sharedKit] infoByUser:user.userId option:nil];
         NSMutableDictionary *dic = [NSMutableDictionary dictionary];
         [dic setObject:[NSString stringWithFormat:@"%@", info.showName] forKey:@"name"];

ios/RNNeteaseIm/RNNeteaseIm/ContactViewController.m

@@ -96,11 +96,21 @@ -(void)getFriendList:(Success )success error:(Error )error{
 -(void)getAllContactFriends{
 
     NSMutableArray *contacts = [NSMutableArray array];
+    NSArray *blackList = [NIMSDK sharedSDK].userManager.myBlackList;
     for (NIMUser *user in [NIMSDK sharedSDK].userManager.myFriends) {
-        NIMKitInfo *info           = [[NIMKit sharedKit] infoByUser:user.userId option:nil];
-        _contacts = [[NTESContactDataMember alloc] init];
-        _contacts.info               = info;
-        [contacts addObject:_contacts];
+        BOOL isBlack = NO;
+        for (NIMUser *blackUser in blackList) {
+            if ([user.userId isEqualToString:blackUser.userId]) {
+                isBlack = YES;
+                break;
+            }
+        }
+        if (!isBlack) {
+            NIMKitInfo *info           = [[NIMKit sharedKit] infoByUser:user.userId option:nil];
+            _contacts = [[NTESContactDataMember alloc] init];
+            _contacts.info               = info;
+            [contacts addObject:_contacts];
+        }
     }
     [self setMembers:contacts];
 }

ios/RNNeteaseIm/RNNeteaseIm/ConversationViewController.m

@@ -1070,7 +1070,9 @@ -(void)deleteMsg:(NSString *)messageId{
 //清空聊天记录
 -(void)clearMsg:(NSString *)contactId type:(NSString *)type{
     NIMSession  *session = [NIMSession session:contactId type:[type integerValue]];
-    [[NIMSDK sharedSDK].conversationManager deleteAllmessagesInSession:session option:NO];
+    NIMDeleteMessagesOption *option = [[NIMDeleteMessagesOption alloc]init];
+    option.removeSession = NO;
+    [[NIMSDK sharedSDK].conversationManager deleteAllmessagesInSession:session option:option];
 //    [[NIMSDK sharedSDK].conversationManager deleteAllmessagesInSession:session removeRecentSession:NO];
 }
 - (NIMMessage *)msgWithTip:(NSString *)tip

ios/RNNeteaseIm/RNNeteaseIm/NIMModel.m

@@ -50,6 +50,7 @@ -(void)setNIMKick:(NSString *)NIMKick{
         }
     }
 }
+//通信录列表
 -(void)setContactList:(NSMutableDictionary *)contactList{
     if (_contactList != contactList) {
         _contactList = contactList;
@@ -125,11 +126,8 @@ -(void)setSendState:(NSMutableArray *)sendState{
 }
 //黑名单列表
 -(void)setBankList:(NSMutableArray *)bankList{
-    if (bankList.count) {
         if (self.myBlock) {
         self.myBlock(13, bankList);
-        }
-
     }
 }
 

ios/RNNeteaseIm/RNNeteaseIm/NIMViewController.m

@@ -89,7 +89,11 @@ -(void)deleteCurrentSession:(NSString *)recentContactId andback:(ERROR)error{
     for (NIMRecentSession *recent in NIMlistArr) {
         if ([recent.session.sessionId isEqualToString:recentContactId]) {
             id<NIMConversationManager> manager = [[NIMSDK sharedSDK] conversationManager];
-            [manager deleteRecentSession:recent];
+            //            [manager deleteRecentSession:recent];
+            NIMDeleteMessagesOption *option = [[NIMDeleteMessagesOption alloc]init];
+            option.removeSession = YES;
+            [manager deleteAllmessagesInSession:recent.session option:option];
+            //清除历史记录
             [self getResouces];
         }
     }