fix the error and loadMoreView status.

xhzengAIB · Aug 7, 2014 · a48e9b8 · a48e9b8
1 parent 12eb068
commit a48e9b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/RefreshControl/Manager/XHRefreshControl.m b/RefreshControl/Manager/XHRefreshControl.m
@@ -316,8 +316,10 @@ - (BOOL)isLoadMoreRefreshed {
     BOOL loadMored = YES;
     if ([self.delegate respondsToSelector:@selector(isLoadMoreRefreshed)]) {
         loadMored = [self.delegate isLoadMoreRefreshed];
+        self.loadMoreView.hidden = !loadMored;
         return loadMored;
     }
+    self.loadMoreView.hidden = !loadMored;
     return loadMored;
 }
 
@@ -617,8 +619,8 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
     } else if ([keyPath isEqualToString:@"contentSize"]) {
         if (self.isLoadMoreRefreshed && !self.noMoreDataForLoaded && !self.pullDownRefreshing) {
             CGSize contentSize = [[change valueForKey:NSKeyValueChangeNewKey] CGSizeValue];
-            CGFloat scrollViewHeight = CGRectGetHeight(self.scrollView.frame);
-            CGFloat thubs = scrollViewHeight - [self getAdaptorHeight];
+//            CGFloat scrollViewHeight = CGRectGetHeight(self.scrollView.frame);
+//            CGFloat thubs = scrollViewHeight - [self getAdaptorHeight];
 //            if (contentSize.height >= thubs) {
                 CGRect loadMoreViewFrame = self.loadMoreView.frame;
                 loadMoreViewFrame.origin.y = contentSize.height;

diff --git a/...e/XHRefreshControlExample/Controllers/DemoTableViewController/XHDemoTableViewController.m b/...e/XHRefreshControlExample/Controllers/DemoTableViewController/XHDemoTableViewController.m
@@ -44,7 +44,10 @@ - (void)loadDataSource {
                     [self endLoadMoreRefreshing];
                 }
             } else {
-
+                if (rand() % 3 > 1) {
+                    self.loadMoreRefreshed = NO;
+                }
+
                 self.dataSource = dataSource;
                 [self.tableView reloadData];
                 [self endPullDownRefreshing];