Bladeren bron

Merge pull request #207 from Sinkup/master

修复自动回弹上拉控件的一个显示bug
M了个J 10 jaren geleden
bovenliggende
commit
2642205133

+ 8 - 1
MJRefresh/Base/MJRefreshBackFooter.m

@@ -21,7 +21,7 @@ - (void)scrollViewContentOffsetDidChange:(NSDictionary *)change
     [super scrollViewContentOffsetDidChange:change];
     
     // 如果正在刷新,直接返回
-    if (self.state == MJRefreshStateRefreshing || self.state == MJRefreshStateNoMoreData) return;
+    if (self.state == MJRefreshStateRefreshing) return;
     
     _scrollViewOriginalInset = self.scrollView.contentInset;
     
@@ -33,6 +33,13 @@ - (void)scrollViewContentOffsetDidChange:(NSDictionary *)change
     if (currentOffsetY <= happenOffsetY) return;
     
     CGFloat pullingPercent = (currentOffsetY - happenOffsetY) / self.mj_h;
+    
+    // 如果已全部加载,仅设置pullingPercent,然后返回
+    if (self.state == MJRefreshStateNoMoreData) {
+        self.pullingPercent = pullingPercent;
+        return;
+    }
+    
     if (self.scrollView.isDragging) {
         self.pullingPercent = pullingPercent;
         // 普通 和 即将刷新 的临界点

+ 1 - 0
MJRefreshExample/MJRefreshExample/Classes/MJTableViewController.m

@@ -235,6 +235,7 @@ - (void)example19
 {
     // 设置回调(一旦进入刷新状态,就调用target的action,也就是调用self的loadLastData方法)
     self.tableView.footer = [MJChiBaoZiFooter2 footerWithRefreshingTarget:self refreshingAction:@selector(loadLastData)];
+    self.tableView.footer.autoChangeAlpha = YES;
 }
 
 #pragma mark UITableView + 上拉刷新 自定义刷新控件(自动刷新)