fix: 修复多线程下没有触发消息队列的flush方法

WuKongIM · Mar 18, 2024 · 58f14ff · 58f14ff
1 parent c2f7278
commit 58f14ff
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 8 deletions.
diff --git a/Example/WuKongIMSDK/WKDatasource.m b/Example/WuKongIMSDK/WKDatasource.m
@@ -41,7 +41,6 @@ - (void)setup {
             WKSyncChannelMessageModel *model = [WKSyncChannelMessageModel new];
             model.startMessageSeq = (uint32_t)[dict[@"start_message_seq"] unsignedLongLongValue];
             model.endMessageSeq = (uint32_t)[dict[@"end_message_seq"] unsignedLongLongValue];
-            model.more = [dict[@"more"] boolValue];
             NSArray<NSDictionary*> *messageDicts = dict[@"messages"];
             if(messageDicts && messageDicts.count>0) {
                 NSMutableArray *messages = [NSMutableArray array];

diff --git a/Example/WuKongIMSDK/WKMessageTableView.m b/Example/WuKongIMSDK/WKMessageTableView.m
@@ -47,7 +47,8 @@ - (void)reload {
     }
     MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self animated:YES];
     __weak typeof(self) weakSelf = self;
-    [WKSDK.shared.chatManager pullLastMessages:self.channel limit:15 alwayRequest:true complete:^(NSArray<WKMessage *> * _Nonnull messages, NSError * _Nonnull error) {
+
+    [WKSDK.shared.chatManager pullLastMessages:self.channel limit:15  complete:^(NSArray<WKMessage *> * _Nonnull messages, NSError * _Nonnull error) {
         if(error) {
             NSLog(@"加载消息失败！->%@",error);
             hud.mode = MBProgressHUDModeText;

diff --git a/Example/WuKongIMSDK/WKViewController.m b/Example/WuKongIMSDK/WKViewController.m
@@ -76,7 +76,6 @@ -(void) initOptions {
     WKOptions *options = [[WKOptions alloc] init];
     options.host = self.ip;
     options.port = self.port;
-    options.heartbeatInterval = 10;
 
     // 设置连接信息
     WKConnectInfo *connectInfo = [WKConnectInfo new];

diff --git a/Example/WuKongIMSDK/WuKongIMSDK-Info.plist b/Example/WuKongIMSDK/WuKongIMSDK-Info.plist
@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>

diff --git a/WuKongIMSDK/Classes/manager/WKChatManager.m b/WuKongIMSDK/Classes/manager/WKChatManager.m
@@ -461,7 +461,6 @@ -(void) handleSendack:(NSArray<WKSendackPacket*> *)sendackArray {
     if(clientIDs.count>0) {
         NSArray<WKMessage*> *messages = [[WKMessageDB shared] getMessagesWithClientSeqs:clientIDs];
         if(messages && messages.count>0) {
-            NSLog(@"messages--aaaa------->%lu",messages.count);
             for (NSInteger i=0; i<messages.count; i++) {
                 WKMessage *message = messages[i];
                 [self callMessageUpdateDelegate:message left:messages.count-1-i total:messages.count];

diff --git a/WuKongIMSDK/Classes/manager/WKConnectionManager.m b/WuKongIMSDK/Classes/manager/WKConnectionManager.m
@@ -667,7 +667,6 @@ -(void) handlePacketData:(NSArray<NSData*>*)dataList {
 }
 
 -(void) handlePackets:(NSArray<WKPacket*>*)packets {
-    NSLog(@"handlePackets----------------start---->%lu",packets.count);
     NSDictionary<NSNumber*,NSArray<WKPacket*>*>* packetDict = [self packetGroup:packets];
     for (NSNumber *packetTypeNum in packetDict.allKeys) {
         NSArray<WKPacket*> *packetList = [packetDict objectForKey:packetTypeNum];
@@ -685,7 +684,6 @@ -(void) handlePackets:(NSArray<WKPacket*>*)packets {
                 break;
         }
     }
-    NSLog(@"handlePackets----------------end---->%lu",packets.count);
 }
 
 -( WKConnectStatus) connectStatus {

diff --git a/WuKongIMSDK/Classes/manager/WKMessageQueueManager.m b/WuKongIMSDK/Classes/manager/WKMessageQueueManager.m
@@ -74,12 +74,18 @@ -(void) start {
         self.timer = nil;
     }
     CGFloat delay = (double)WKSDK.shared.options.sendFrequency/1000.0f;
-    NSLog(@"delay--->%0.2f",delay);
-    self.timer = [NSTimer scheduledTimerWithTimeInterval:delay target:self selector:@selector(flushQueue) userInfo:nil repeats:YES];
+    NSLog(@"MessageQueue start delay: %0.2f",delay);
+
+    __weak typeof(self) weakSelf = self;
+    dispatch_async(dispatch_get_main_queue(), ^{
+        weakSelf.timer = [NSTimer scheduledTimerWithTimeInterval:delay target:weakSelf selector:@selector(flushQueue) userInfo:nil repeats:YES];
+    });
+
 
 }
 
 -(void) stop {
+    NSLog(@"MessageQueue stop");
     [self.sendPackets removeAllObjects];
     if(self.timer) {
         [self.timer invalidate];