Browse Source

little problem

little problem
MJLee 10 years ago
parent
commit
ce2f5eb20a
2 changed files with 5 additions and 1 deletions
  1. 1 1
      MJRefresh.podspec
  2. 4 0
      MJRefresh/Custom/Header/MJRefreshNormalHeader.m

+ 1 - 1
MJRefresh.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "MJRefresh"
-  s.version      = "2.0.3"
+  s.version      = "2.0.4"
   s.summary      = "The easiest way to use pull-to-refresh"
   s.homepage     = "https://github.com/CoderMJLee/MJRefresh"
   s.license      = "MIT"

+ 4 - 0
MJRefresh/Custom/Header/MJRefreshNormalHeader.m

@@ -67,6 +67,9 @@ - (void)setState:(MJRefreshState)state
             [UIView animateWithDuration:MJRefreshSlowAnimationDuration animations:^{
                 self.loadingView.alpha = 0.0;
             } completion:^(BOOL finished) {
+                // 如果执行完动画发现不是idle状态,就直接返回,进入其他状态
+                if (self.state != MJRefreshStateIdle) return;
+                
                 self.loadingView.alpha = 1.0;
                 [self.loadingView stopAnimating];
                 self.arrowView.hidden = NO;
@@ -85,6 +88,7 @@ - (void)setState:(MJRefreshState)state
             self.arrowView.transform = CGAffineTransformMakeRotation(0.000001 - M_PI);
         }];
     } else if (state == MJRefreshStateRefreshing) {
+        self.loadingView.alpha = 1.0; // 防止refreshing -> idle的动画完毕动作没有被执行
         [self.loadingView startAnimating];
         self.arrowView.hidden = YES;
     }