support insertOldMessages:completion: to atomically insert old messages

lzwjava · lzwjava · commit 82a09f0d9047 · 2015-07-09T21:53:52.000+08:00
diff --git a/Example/MessageDisplayKitLeanchatExample/MessageDisplayKitLeanchatExample/Sections/Pages/IM/LeanChatMessageTableViewController.m b/Example/MessageDisplayKitLeanchatExample/MessageDisplayKitLeanchatExample/Sections/Pages/IM/LeanChatMessageTableViewController.m
@@ -362,7 +362,7 @@ - (void)loadMoreMessagesScrollTotop {
             self.loadingMoreMessage = YES;
             XHMessage* message=self.messages[0];
             WEAKSELF
-            [self.conversation queryMessagesBeforeId:nil timestamp:[message.timestamp timeIntervalSince1970]*1000 limit:20 callback:^(NSArray *typedMessages, NSError *error) {
+            [self.conversation queryMessagesBeforeId:nil timestamp:[message.timestamp timeIntervalSince1970]*1000 limit:kOnePageSize callback:^(NSArray *typedMessages, NSError *error) {
                 dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
                     NSMutableArray* messages=[NSMutableArray array];
                     for(AVIMTypedMessage* typedMessage in typedMessages){
@@ -374,8 +374,9 @@ - (void)loadMoreMessagesScrollTotop {
                         }
                     }
                     dispatch_async(dispatch_get_main_queue(), ^{
-                        [weakSelf insertOldMessages:messages];
-                        weakSelf.loadingMoreMessage=NO;
+                        [weakSelf insertOldMessages:messages completion:^{
+                            weakSelf.loadingMoreMessage=NO;
+                        }];
                     });
                 });
             }];
diff --git a/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.h b/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.h
@@ -257,6 +257,14 @@
  */
 - (void)insertOldMessages:(NSArray *)oldMessages;
 
+/**
+ *  同上，增加了 completion 来通知消息插入完毕
+ *
+ *  @param oldMessages 目标的旧消息数据
+ *  @param completion  insert 完成回调
+ */
+- (void)insertOldMessages:(NSArray *)oldMessages completion:(void (^)())completion ;
+
 #pragma mark - Messages view controller
 /**
  *  完成发送消息的函数
diff --git a/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m b/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m
@@ -261,7 +261,7 @@ - (void)removeMessageAtIndexPath:(NSIndexPath *)indexPath {
 
 static CGPoint  delayOffset = {0.0};
 // http://stackoverflow.com/a/11602040 Keep UITableView static when inserting rows at the top
-- (void)insertOldMessages:(NSArray *)oldMessages {
+- (void)insertOldMessages:(NSArray *)oldMessages completion:(void (^)())completion {
     WEAKSELF
     [self exChangeMessageDataSourceQueue:^{
         NSMutableArray *messages = [[NSMutableArray alloc] initWithArray:weakSelf.messages];
@@ -291,10 +291,17 @@ - (void)insertOldMessages:(NSArray *)oldMessages {
             [UIView setAnimationsEnabled:YES];
             
             [weakSelf.messageTableView setContentOffset:delayOffset animated:NO];
+            if (completion) {
+                completion();
+            }
         }];
     }];
 }
 
+- (void)insertOldMessages:(NSArray *)oldMessages {
+    [self insertOldMessages:oldMessages completion:nil];
+}
+
 #pragma mark - Propertys
 
 - (NSMutableArray *)messages {
