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/UIScrollView+MJExtension.m | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/UIScrollView+MJExtension.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/MJRefresh/UIScrollView+MJExtension.m
similarity index 63%
rename from Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/UIScrollView+MJExtension.m
rename to Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/MJRefresh/UIScrollView+MJExtension.m
index 6a13f5f..045c1b3 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/UIScrollView+MJExtension.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/MJRefresh/MJRefresh/UIScrollView+MJExtension.m
@@ -10,54 +10,94 @@
#import "UIScrollView+MJExtension.h"
#import <objc/runtime.h>
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunguarded-availability-new"
+
@implementation UIScrollView (MJExtension)
+
+static BOOL gt_ios_11_;
++ (void)load
+{
+ // 缂撳瓨鍒ゆ柇鍊�
+ gt_ios_11_ = [[[UIDevice currentDevice] systemVersion] compare:@"11.0" options:NSNumericSearch] != NSOrderedAscending;
+}
+
+- (UIEdgeInsets)mj_inset
+{
+#ifdef __IPHONE_11_0
+ if (gt_ios_11_) {
+ return self.adjustedContentInset;
+ }
+#endif
+ return self.contentInset;
+}
- (void)setMj_insetT:(CGFloat)mj_insetT
{
UIEdgeInsets inset = self.contentInset;
inset.top = mj_insetT;
+#ifdef __IPHONE_11_0
+ if (gt_ios_11_) {
+ inset.top -= (self.adjustedContentInset.top - self.contentInset.top);
+ }
+#endif
self.contentInset = inset;
}
- (CGFloat)mj_insetT
{
- return self.contentInset.top;
+ return self.mj_inset.top;
}
- (void)setMj_insetB:(CGFloat)mj_insetB
{
UIEdgeInsets inset = self.contentInset;
inset.bottom = mj_insetB;
+#ifdef __IPHONE_11_0
+ if (gt_ios_11_) {
+ inset.bottom -= (self.adjustedContentInset.bottom - self.contentInset.bottom);
+ }
+#endif
self.contentInset = inset;
}
- (CGFloat)mj_insetB
{
- return self.contentInset.bottom;
+ return self.mj_inset.bottom;
}
- (void)setMj_insetL:(CGFloat)mj_insetL
{
UIEdgeInsets inset = self.contentInset;
inset.left = mj_insetL;
+#ifdef __IPHONE_11_0
+ if (gt_ios_11_) {
+ inset.left -= (self.adjustedContentInset.left - self.contentInset.left);
+ }
+#endif
self.contentInset = inset;
}
- (CGFloat)mj_insetL
{
- return self.contentInset.left;
+ return self.mj_inset.left;
}
- (void)setMj_insetR:(CGFloat)mj_insetR
{
UIEdgeInsets inset = self.contentInset;
inset.right = mj_insetR;
+#ifdef __IPHONE_11_0
+ if (gt_ios_11_) {
+ inset.right -= (self.adjustedContentInset.right - self.contentInset.right);
+ }
+#endif
self.contentInset = inset;
}
- (CGFloat)mj_insetR
{
- return self.contentInset.right;
+ return self.mj_inset.right;
}
- (void)setMj_offsetX:(CGFloat)mj_offsetX
@@ -108,3 +148,4 @@
return self.contentSize.height;
}
@end
+#pragma clang diagnostic pop
--
Gitblit v1.8.0