下拉刷新bug修复

Author: wanghengheng

Coding_iOS/Controllers/RootControllers/Me_RootViewController.m

@@ -42,7 +42,7 @@ @implementation Me_RootViewController
 - (void)tabBarItemClicked{
     if (_myTableView.contentOffset.y > 0) {
         [_myTableView setContentOffset:CGPointZero animated:YES];
-    }else if (!self.refreshControl.refreshing){
+    }else if (!self.refreshControl.isAnimating){
         [self.refreshControl beginRefreshing];
         [self.myTableView setContentOffset:CGPointMake(0, -44)];
         [self refresh];

Coding_iOS/Controllers/RootControllers/Message_RootViewController.m

@@ -36,7 +36,8 @@ @implementation Message_RootViewController
 - (void)tabBarItemClicked{
     if (_myTableView.contentOffset.y > 0) {
         [_myTableView setContentOffset:CGPointZero animated:YES];
-    }else if (!self.refreshControl.refreshing){
+    }else if (!self.refreshControl.isAnimating){
+        [self.refreshControl beginRefreshing];
         [self.myTableView setContentOffset:CGPointMake(0, -44)];
         [self refresh];
     }

Coding_iOS/Controllers/RootControllers/Tweet_RootViewController.m

@@ -52,7 +52,7 @@ @implementation Tweet_RootViewController
 - (void)tabBarItemClicked{
     if (_myTableView.contentOffset.y > 0) {
         [_myTableView setContentOffset:CGPointZero animated:YES];
-    }else if (!self.refreshControl.refreshing){
+    }else if (!self.refreshControl.isAnimating){
         [self.refreshControl beginRefreshing];
         [self.myTableView setContentOffset:CGPointMake(0, -44)];
         [self refresh];

Coding_iOS/Vendor/ODRefreshControl/ODRefreshControl.h

@@ -24,7 +24,8 @@
     BOOL _hasSectionHeaders;
 }
 
-@property (nonatomic, readonly) BOOL refreshing;
+@property (nonatomic, readonly) BOOL isAnimating;
+
 @property (nonatomic, strong) UIColor *tintColor;
 @property (nonatomic, assign) UIActivityIndicatorViewStyle activityIndicatorViewStyle;
 
@@ -38,5 +39,4 @@
 
 // Tells the control the refresh operation has ended
 - (void)endRefreshing;
-
 @end

Coding_iOS/Vendor/ODRefreshControl/ODRefreshControl.m

@@ -28,7 +28,7 @@
 
 @interface ODRefreshControl ()
 
-@property (nonatomic, readwrite) BOOL refreshing;
+@property (nonatomic, readwrite) BOOL refreshing, duringEnding;
 @property (nonatomic, assign) UIScrollView *scrollView;
 @property (nonatomic, assign) UIEdgeInsets originalContentInset;
 
@@ -74,6 +74,7 @@ - (id)initInScrollView:(UIScrollView *)scrollView activityIndicatorView:(UIView
         [self addSubview:_activity];
 
         _refreshing = NO;
+        _duringEnding = NO;
         _canRefresh = YES;
         _ignoreInset = NO;
         _ignoreOffset = NO;
@@ -391,6 +392,8 @@ - (void)beginRefreshing
 - (void)endRefreshing
 {
     if (_refreshing) {
+        self.refreshing = NO;
+        self.duringEnding = YES;
         // Create a temporary retain-cycle, so the scrollView won't be released
         // halfway through the end animation.
         // This allows for the refresh control to clean up the observer,
@@ -416,9 +419,13 @@ - (void)endRefreshing
             _ignoreInset = YES;
             [blockScrollView setContentInset:self.originalContentInset];
             _ignoreInset = NO;
-            _refreshing = NO;
+            self.duringEnding = NO;
         }];
     }
 }
 
+- (BOOL)isAnimating{
+    return (self.refreshing || self.duringEnding);
+}
+
 @end

Coding_iOS/Views/FileDownloadView.m

@@ -91,7 +91,7 @@ - (void)loadLayoutWithCurFile{
         curBottomY += 20;
         if (!_stateButton) {
             _stateButton = [[UIButton alloc] init];
-            _stateButton = [UIButton buttonWithStyle:StrapPrimaryStyle andTitle:@"下载原文件" andFrame:CGRectMake((frameWidth - 260)/2, curBottomY, 260, 45) target:self action:@selector(clickedByUser)];
+            _stateButton = [UIButton buttonWithStyle:StrapPrimaryStyle andTitle:@"下载原文件" andFrame:CGRectMake((frameWidth - 260)/2, curBottomY, 260, 25) target:self action:@selector(clickedByUser)];
             [self addSubview:_stateButton];
         }
     }else{

Coding_iOS/Views/ProjectListView.m

@@ -30,7 +30,7 @@ @implementation ProjectListView
 - (void)tabBarItemClicked{
     if (_myTableView.contentOffset.y > 0) {
         [_myTableView setContentOffset:CGPointZero animated:YES];
-    }else if (!self.myRefreshControl.refreshing){
+    }else if (!self.myRefreshControl.isAnimating){
         [self.myRefreshControl beginRefreshing];
         [self.myTableView setContentOffset:CGPointMake(0, -44)];
         [self refresh];

Coding_iOS/Views/ProjectTaskListView.m

@@ -30,7 +30,7 @@ @implementation ProjectTaskListView
 - (void)tabBarItemClicked{
     if (_myTableView.contentOffset.y > 0) {
         [_myTableView setContentOffset:CGPointZero animated:YES];
-    }else if (!self.myRefreshControl.refreshing){
+    }else if (!self.myRefreshControl.isAnimating){
         [self.myRefreshControl beginRefreshing];
         [self.myTableView setContentOffset:CGPointMake(0, -44)];
         [self refresh];