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.更新
---
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/MJRefresh/Custom/Header/MJRefreshGifHeader.m | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Custom/Header/MJRefreshGifHeader.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/MJRefresh/Custom/Header/MJRefreshGifHeader.m
similarity index 82%
rename from Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Custom/Header/MJRefreshGifHeader.m
rename to Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/MJRefresh/Custom/Header/MJRefreshGifHeader.m
index aa2ddd5..f8bcc9b 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Custom/Header/MJRefreshGifHeader.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/MJRefresh/Custom/Header/MJRefreshGifHeader.m
@@ -9,7 +9,9 @@
#import "MJRefreshGifHeader.h"
@interface MJRefreshGifHeader()
-@property (weak, nonatomic) UIImageView *gifView;
+{
+ __unsafe_unretained UIImageView *_gifView;
+}
/** 鎵�鏈夌姸鎬佸搴旂殑鍔ㄧ敾鍥剧墖 */
@property (strong, nonatomic) NSMutableDictionary *stateImages;
/** 鎵�鏈夌姸鎬佸搴旂殑鍔ㄧ敾鏃堕棿 */
@@ -64,6 +66,14 @@
}
#pragma mark - 瀹炵幇鐖剁被鐨勬柟娉�
+- (void)prepare
+{
+ [super prepare];
+
+ // 鍒濆鍖栭棿璺�
+ self.labelLeftInset = 20;
+}
+
- (void)setPullingPercent:(CGFloat)pullingPercent
{
[super setPullingPercent:pullingPercent];
@@ -81,12 +91,21 @@
{
[super placeSubviews];
+ if (self.gifView.constraints.count) return;
+
self.gifView.frame = self.bounds;
if (self.stateLabel.hidden && self.lastUpdatedTimeLabel.hidden) {
self.gifView.contentMode = UIViewContentModeCenter;
} else {
self.gifView.contentMode = UIViewContentModeRight;
- self.gifView.mj_w = self.mj_w * 0.5 - 90;
+
+ CGFloat stateWidth = self.stateLabel.mj_textWith;
+ CGFloat timeWidth = 0.0;
+ if (!self.lastUpdatedTimeLabel.hidden) {
+ timeWidth = self.lastUpdatedTimeLabel.mj_textWith;
+ }
+ CGFloat textWidth = MAX(stateWidth, timeWidth);
+ self.gifView.mj_w = self.mj_w * 0.5 - textWidth * 0.5 - self.labelLeftInset;
}
}
@@ -107,6 +126,8 @@
self.gifView.animationDuration = [self.stateDurations[@(state)] doubleValue];
[self.gifView startAnimating];
}
+ } else if (state == MJRefreshStateIdle) {
+ [self.gifView stopAnimating];
}
}
@end
--
Gitblit v1.8.0