Merge pull request #416 from zapcannon87/master

Release v2.3.10
leancloud · Jan 3, 2019 · cc714e9 · cc714e9
2 parents ac2f3a4 + 1ff5d5d
commit cc714e9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/ChatKit-OC/Podfile.lock b/ChatKit-OC/Podfile.lock
@@ -1,17 +1,17 @@
 PODS:
-  - AVOSCloud (11.4.8)
-  - AVOSCloudIM (11.4.8):
-    - AVOSCloud (= 11.4.8)
-    - AVOSCloudIM/_ARC (= 11.4.8)
-    - AVOSCloudIM/_NOARC (= 11.4.8)
-  - AVOSCloudIM/_ARC (11.4.8):
-    - AVOSCloud (= 11.4.8)
-    - AVOSCloudIM/_NOARC (= 11.4.8)
-  - AVOSCloudIM/_NOARC (11.4.8):
-    - AVOSCloud (= 11.4.8)
-  - ChatKit (2.3.9):
-    - AVOSCloud (~> 11.4.8)
-    - AVOSCloudIM (~> 11.4.8)
+  - AVOSCloud (11.4.9)
+  - AVOSCloudIM (11.4.9):
+    - AVOSCloud (= 11.4.9)
+    - AVOSCloudIM/_ARC (= 11.4.9)
+    - AVOSCloudIM/_NOARC (= 11.4.9)
+  - AVOSCloudIM/_ARC (11.4.9):
+    - AVOSCloud (= 11.4.9)
+    - AVOSCloudIM/_NOARC (= 11.4.9)
+  - AVOSCloudIM/_NOARC (11.4.9):
+    - AVOSCloud (= 11.4.9)
+  - ChatKit (2.3.10):
+    - AVOSCloud (~> 11.4.9)
+    - AVOSCloudIM (~> 11.4.9)
     - CYLDeallocBlockExecutor (~> 1.1.2)
     - DACircularProgress (~> 2.3.1)
     - FDStackView (~> 1.0)
@@ -89,9 +89,9 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  AVOSCloud: 65216b8622f1ed0e744c0fc29d97662bffcbc02f
-  AVOSCloudIM: 2bd392617d659ce6ba7fa57cfc16dcbe3d529f14
-  ChatKit: c24149911d7487295e11eb7ebd3f470f5b0755e9
+  AVOSCloud: 1ad969db6e24c41ae1788d68698255d853883069
+  AVOSCloudIM: 712144be9ee5428c0bf895cf65954a0791b8364b
+  ChatKit: 408a313d5866cc5c69e059b1539cdaa0eccaa5f7
   CYLDeallocBlockExecutor: ecf39e45dcead9e120f460df5668b8f5093d178e
   CYLTabBarController: 8d99fccf22866fe18c978c5ff863dc6051da45ff
   DACircularProgress: 4dd437c0fc3da5161cb289e07ac449493d41db71

diff --git a/ChatKit.podspec b/ChatKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "ChatKit"
-  s.version      = "2.3.9"
+  s.version      = "2.3.10"
   s.summary      = "An IM App Framework, support sending text, pictures, audio, video, location messaging, managing address book, more interesting features."
   s.homepage     = "https://github.com/LeanCloud/ChatKit-OC"
   s.license      = { :type => 'MIT', :file => 'LICENSE' }
@@ -13,8 +13,8 @@ Pod::Spec.new do |s|
   s.resources    = 'ChatKit/Class/Resources/*', 'ChatKit/**/*.xib'
 
   s.requires_arc = true
-  s.dependency "AVOSCloud" , "~> 11.4.8"
-  s.dependency "AVOSCloudIM", "~> 11.4.8"
+  s.dependency "AVOSCloud" , "~> 11.4.9"
+  s.dependency "AVOSCloudIM", "~> 11.4.9"
   s.dependency "MJRefresh" , "~> 3.1.9"
   s.dependency "Masonry" , "~> 1.0.1"
   s.dependency "SDWebImage" , "~> 3.8.0"

diff --git a/ChatKit/Class/Module/Conversation/Model/LCCKConversationViewModel.m b/ChatKit/Class/Module/Conversation/Model/LCCKConversationViewModel.m
@@ -712,7 +712,6 @@ - (void)preloadMessageToTableView:(id)aMessage callback:(LCCKVoidBlock)callback
     NSUInteger newLastMessageCout = self.dataArray.count;
     NSIndexPath *indexPath = [NSIndexPath indexPathForRow:self.dataArray.count - 1 inSection:0];
     [self.delegate messageSendStateChanged:LCCKMessageSendStateSending withProgress:0.0f forIndex:indexPath.row];
-    LCCKLock();
     NSMutableArray *indexPaths = [NSMutableArray arrayWithObject:indexPath];
     NSUInteger additionItemsCount = newLastMessageCout - oldLastMessageCount;
     if (additionItemsCount > 1) {
@@ -721,12 +720,17 @@ - (void)preloadMessageToTableView:(id)aMessage callback:(LCCKVoidBlock)callback
             [indexPaths addObject:indexPath];
         }
     }
-    dispatch_async(dispatch_get_main_queue(),^{
+    if (NSThread.isMainThread) {
         [self.parentConversationViewController.tableView insertRowsAtIndexPaths:[indexPaths copy] withRowAnimation:UITableViewRowAnimationNone];
-        LCCKUnlock();
         [self.parentConversationViewController scrollToBottomAnimated:YES];
         !callback ?: callback();
-    });
+    } else {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self.parentConversationViewController.tableView insertRowsAtIndexPaths:[indexPaths copy] withRowAnimation:UITableViewRowAnimationNone];
+            [self.parentConversationViewController scrollToBottomAnimated:YES];
+            !callback ?: callback();
+        });
+    }
 }
 
 #pragma mark - Getters