一些残留的问题

MJ Lee · MJ Lee · commit ada9e248aea7 · 2016-06-14T20:51:00.000+08:00
1.用async+mainQueue替代endRefreshing的0.1s延迟问题
2.完善：圈圈控件根据文字长短变换位置
diff --git a/MJRefresh.podspec b/MJRefresh.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'MJRefresh'
-    s.version      = '3.1.4'
+    s.version      = '3.1.5'
     s.summary      = 'An easy way to use pull-to-refresh'
     s.homepage     = 'https://github.com/CoderMJLee/MJRefresh'
     s.license      = 'MIT'
diff --git a/MJRefresh/Base/MJRefreshBackFooter.m b/MJRefresh/Base/MJRefreshBackFooter.m
@@ -122,29 +122,19 @@ - (void)setState:(MJRefreshState)state
     }
 }
 
-#pragma mark - 公共方法
 - (void)endRefreshing
 {
-    if ([self.scrollView isKindOfClass:[UICollectionView class]]) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [super endRefreshing];
-        });
-    } else {
-        [super endRefreshing];
-    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self.state = MJRefreshStateIdle;
+    });
 }
 
-- (void)noticeNoMoreData
+- (void)endRefreshingWithNoMoreData
 {
-    if ([self.scrollView isKindOfClass:[UICollectionView class]]) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [super noticeNoMoreData];
-        });
-    } else {
-        [super noticeNoMoreData];
-    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self.state = MJRefreshStateNoMoreData;
+    });
 }
-
 #pragma mark - 私有方法
 #pragma mark 获得scrollView的内容 超出 view 的高度
 - (CGFloat)heightForContentBreakView
diff --git a/MJRefresh/Base/MJRefreshComponent.m b/MJRefresh/Base/MJRefreshComponent.m
@@ -170,7 +170,9 @@ - (void)setState:(MJRefreshState)state
 {
     _state = state;
     
-    [self setNeedsLayout];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self setNeedsLayout];
+    });
 }
 
 #pragma mark 进入刷新状态
diff --git a/MJRefresh/Base/MJRefreshHeader.m b/MJRefresh/Base/MJRefreshHeader.m
@@ -137,13 +137,9 @@ - (void)setState:(MJRefreshState)state
 #pragma mark - 公共方法
 - (void)endRefreshing
 {
-    if ([self.scrollView isKindOfClass:[UICollectionView class]]) {
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [super endRefreshing];
-        });
-    } else {
-        [super endRefreshing];
-    }
+    dispatch_async(dispatch_get_main_queue(), ^{
+        self.state = MJRefreshStateIdle;
+    });
 }
 
 - (NSDate *)lastUpdatedTime
diff --git a/MJRefreshExample/Classes/Second/MJCollectionViewController.m b/MJRefreshExample/Classes/Second/MJCollectionViewController.m
@@ -48,7 +48,7 @@ - (void)example21
     [self.collectionView.mj_header beginRefreshing];
 
     // 上拉刷新
-    self.collectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
+    self.collectionView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
         // 增加5条假数据
         for (int i = 0; i<5; i++) {
             [weakSelf.colors addObject:MJRandomColor];

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,9 @@ - (void)setState:(MJRefreshState)state`
`170`	`170`	`{`
`171`	`171`	`_state = state;`
`172`	`172`
`173`		`- [self setNeedsLayout];`
	`173`	`+ dispatch_async(dispatch_get_main_queue(), ^{`
	`174`	`+ [self setNeedsLayout];`
	`175`	`+ });`
`174`	`176`	`}`
`175`	`177`
`176`	`178`	`#pragma mark 进入刷新状态`