Browse Source

Add Refreshing Check

MJ Lee 11 years ago
parent
commit
1a695ba7cf

BIN
MJRefreshExample/MJRefreshExample.xcodeproj/project.xcworkspace/xcuserdata/mj.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 2
MJRefreshExample/MJRefreshExample/MJRefresh/MJRefreshBaseView.m

@@ -194,8 +194,8 @@ - (void)setState:(MJRefreshState)state
         _scrollViewOriginalInset = self.scrollView.contentInset;
     }
     
-    // 1.一样的就直接返回
-    if (self.state == state) return;
+    // 1.一样的就直接返回(暂时不返回)
+//    if (self.state == state) return;
     
     // 2.根据状态执行不同的操作
     switch (state) {

+ 11 - 1
MJRefreshExample/MJRefreshExample/MJRefresh/UIScrollView+MJRefresh.h

@@ -45,6 +45,11 @@
  */
 @property (nonatomic, assign, getter = isHeaderHidden) BOOL headerHidden;
 
+/**
+ *  是否正在下拉刷新
+ */
+@property (nonatomic, assign, readonly, getter = isHeaderRefreshing) BOOL headerRefreshing;
+
 #pragma mark - 上拉刷新
 /**
  *  添加一个上拉刷新尾部控件
@@ -77,10 +82,15 @@
 - (void)footerEndRefreshing;
 
 /**
- *  拉刷新头部控件的可见性
+ *  拉刷新头部控件的可见性
  */
 @property (nonatomic, assign, getter = isFooterHidden) BOOL footerHidden;
 
+/**
+ *  是否正在上拉刷新
+ */
+@property (nonatomic, assign, readonly, getter = isFooterRefreshing) BOOL footerRefreshing;
+
 /**
  *  设置尾部控件的文字
  */

+ 10 - 0
MJRefreshExample/MJRefreshExample/MJRefresh/UIScrollView+MJRefresh.m

@@ -124,6 +124,11 @@ - (BOOL)isHeaderHidden
     return self.header.isHidden;
 }
 
+- (BOOL)isHeaderRefreshing
+{
+    return self.header.state == MJRefreshStateRefreshing;
+}
+
 #pragma mark - 上拉刷新
 /**
  *  添加一个上拉刷新尾部控件
@@ -201,6 +206,11 @@ - (BOOL)isFooterHidden
     return self.footer.isHidden;
 }
 
+- (BOOL)isFooterRefreshing
+{
+    return self.footer.state == MJRefreshStateRefreshing;
+}
+
 /**
  *  文字
  */