Parcourir la source

More friendly experience

MJLee il y a 11 ans
Parent
commit
a3622b9486

+ 1 - 1
MJRefreshExample/MJRefreshExample/MJRefresh/MJRefreshFooter.m

@@ -141,7 +141,7 @@ - (void)adjustStateWithContentOffset
     if (self.mj_y == 0) return;
     if (self.mj_y == 0) return;
     
     
     if (_scrollView.mj_insetT + _scrollView.mj_contentSizeH > _scrollView.mj_h) { // 内容超过一个屏幕
     if (_scrollView.mj_insetT + _scrollView.mj_contentSizeH > _scrollView.mj_h) { // 内容超过一个屏幕
-        if (_scrollView.mj_offsetY > self.mj_y - _scrollView.mj_h + self.mj_h * self.appearencePercentTriggerAutoRefresh) {
+        if (_scrollView.mj_offsetY > self.mj_y - _scrollView.mj_h + self.mj_h * self.appearencePercentTriggerAutoRefresh + _scrollView.mj_insetB - self.mj_h) {
             // 当底部刷新控件完全出现时,才刷新
             // 当底部刷新控件完全出现时,才刷新
             self.state = MJRefreshFooterStateRefreshing;
             self.state = MJRefreshFooterStateRefreshing;
         }
         }

+ 1 - 1
MJRefreshExample/MJRefreshExample/MJRefresh/MJRefreshHeader.m

@@ -216,7 +216,7 @@ - (void)beginRefreshing
 
 
 - (void)endRefreshing
 - (void)endRefreshing
 {
 {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.01 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         self.state = MJRefreshHeaderStateIdle;
         self.state = MJRefreshHeaderStateIdle;
     });
     });
 }
 }