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/MJRefreshBackFooter.m | 34 +++++++---------------------------
1 files changed, 7 insertions(+), 27 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Base/MJRefreshBackFooter.m b/EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Base/MJRefreshBackFooter.m
similarity index 85%
copy from Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Base/MJRefreshBackFooter.m
copy to EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Base/MJRefreshBackFooter.m
index c3d0db6..71b9579 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Base/MJRefreshBackFooter.m
+++ b/EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Base/MJRefreshBackFooter.m
@@ -31,7 +31,7 @@
// 濡傛灉姝ｅ湪鍒锋柊锛岀洿鎺ヨ繑鍥�
if (self.state == MJRefreshStateRefreshing) return;
- _scrollViewOriginalInset = self.scrollView.contentInset;
+ _scrollViewOriginalInset = self.scrollView.mj_inset;
// 褰撳墠鐨刢ontentOffset
CGFloat currentOffsetY = self.scrollView.mj_offsetY;
@@ -95,17 +95,21 @@
if (self.isAutomaticallyChangeAlpha) self.alpha = 0.0;
} completion:^(BOOL finished) {
self.pullingPercent = 0.0;
+
+ if (self.endRefreshingCompletionBlock) {
+ self.endRefreshingCompletionBlock();
+ }
}];
}
CGFloat deltaH = [self heightForContentBreakView];
// 鍒氬埛鏂板畬姣�
- if (MJRefreshStateRefreshing == oldState && deltaH > 0 && self.scrollView.totalDataCount != self.lastRefreshCount) {
+ if (MJRefreshStateRefreshing == oldState && deltaH > 0 && self.scrollView.mj_totalDataCount != self.lastRefreshCount) {
self.scrollView.mj_offsetY = self.scrollView.mj_offsetY;
}
} else if (state == MJRefreshStateRefreshing) {
// 璁板綍鍒锋柊鍓嶇殑鏁伴噺
- self.lastRefreshCount = self.scrollView.totalDataCount;
+ self.lastRefreshCount = self.scrollView.mj_totalDataCount;
[UIView animateWithDuration:MJRefreshFastAnimationDuration animations:^{
CGFloat bottom = self.mj_h + self.scrollViewOriginalInset.bottom;
@@ -121,30 +125,6 @@
}];
}
}
-
-#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];
- }
-}
-
-- (void)noticeNoMoreData
-{
- 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];
- }
-}
-
#pragma mark - 绉佹湁鏂规硶
#pragma mark 鑾峰緱scrollView鐨勫唴瀹� 瓒呭嚭 view 鐨勯珮搴�
- (CGFloat)heightForContentBreakView
--
Gitblit v1.8.0