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/Custom/Header/MJRefreshNormalHeader.m | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Custom/Header/MJRefreshNormalHeader.m b/EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Custom/Header/MJRefreshNormalHeader.m
similarity index 77%
copy from Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Custom/Header/MJRefreshNormalHeader.m
copy to EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Custom/Header/MJRefreshNormalHeader.m
index 6e6dc57..32d8de7 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/Custom/Header/MJRefreshNormalHeader.m
+++ b/EZSDK/EZSDK/EZ/Venders/MJRefresh/MJRefresh/Custom/Header/MJRefreshNormalHeader.m
@@ -7,10 +7,11 @@
//
#import "MJRefreshNormalHeader.h"
+#import "NSBundle+MJRefresh.h"
@interface MJRefreshNormalHeader()
{
- __weak UIImageView *_arrowView;
+ __unsafe_unretained UIImageView *_arrowView;
}
@property (weak, nonatomic) UIActivityIndicatorView *loadingView;
@end
@@ -20,8 +21,7 @@
- (UIImageView *)arrowView
{
if (!_arrowView) {
- UIImage *image = [UIImage imageNamed:MJRefreshSrcName(@"arrow.png")] ?: [UIImage imageNamed:MJRefreshFrameworkSrcName(@"arrow.png")];
- UIImageView *arrowView = [[UIImageView alloc] initWithImage:image];
+ UIImageView *arrowView = [[UIImageView alloc] initWithImage:[NSBundle mj_arrowImage]];
[self addSubview:_arrowView = arrowView];
}
return _arrowView;
@@ -46,7 +46,7 @@
[self setNeedsLayout];
}
-#pragma makr - 閲嶅啓鐖剁被鐨勬柟娉�
+#pragma mark - 閲嶅啓鐖剁被鐨勬柟娉�
- (void)prepare
{
[super prepare];
@@ -58,17 +58,32 @@
{
[super placeSubviews];
- // 绠ご
- self.arrowView.mj_size = self.arrowView.image.size;
+ // 绠ご鐨勪腑蹇冪偣
CGFloat arrowCenterX = self.mj_w * 0.5;
if (!self.stateLabel.hidden) {
- arrowCenterX -= 100;
+ CGFloat stateWidth = self.stateLabel.mj_textWith;
+ CGFloat timeWidth = 0.0;
+ if (!self.lastUpdatedTimeLabel.hidden) {
+ timeWidth = self.lastUpdatedTimeLabel.mj_textWith;
+ }
+ CGFloat textWidth = MAX(stateWidth, timeWidth);
+ arrowCenterX -= textWidth / 2 + self.labelLeftInset;
}
CGFloat arrowCenterY = self.mj_h * 0.5;
- self.arrowView.center = CGPointMake(arrowCenterX, arrowCenterY);
+ CGPoint arrowCenter = CGPointMake(arrowCenterX, arrowCenterY);
+ // 绠ご
+ if (self.arrowView.constraints.count == 0) {
+ self.arrowView.mj_size = self.arrowView.image.size;
+ self.arrowView.center = arrowCenter;
+ }
+
// 鍦堝湀
- self.loadingView.frame = self.arrowView.frame;
+ if (self.loadingView.constraints.count == 0) {
+ self.loadingView.center = arrowCenter;
+ }
+
+ self.arrowView.tintColor = self.stateLabel.textColor;
}
- (void)setState:(MJRefreshState)state
--
Gitblit v1.8.0