Refactor api and add comments.

xhzengAIB · xhzengAIB · commit 82299e9d238d · 2014-06-01T16:34:42.000Z
diff --git a/Example/MessageDisplayExample/MessageDisplayExample/XHDemoWeChatMessageTableViewController.m b/Example/MessageDisplayExample/MessageDisplayExample/XHDemoWeChatMessageTableViewController.m
@@ -284,16 +284,16 @@ - (BOOL)shouldLoadMoreMessagesScrollToTop {
 }
 
 - (void)loadMoreMessagesScrollTotop {
-    if (!self.loadMoreMessage) {
-        self.loadMoreMessage = YES;
+    if (!self.loadingMoreMessage) {
+        self.loadingMoreMessage = YES;
         
         WEAKSELF
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             NSMutableArray *messages = [weakSelf getTestMessages];
             sleep(2);
             dispatch_async(dispatch_get_main_queue(), ^{
                 [weakSelf insertOldMessages:messages];
-                weakSelf.loadMoreMessage = NO;
+                weakSelf.loadingMoreMessage = NO;
             });
         });
     }
diff --git a/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/XHDemoWeChatMessageTableViewController.m b/Example/MessageDisplayKitCoreDataExample/MessageDisplayKitCoreDataExample/XHDemoWeChatMessageTableViewController.m
@@ -402,16 +402,16 @@ - (BOOL)shouldLoadMoreMessagesScrollToTop {
 }
 
 - (void)loadMoreMessagesScrollTotop {
-    if (!self.loadMoreMessage) {
-        self.loadMoreMessage = YES;
+    if (!self.loadingMoreMessage) {
+        self.loadingMoreMessage = YES;
         
         WEAKSELF
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             NSMutableArray *messages = [weakSelf getTestMessages];
             sleep(3);
             dispatch_async(dispatch_get_main_queue(), ^{
                 [weakSelf insertOldMessages:messages];
-                weakSelf.loadMoreMessage = NO;
+                weakSelf.loadingMoreMessage = NO;
             });
         });
     }
diff --git a/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/XHDemoWeChatMessageTableViewController.m b/Example/MessageDisplayKitStoryBoradExample/MessageDisplayKitStoryBoradExample/XHDemoWeChatMessageTableViewController.m
@@ -247,16 +247,16 @@ - (BOOL)shouldLoadMoreMessagesScrollToTop {
 }
 
 - (void)loadMoreMessagesScrollTotop {
-    if (!self.loadMoreMessage) {
-        self.loadMoreMessage = YES;
+    if (!self.loadingMoreMessage) {
+        self.loadingMoreMessage = YES;
         
         WEAKSELF
         dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
             NSMutableArray *messages = [weakSelf getTestMessages];
             sleep(3);
             dispatch_async(dispatch_get_main_queue(), ^{
                 [weakSelf insertOldMessages:messages];
-                weakSelf.loadMoreMessage = NO;
+                weakSelf.loadingMoreMessage = NO;
             });
         });
     }
diff --git a/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.h b/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.h
@@ -181,7 +181,10 @@
  */
 @property (nonatomic, weak, readonly) XHEmotionManagerView *emotionManagerView;
 
-@property (nonatomic, assign) BOOL loadMoreMessage;
+/**
+ *  是否正在加载更多旧的消息数据
+ */
+@property (nonatomic, assign) BOOL loadingMoreMessage;
 
 #pragma mark - Message View Controller Default stup
 /**
diff --git a/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m b/MessageDisplayKit/Classes/Controllers/XHMessageTableViewController/XHMessageTableViewController.m
@@ -309,9 +309,9 @@ - (UIActivityIndicatorView *)loadMoreActivityIndicatorView {
     }
     return _loadMoreActivityIndicatorView;
 }
-- (void)setLoadMoreMessage:(BOOL)loadMoreMessage {
-    _loadMoreMessage = loadMoreMessage;
-    if (loadMoreMessage) {
+- (void)setLoadingMoreMessage:(BOOL)loadingMoreMessage {
+    _loadingMoreMessage = loadingMoreMessage;
+    if (loadingMoreMessage) {
         [self.loadMoreActivityIndicatorView startAnimating];
     } else {
         [self.loadMoreActivityIndicatorView stopAnimating];
@@ -1116,7 +1116,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
         BOOL shouldLoadMoreMessages = [self.delegate shouldLoadMoreMessagesScrollToTop];
         if (shouldLoadMoreMessages) {
             if (scrollView.contentOffset.y >=0 && scrollView.contentOffset.y <= 44) {
-                if (!self.loadMoreMessage) {
+                if (!self.loadingMoreMessage) {
                     if ([self.delegate respondsToSelector:@selector(loadMoreMessagesScrollTotop)]) {
                         [self.delegate loadMoreMessagesScrollTotop];
                     }
