fix: message addMessageStoreBeforeIntercept invalid

WuKongIM · Oct 28, 2024 · bb22a76 · bb22a76
1 parent 2de4097
commit bb22a76
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/WuKongIMSDK/Classes/manager/WKChannelManager.h b/WuKongIMSDK/Classes/manager/WKChannelManager.h
@@ -54,7 +54,7 @@ typedef void  (^WKChannelInfoBlock)(WKChannelInfo*);
 -(void) fetchChannelInfo:(WKChannel*) channel;
 
 /**
-  添加频道请求（此方法时候大量cell获取频道数据）
+  添加频道请求（此方法适合大量cell获取频道数据）
  */
 -(void) addChannelRequest:(WKChannel*)channel complete:(void(^_Nullable)(NSError *error,bool notifyBefore))complete;
 

diff --git a/WuKongIMSDK/Classes/manager/WKChatManager.h b/WuKongIMSDK/Classes/manager/WKChatManager.h
@@ -99,7 +99,7 @@ typedef BOOL(^MessageStoreBeforeIntercept)(WKMessage*message);
 
 
 /// 保存消息
--(void) saveMessages:(NSArray<WKMessage*>*)messages;
+- (NSArray<WKMessage*>*) saveMessages:(NSArray<WKMessage*>*)messages;
 
 
 // 添加或更新消息（如果存在则更新，不存在添加）

diff --git a/WuKongIMSDK/Classes/manager/WKChatManager.m b/WuKongIMSDK/Classes/manager/WKChatManager.m
@@ -199,17 +199,19 @@ -(BOOL) needStoreOfIntercept:(WKMessage*)message {
     return store;
 }
 
--(void) saveMessages:(NSArray<WKMessage*>*)messages {
+-(NSArray<WKMessage*>*) saveMessages:(NSArray<WKMessage*>*)messages {
     if(!messages || messages.count<=0) {
-        return;
+        return nil;
     }
     for (WKMessage *message in messages) {
         message.isDeleted = ![self needStoreOfIntercept:message];
     }
     // 保存消息
-    [[WKMessageDB shared] saveMessages:messages];
+    NSArray<WKMessage*> *newMessages = [[WKMessageDB shared] saveMessages:messages];
     // 更新最近会话
-    [self addOrUpdateConversationWithMessages:messages];
+    [self addOrUpdateConversationWithMessages:newMessages];
+
+    return newMessages;
 }
 
 -(void) addOrUpdateMessages:(NSArray<WKMessage*>*)messages  {
@@ -547,15 +549,13 @@ -(void) handleRecv:(NSArray<WKRecvPacket*>*) packets {
 -(void) handleMessages:(NSArray<WKMessage*>*) messages {
 
     // 存储消息
-    NSArray<WKMessage*> *storeMessages = [[WKMessageDB shared] saveMessages:[self filterNeedStoreMessages:messages]];
+    [self saveMessages:[self filterNeedStoreMessages:messages]];
+
     // 流消息
     NSArray<WKMessage*> *streamMessages =  [self filterStreamMessagesWithStreamFlagIng:messages];
-
     NSArray<WKStream*> *streams;
     if(streamMessages && streamMessages.count>0) {
-
         streams = [self getStreams:streamMessages];
-
         // 保存流式消息
         NSMutableArray<WKStream*> *needStoreStreams = [NSMutableArray array]; // 需要存储的流
         for (WKMessage *m in streamMessages) {
@@ -566,6 +566,7 @@ -(void) handleMessages:(NSArray<WKMessage*>*) messages {
         [WKMessageDB.shared saveOrUpdateStreams:needStoreStreams];
     }
 
+    // cmd消息
     NSArray<WKCMDModel*> *cmds = [self getCMDModels:messages]; // 获取命令消息
     if(cmds && cmds.count>0) {
        NSArray<WKCMDMessage*> *cmdMessages = [self getCMDMessages:messages];
@@ -576,11 +577,6 @@ -(void) handleMessages:(NSArray<WKMessage*>*) messages {
 
     NSArray<WKMessage*> *commonMessages  = [self filterNoCMDAndNoStreamMessages:messages]; // 非cmd消息和流消息
 
-    if(storeMessages && storeMessages.count>0) {
-        // 更新最近会话(只有需要存储的消息才更新最近会话)
-        [self addOrUpdateConversationWithMessages:storeMessages];
-    }
-
     // 调用委托通知上层 不管存不存的消息都需要通知到delegate
     [self callRecvMessagesDelegate:commonMessages];
 

diff --git a/WuKongIMSDK/Classes/manager/WKConnectionManager.m b/WuKongIMSDK/Classes/manager/WKConnectionManager.m
@@ -631,6 +631,7 @@ -(void) handlePacketData:(NSArray<NSData*>*)dataList {
     }
     self.lastMsgTimeInterval = [[NSDate date] timeIntervalSince1970];
     NSMutableArray<WKPacket*> *packets = [NSMutableArray array];
+    NSLog(@"包数量--->%lu",dataList.count);
     for (NSData *data in dataList) {
        WKPacket *packet =  [[WKSDK shared].coder decode:data];
         if(!packet) {