修复UI上和逻辑上的bug

xhzengAIB · Apr 30, 2015 · 3dd0d0c · 3dd0d0c
1 parent 42accd0
commit 3dd0d0c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/RefreshControl/Manager/XHRefreshControl.m b/RefreshControl/Manager/XHRefreshControl.m
@@ -165,12 +165,10 @@ - (void)callBeginLoadMoreRefreshing {
 }
 
 - (void)endLoadMoreRefresing {
-    if (self.isLoadMoreRefreshed) {
-        self.loadMoreRefreshing = NO;
-        self.handleNetworkError = NO;
-        self.refreshState = XHRefreshStateNormal;
-        [self.loadMoreView endLoading];
-    }
+    self.loadMoreRefreshing = NO;
+    self.handleNetworkError = NO;
+    self.refreshState = XHRefreshStateNormal;
+    [self.loadMoreView endLoading];
 }
 
 - (void)loadMoreButtonClciked:(UIButton *)sender {
@@ -181,14 +179,18 @@ - (void)endMoreOverWithMessage:(NSString *)message {
     [self endLoadMoreRefresing];
     self.noMoreDataForLoaded = YES;
     self.handleNetworkError = NO;
+    self.loadMoreView.hidden = NO;
     [self.loadMoreView configuraNothingMoreWithMessage:message];
+    [self setScrollViewContentInsetForNoLoadMore];
 }
 
 - (void)endMoreOverWithMessageTipsView:(UIView *)messageTipsView {
     [self endLoadMoreRefresing];
     self.noMoreDataForLoaded = YES;
     self.handleNetworkError = NO;
+    self.loadMoreView.hidden = NO;
     [self.loadMoreView configuraNothingMoreWithMessageView:messageTipsView];
+    [self setScrollViewContentInsetForNoLoadMore];
 }
 
 /**
@@ -296,7 +298,7 @@ - (void)setScrollViewContentInsetForLoadMore {
 
 - (void)setScrollViewContentInsetForNoLoadMore {
     UIEdgeInsets currentInsets = self.scrollView.contentInset;
-    currentInsets.bottom = self.originalBottomInset;
+    currentInsets.bottom = kXHLoadMoreViewHeight + self.originalBottomInset;
     [self setScrollViewContentInset:currentInsets];
 }
 
@@ -375,11 +377,6 @@ - (BOOL)isLoadMoreRefreshed {
     BOOL loadMored = YES;
     if ([self.delegate respondsToSelector:@selector(isLoadMoreRefreshed)]) {
         loadMored = [self.delegate isLoadMoreRefreshed];
-        if (self.noMoreDataForLoaded) {
-            self.loadMoreView.hidden = NO;
-        } else {
-            self.loadMoreView.hidden = !loadMored;
-        }
         return loadMored;
     }
     self.loadMoreView.hidden = !loadMored;

diff --git a/RefreshControl/Views/XHLoadMoreView.m b/RefreshControl/Views/XHLoadMoreView.m
@@ -65,6 +65,7 @@ - (void)configuraNothingMoreWithMessageView:(UIView *)messageView {
         _messageView.hidden = NO;
         return;
     }
+    messageView.backgroundColor = self.loadMoreButton.backgroundColor;
     self.messageView = messageView;
     [self addSubview:self.messageView];
 }
@@ -96,7 +97,7 @@ - (UIActivityIndicatorView *)activityIndicatorView {
     if (!_activityIndicatorView) {
         _activityIndicatorView = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray];
         _activityIndicatorView.hidesWhenStopped = YES;
-        _activityIndicatorView.center = CGPointMake(CGRectGetWidth(self.bounds) / 3, CGRectGetHeight(self.bounds) / 2.0);
+        _activityIndicatorView.center = CGPointMake(CGRectGetWidth(self.bounds) / 2.85, CGRectGetHeight(self.bounds) / 2.0);
     }
     return _activityIndicatorView;
 }