From 3698c13aba988cd3e41b91b255e1c682c057e565 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 23 三月 2023 11:49:58 +0800
Subject: [PATCH] 1.新增历史记录相关页面及功能 2.修改配网为热点配网 3.设备列表增加过滤门锁功能 4.增加添加设备通知功能
---
EZSDK/EZSDK/EZ/Venders/Masonry/NSLayoutConstraint+MASDebugAdditions.m | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/Venders/Masonry/NSLayoutConstraint+MASDebugAdditions.m b/EZSDK/EZSDK/EZ/Venders/Masonry/NSLayoutConstraint+MASDebugAdditions.m
old mode 100644
new mode 100755
index 3d10ac2..ab539a2
--- a/EZSDK/EZSDK/EZ/Venders/Masonry/NSLayoutConstraint+MASDebugAdditions.m
+++ b/EZSDK/EZSDK/EZ/Venders/Masonry/NSLayoutConstraint+MASDebugAdditions.m
@@ -44,7 +44,12 @@
@(NSLayoutAttributeCenterY) : @"centerY",
@(NSLayoutAttributeBaseline) : @"baseline",
-#if TARGET_OS_IPHONE
+#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101100)
+ @(NSLayoutAttributeFirstBaseline) : @"firstBaseline",
+ @(NSLayoutAttributeLastBaseline) : @"lastBaseline",
+#endif
+
+#if (__IPHONE_OS_VERSION_MIN_REQUIRED >= 80000) || (__TV_OS_VERSION_MIN_REQUIRED >= 9000)
@(NSLayoutAttributeLeftMargin) : @"leftMargin",
@(NSLayoutAttributeRightMargin) : @"rightMargin",
@(NSLayoutAttributeTopMargin) : @"topMargin",
@@ -66,7 +71,7 @@
static dispatch_once_t once;
static NSDictionary *descriptionMap;
dispatch_once(&once, ^{
-#if TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE || TARGET_OS_TV
descriptionMap = @{
@(MASLayoutPriorityDefaultHigh) : @"high",
@(MASLayoutPriorityDefaultLow) : @"low",
@@ -106,16 +111,16 @@
[description appendFormat:@" %@", [self.class descriptionForObject:self.firstItem]];
if (self.firstAttribute != NSLayoutAttributeNotAnAttribute) {
- [description appendFormat:@".%@", [self.class.layoutAttributeDescriptionsByValue objectForKey:@(self.firstAttribute)]];
+ [description appendFormat:@".%@", self.class.layoutAttributeDescriptionsByValue[@(self.firstAttribute)]];
}
- [description appendFormat:@" %@", [self.class.layoutRelationDescriptionsByValue objectForKey:@(self.relation)]];
+ [description appendFormat:@" %@", self.class.layoutRelationDescriptionsByValue[@(self.relation)]];
if (self.secondItem) {
[description appendFormat:@" %@", [self.class descriptionForObject:self.secondItem]];
}
if (self.secondAttribute != NSLayoutAttributeNotAnAttribute) {
- [description appendFormat:@".%@", [self.class.layoutAttributeDescriptionsByValue objectForKey:@(self.secondAttribute)]];
+ [description appendFormat:@".%@", self.class.layoutAttributeDescriptionsByValue[@(self.secondAttribute)]];
}
if (self.multiplier != 1) {
@@ -131,7 +136,7 @@
}
if (self.priority != MASLayoutPriorityRequired) {
- [description appendFormat:@" ^%@", [self.class.layoutPriorityDescriptionsByValue objectForKey:@(self.priority)] ?: [NSNumber numberWithDouble:self.priority]];
+ [description appendFormat:@" ^%@", self.class.layoutPriorityDescriptionsByValue[@(self.priority)] ?: [NSNumber numberWithDouble:self.priority]];
}
[description appendString:@">"];
--
Gitblit v1.8.0