From da17ac5456852fec4dee51b69659da82ef91fc67 Mon Sep 17 00:00:00 2001
From: tangtaoit <tangtaoit@githubim.com>
Date: Fri, 24 May 2024 17:37:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=AE=E9=A1=B6=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WuKongIMSDK/Classes/db/WKMessageDB.m             | 8 ++++++++
 WuKongIMSDK/Classes/db/WKMessageExtraDB.m        | 1 -
 WuKongIMSDK/Classes/manager/WKChatManager.h      | 5 +++++
 WuKongIMSDK/Classes/manager/WKChatManagerInner.h | 2 --
 WuKongIMSDK/Classes/manager/WKRetryManager.m     | 1 -
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/WuKongIMSDK/Classes/db/WKMessageDB.m b/WuKongIMSDK/Classes/db/WKMessageDB.m
index 08497db..e89e263 100644
--- a/WuKongIMSDK/Classes/db/WKMessageDB.m
+++ b/WuKongIMSDK/Classes/db/WKMessageDB.m
@@ -1082,6 +1082,13 @@ -(WKMessage*) toMessage:(NSDictionary*)dict db:(FMDatabase*)db{
     }
     
     message.isDeleted = [dict[@"is_deleted"] boolValue];
+    
+    
+    message.hasRemoteExtra = true; // 这个目前好像没啥用，一直是true就可以
+    message.remoteExtra.messageID = message.messageId;
+    message.remoteExtra.messageSeq = message.messageSeq;
+    message.remoteExtra.channelID = message.channel.channelId;
+    message.remoteExtra.channelType = message.channel.channelType;
     if(dict[@"readed"]) {
         message.remoteExtra.readed = [dict[@"readed"] integerValue]>0;
     }
@@ -1117,6 +1124,7 @@ -(WKMessage*) toMessage:(NSDictionary*)dict db:(FMDatabase*)db{
     if(dict[@"setting"]) {
         message.setting = [WKSetting fromUint8:[dict[@"setting"] integerValue]];
     }
+    
     if(dict[@"edited_at"]) {
         message.remoteExtra.editedAt = [dict[@"edited_at"] integerValue];
     }
diff --git a/WuKongIMSDK/Classes/db/WKMessageExtraDB.m b/WuKongIMSDK/Classes/db/WKMessageExtraDB.m
index 65146f3..182b999 100644
--- a/WuKongIMSDK/Classes/db/WKMessageExtraDB.m
+++ b/WuKongIMSDK/Classes/db/WKMessageExtraDB.m
@@ -55,7 +55,6 @@ -(void) addOrUpdateMessageExtras:(NSArray<WKMessageExtra*>*)messageExtras {
         return;
     }
     [[WKDB sharedDB].dbQueue inTransaction:^(FMDatabase * _Nonnull db, BOOL * _Nonnull rollback) {
-        NSMutableArray<NSNumber*> *needDeleteMessageIDs = [NSMutableArray array];
         for (WKMessageExtra *messageExtra in messageExtras) {
             NSString *extraStr = @"";
             if(messageExtra.extra) {
diff --git a/WuKongIMSDK/Classes/manager/WKChatManager.h b/WuKongIMSDK/Classes/manager/WKChatManager.h
index 5fa310a..2d10b1c 100644
--- a/WuKongIMSDK/Classes/manager/WKChatManager.h
+++ b/WuKongIMSDK/Classes/manager/WKChatManager.h
@@ -351,6 +351,9 @@ typedef BOOL(^MessageStoreBeforeIntercept)(WKMessage*message);
 // 消息编辑提供者
 @property(nonatomic,copy) WKMessageEditProvider messageEditProvider;
 
+// 调用消息更新委托
+- (void)callMessageUpdateDelegate:(WKMessage*)message left:(NSInteger)left total:(NSInteger)total;
+
 @end
 
 /**
@@ -413,6 +416,8 @@ typedef BOOL(^MessageStoreBeforeIntercept)(WKMessage*message);
 // 流消息
 -(void) onMessageStream:(WKStream*)stream;
 
+
+
 @end
 
 
diff --git a/WuKongIMSDK/Classes/manager/WKChatManagerInner.h b/WuKongIMSDK/Classes/manager/WKChatManagerInner.h
index b144011..a298b46 100644
--- a/WuKongIMSDK/Classes/manager/WKChatManagerInner.h
+++ b/WuKongIMSDK/Classes/manager/WKChatManagerInner.h
@@ -42,8 +42,6 @@
 // 调用消息状态改变委托
 //- (void)callMessageStatusChangeDelegate:(NSArray<WKMessageStatusModel*>*)statusModels;
 
-// 调用消息更新委托
-- (void)callMessageUpdateDelegate:(WKMessage*)message left:(NSInteger)left total:(NSInteger)total;
 
 
 
diff --git a/WuKongIMSDK/Classes/manager/WKRetryManager.m b/WuKongIMSDK/Classes/manager/WKRetryManager.m
index c8a216b..0186aa0 100644
--- a/WuKongIMSDK/Classes/manager/WKRetryManager.m
+++ b/WuKongIMSDK/Classes/manager/WKRetryManager.m
@@ -11,7 +11,6 @@
 #import "WKChatManager.h"
 #import "WKMessageExtraDB.h"
 #import "WKReminderDB.h"
-#import "WKChatManagerInner.h"
 @implementation WKRetryItem