From 7ab063d5c658143b5bce7ca8e5ae9bfc700bb1d8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 01 二月 2021 18:22:29 +0800
Subject: [PATCH] 2021-02-01 1.更新
---
EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Base/MJRefreshComponent.h | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Base/MJRefreshComponent.h b/EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Base/MJRefreshComponent.h
similarity index 76%
copy from Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Base/MJRefreshComponent.h
copy to EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Base/MJRefreshComponent.h
index 943d405..46e1068 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Base/MJRefreshComponent.h
+++ b/EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Base/MJRefreshComponent.h
@@ -12,9 +12,10 @@
#import "UIView+MJExtension.h"
#import "UIScrollView+MJExtension.h"
#import "UIScrollView+MJRefresh.h"
+#import "NSBundle+MJRefresh.h"
/** 鍒锋柊鎺т欢鐨勭姸鎬� */
-typedef enum {
+typedef NS_ENUM(NSInteger, MJRefreshState) {
/** 鏅�氶棽缃姸鎬� */
MJRefreshStateIdle = 1,
/** 鏉惧紑灏卞彲浠ヨ繘琛屽埛鏂扮殑鐘舵�� */
@@ -25,10 +26,14 @@
MJRefreshStateWillRefresh,
/** 鎵�鏈夋暟鎹姞杞藉畬姣曪紝娌℃湁鏇村鐨勬暟鎹簡 */
MJRefreshStateNoMoreData
-} MJRefreshState;
+};
/** 杩涘叆鍒锋柊鐘舵�佺殑鍥炶皟 */
-typedef void (^MJRefreshComponentRefreshingBlock)();
+typedef void (^MJRefreshComponentRefreshingBlock)(void);
+/** 寮�濮嬪埛鏂板悗鐨勫洖璋�(杩涘叆鍒锋柊鐘舵�佸悗鐨勫洖璋�) */
+typedef void (^MJRefreshComponentbeginRefreshingCompletionBlock)(void);
+/** 缁撴潫鍒锋柊鍚庣殑鍥炶皟 */
+typedef void (^MJRefreshComponentEndRefreshingCompletionBlock)(void);
/** 鍒锋柊鎺т欢鐨勫熀绫� */
@interface MJRefreshComponent : UIView
@@ -43,6 +48,7 @@
@property (copy, nonatomic) MJRefreshComponentRefreshingBlock refreshingBlock;
/** 璁剧疆鍥炶皟瀵硅薄鍜屽洖璋冩柟娉� */
- (void)setRefreshingTarget:(id)target refreshingAction:(SEL)action;
+
/** 鍥炶皟瀵硅薄 */
@property (weak, nonatomic) id refreshingTarget;
/** 鍥炶皟鏂规硶 */
@@ -53,10 +59,17 @@
#pragma mark - 鍒锋柊鐘舵�佹帶鍒�
/** 杩涘叆鍒锋柊鐘舵�� */
- (void)beginRefreshing;
+- (void)beginRefreshingWithCompletionBlock:(void (^)(void))completionBlock;
+/** 寮�濮嬪埛鏂板悗鐨勫洖璋�(杩涘叆鍒锋柊鐘舵�佸悗鐨勫洖璋�) */
+@property (copy, nonatomic) MJRefreshComponentbeginRefreshingCompletionBlock beginRefreshingCompletionBlock;
+/** 缁撴潫鍒锋柊鐨勫洖璋� */
+@property (copy, nonatomic) MJRefreshComponentEndRefreshingCompletionBlock endRefreshingCompletionBlock;
/** 缁撴潫鍒锋柊鐘舵�� */
- (void)endRefreshing;
+- (void)endRefreshingWithCompletionBlock:(void (^)(void))completionBlock;
/** 鏄惁姝ｅ湪鍒锋柊 */
-- (BOOL)isRefreshing;
+@property (assign, nonatomic, readonly, getter=isRefreshing) BOOL refreshing;
+//- (BOOL)isRefreshing;
/** 鍒锋柊鐘舵�� 涓�鑸氦缁欏瓙绫诲唴閮ㄥ疄鐜� */
@property (assign, nonatomic) MJRefreshState state;
@@ -89,5 +102,6 @@
@end
@interface UILabel(MJRefresh)
-+ (instancetype)label;
++ (instancetype)mj_label;
+- (CGFloat)mj_textWith;
@end
--
Gitblit v1.8.0