diff --git a/RefreshControl/Manager/XHRefreshControl.m b/RefreshControl/Manager/XHRefreshControl.m index 319b8c0..58e263d 100644 --- 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/XHRefreshControlExample/XHRefreshControlExample/Controllers/DemoTableViewController/XHDemoTableViewController.m b/XHRefreshControlExample/XHRefreshControlExample/Controllers/DemoTableViewController/XHDemoTableViewController.m index f97a55a..689cce3 100644 --- a/XHRefreshControlExample/XHRefreshControlExample/Controllers/DemoTableViewController/XHDemoTableViewController.m +++ b/XHRefreshControlExample/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];