Browse Source

Add more interface in one line code

Add some dateKey: one line code method
MJLee 11 years ago
parent
commit
68f4cb483c

+ 2 - 2
MJRefresh.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name         = "MJRefresh"
-  s.version      = "1.1.0"
+  s.version      = "1.2.0"
   s.summary      = "The easiest way to use pull-to-refresh"
   s.homepage     = "https://github.com/CoderMJLee/MJRefresh"
   s.license      = "MIT"
   s.authors      = { 'MJ Lee' => '199109106@qq.com'}
   s.platform     = :ios, "6.0"
-  s.source       = { :git => "https://github.com/CoderMJLee/MJRefresh.git", :tag => "1.1.0" }
+  s.source       = { :git => "https://github.com/CoderMJLee/MJRefresh.git", :tag => "1.2.0" }
   s.source_files = "MJRefreshExample/MJRefreshExample/MJRefresh/*.{h,m}"
   s.resource     = "MJRefreshExample/MJRefreshExample/MJRefresh/MJRefresh.bundle"
   s.requires_arc = true

+ 44 - 14
MJRefreshExample/MJRefreshExample/MJRefresh/UIScrollView+MJRefresh.h

@@ -33,6 +33,13 @@
  * @param block 进入刷新状态就会自动调用这个block
  */
 - (MJRefreshLegendHeader *)addLegendHeaderWithRefreshingBlock:(void (^)())block;
+/**
+ * 添加一个传统的下拉刷新控件
+ *
+ * @param block     进入刷新状态就会自动调用这个block
+ * @param dateKey   用来记录刷新时间的key
+ */
+- (MJRefreshLegendHeader *)addLegendHeaderWithRefreshingBlock:(void (^)())block dateKey:(NSString *)dateKey;
 /**
  * 添加一个传统的下拉刷新控件
  *
@@ -40,6 +47,14 @@
  * @param action 进入刷新状态就会自动调用target对象的action方法
  */
 - (MJRefreshLegendHeader *)addLegendHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action;
+/**
+ * 添加一个传统的下拉刷新控件
+ *
+ * @param target    进入刷新状态就会自动调用target对象的action方法
+ * @param action    进入刷新状态就会自动调用target对象的action方法
+ * @param dateKey   用来记录刷新时间的key
+ */
+- (MJRefreshLegendHeader *)addLegendHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action dateKey:(NSString *)dateKey;
 /**
  * 添加一个gif图片的下拉刷新控件
  */
@@ -50,6 +65,13 @@
  * @param block 进入刷新状态就会自动调用这个block
  */
 - (MJRefreshGifHeader *)addGifHeaderWithRefreshingBlock:(void (^)())block;
+/**
+ * 添加一个gif图片的下拉刷新控件
+ *
+ * @param block     进入刷新状态就会自动调用这个block
+ * @param dateKey   用来记录刷新时间的key
+ */
+- (MJRefreshGifHeader *)addGifHeaderWithRefreshingBlock:(void (^)())block dateKey:(NSString *)dateKey;
 /**
  * 添加一个gif图片的下拉刷新控件
  *
@@ -57,6 +79,14 @@
  * @param action 进入刷新状态就会自动调用target对象的action方法
  */
 - (MJRefreshGifHeader *)addGifHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action;
+/**
+ * 添加一个gif图片的下拉刷新控件
+ *
+ * @param target    进入刷新状态就会自动调用target对象的action方法
+ * @param action    进入刷新状态就会自动调用target对象的action方法
+ * @param dateKey   用来记录刷新时间的key
+ */
+- (MJRefreshGifHeader *)addGifHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action dateKey:(NSString *)dateKey;
 
 #pragma mark - 移除下拉刷新控件
 /**
@@ -123,7 +153,7 @@
  *
  *  @param callback 回调
  */
-- (void)addHeaderWithCallback:(void (^)())callback MJDeprecated("建议直接使用addLegendHeader");
+- (void)addHeaderWithCallback:(void (^)())callback MJDeprecated("建议使用addLegendHeaderWithRefreshingBlock:");
 
 /**
  *  添加一个下拉刷新头部控件
@@ -131,7 +161,7 @@
  *  @param callback 回调
  *  @param dateKey 刷新时间保存的key值
  */
-- (void)addHeaderWithCallback:(void (^)())callback dateKey:(NSString*)dateKey MJDeprecated("建议直接使用addLegendHeader");
+- (void)addHeaderWithCallback:(void (^)())callback dateKey:(NSString*)dateKey MJDeprecated("建议使用addLegendHeaderWithRefreshingBlock:dateKey:");
 
 /**
  *  添加一个下拉刷新头部控件
@@ -139,7 +169,7 @@
  *  @param target 目标
  *  @param action 回调方法
  */
-- (void)addHeaderWithTarget:(id)target action:(SEL)action MJDeprecated("建议直接使用addLegendHeader");
+- (void)addHeaderWithTarget:(id)target action:(SEL)action MJDeprecated("建议使用addLegendHeaderWithRefreshingTarget:refreshingAction:");
 
 /**
  *  添加一个下拉刷新头部控件
@@ -148,27 +178,27 @@
  *  @param action 回调方法
  *  @param dateKey 刷新时间保存的key值
  */
-- (void)addHeaderWithTarget:(id)target action:(SEL)action dateKey:(NSString*)dateKey MJDeprecated("建议直接使用addLegendHeader");
+- (void)addHeaderWithTarget:(id)target action:(SEL)action dateKey:(NSString*)dateKey MJDeprecated("建议使用addLegendHeaderWithRefreshingTarget:refreshingAction:dateKey:");
 
 /**
  *  主动让下拉刷新头部控件进入刷新状态
  */
-- (void)headerBeginRefreshing MJDeprecated("建议直接使用[self.tableView.header beginRefreshing]");
+- (void)headerBeginRefreshing MJDeprecated("建议使用[self.tableView.header beginRefreshing]");
 
 /**
  *  让下拉刷新头部控件停止刷新状态
  */
-- (void)headerEndRefreshing MJDeprecated("建议直接使用[self.tableView.header endRefreshing]");
+- (void)headerEndRefreshing MJDeprecated("建议使用[self.tableView.header endRefreshing]");
 
 /**
  *  下拉刷新头部控件的可见性
  */
-@property (nonatomic, assign, getter = isHeaderHidden) BOOL headerHidden MJDeprecated("建议直接使用self.tableView.header.hidden");
+@property (nonatomic, assign, getter = isHeaderHidden) BOOL headerHidden MJDeprecated("建议使用self.tableView.header.hidden");
 
 /**
  *  是否正在下拉刷新
  */
-@property (nonatomic, assign, readonly, getter = isHeaderRefreshing) BOOL headerRefreshing MJDeprecated("建议直接使用self.tableView.header.isRefreshing");
+@property (nonatomic, assign, readonly, getter = isHeaderRefreshing) BOOL headerRefreshing MJDeprecated("建议使用self.tableView.header.isRefreshing");
 
 #pragma mark - 上拉刷新
 /**
@@ -176,7 +206,7 @@
  *
  *  @param callback 回调
  */
-- (void)addFooterWithCallback:(void (^)())callback MJDeprecated("建议直接使用addLegendFooter");
+- (void)addFooterWithCallback:(void (^)())callback MJDeprecated("建议使用addLegendFooterWithRefreshingBlock:");
 
 /**
  *  添加一个上拉刷新尾部控件
@@ -184,25 +214,25 @@
  *  @param target 目标
  *  @param action 回调方法
  */
-- (void)addFooterWithTarget:(id)target action:(SEL)action MJDeprecated("建议直接使用addLegendFooter");
+- (void)addFooterWithTarget:(id)target action:(SEL)action MJDeprecated("建议使用addLegendFooterWithRefreshingTarget:refreshingAction:");
 
 /**
  *  主动让上拉刷新尾部控件进入刷新状态
  */
-- (void)footerBeginRefreshing MJDeprecated("建议直接使用[self.tableView.footer beginRefreshing]");
+- (void)footerBeginRefreshing MJDeprecated("建议使用[self.tableView.footer beginRefreshing]");
 
 /**
  *  让上拉刷新尾部控件停止刷新状态
  */
-- (void)footerEndRefreshing MJDeprecated("建议直接使用[self.tableView.footer endRefreshing]");
+- (void)footerEndRefreshing MJDeprecated("建议使用[self.tableView.footer endRefreshing]");
 
 /**
  *  上拉刷新头部控件的可见性
  */
-@property (nonatomic, assign, getter = isFooterHidden) BOOL footerHidden MJDeprecated("建议直接使用self.tableView.footer.hidden");
+@property (nonatomic, assign, getter = isFooterHidden) BOOL footerHidden MJDeprecated("建议使用self.tableView.footer.hidden");
 
 /**
  *  是否正在上拉刷新
  */
-@property (nonatomic, assign, readonly, getter = isFooterRefreshing) BOOL footerRefreshing MJDeprecated("建议直接使用self.tableView.footer.isRefreshing");
+@property (nonatomic, assign, readonly, getter = isFooterRefreshing) BOOL footerRefreshing MJDeprecated("建议使用self.tableView.footer.isRefreshing");
 @end

+ 30 - 6
MJRefreshExample/MJRefreshExample/MJRefresh/UIScrollView+MJRefresh.m

@@ -16,19 +16,31 @@
 
 @implementation UIScrollView (MJRefresh)
 #pragma mark - 下拉刷新
-- (MJRefreshLegendHeader *)addLegendHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action
+- (MJRefreshLegendHeader *)addLegendHeaderWithRefreshingBlock:(void (^)())block dateKey:(NSString *)dateKey
+{
+    MJRefreshLegendHeader *header = [self addLegendHeader];
+    header.refreshingBlock = block;
+    header.dateKey = dateKey;
+    return header;
+}
+
+- (MJRefreshLegendHeader *)addLegendHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action dateKey:(NSString *)dateKey
 {
     MJRefreshLegendHeader *header = [self addLegendHeader];
     header.refreshingTarget = target;
     header.refreshingAction = action;
+    header.dateKey = dateKey;
     return header;
 }
 
+- (MJRefreshLegendHeader *)addLegendHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action
+{
+    return [self addLegendHeaderWithRefreshingTarget:target refreshingAction:action dateKey:nil];
+}
+
 - (MJRefreshLegendHeader *)addLegendHeaderWithRefreshingBlock:(void (^)())block
 {
-    MJRefreshLegendHeader *header = [self addLegendHeader];
-    header.refreshingBlock = block;
-    return header;
+    return [self addLegendHeaderWithRefreshingBlock:block dateKey:nil];
 }
 
 - (MJRefreshLegendHeader *)addLegendHeader
@@ -42,21 +54,33 @@ - (MJRefreshLegendHeader *)addLegendHeader
     return header;
 }
 
-- (MJRefreshGifHeader *)addGifHeaderWithRefreshingBlock:(void (^)())block
+- (MJRefreshGifHeader *)addGifHeaderWithRefreshingBlock:(void (^)())block dateKey:(NSString *)dateKey
 {
     MJRefreshGifHeader *header = [self addGifHeader];
     header.refreshingBlock = block;
+    header.dateKey = dateKey;
     return header;
 }
 
-- (MJRefreshGifHeader *)addGifHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action
+- (MJRefreshGifHeader *)addGifHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action dateKey:(NSString *)dateKey
 {
     MJRefreshGifHeader *header = [self addGifHeader];
     header.refreshingTarget = target;
     header.refreshingAction = action;
+    header.dateKey = dateKey;
     return header;
 }
 
+- (MJRefreshGifHeader *)addGifHeaderWithRefreshingBlock:(void (^)())block
+{
+    return [self addGifHeaderWithRefreshingBlock:block dateKey:nil];
+}
+
+- (MJRefreshGifHeader *)addGifHeaderWithRefreshingTarget:(id)target refreshingAction:(SEL)action
+{
+    return [self addGifHeaderWithRefreshingTarget:target refreshingAction:action dateKey:nil];
+}
+
 - (MJRefreshGifHeader *)addGifHeader
 {
     [self removeHeader];