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.增加添加设备通知功能
---
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/Masonry/NSArray+MASAdditions.m | 26 ++++++++++++--------------
1 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/Masonry/NSArray+MASAdditions.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/Masonry/NSArray+MASAdditions.m
old mode 100644
new mode 100755
index 2988683..831d8cd
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/Masonry/NSArray+MASAdditions.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Venders/Masonry/NSArray+MASAdditions.m
@@ -48,12 +48,12 @@
if (axisType == MASAxisTypeHorizontal) {
MAS_VIEW *prev;
for (int i = 0; i < self.count; i++) {
- MAS_VIEW *v = [self objectAtIndex:i];
+ MAS_VIEW *v = self[i];
[v mas_makeConstraints:^(MASConstraintMaker *make) {
if (prev) {
make.width.equalTo(prev);
make.left.equalTo(prev.mas_right).offset(fixedSpacing);
- if (i == (CGFloat)self.count - 1) {//last one
+ if (i == self.count - 1) {//last one
make.right.equalTo(tempSuperView).offset(-tailSpacing);
}
}
@@ -68,12 +68,12 @@
else {
MAS_VIEW *prev;
for (int i = 0; i < self.count; i++) {
- MAS_VIEW *v = [self objectAtIndex:i];
+ MAS_VIEW *v = self[i];
[v mas_makeConstraints:^(MASConstraintMaker *make) {
if (prev) {
make.height.equalTo(prev);
make.top.equalTo(prev.mas_bottom).offset(fixedSpacing);
- if (i == (CGFloat)self.count - 1) {//last one
+ if (i == self.count - 1) {//last one
make.bottom.equalTo(tempSuperView).offset(-tailSpacing);
}
}
@@ -97,21 +97,20 @@
if (axisType == MASAxisTypeHorizontal) {
MAS_VIEW *prev;
for (int i = 0; i < self.count; i++) {
- MAS_VIEW *v = [self objectAtIndex:i];
+ MAS_VIEW *v = self[i];
[v mas_makeConstraints:^(MASConstraintMaker *make) {
+ make.width.equalTo(@(fixedItemLength));
if (prev) {
- CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1));
- make.width.equalTo(@(fixedItemLength));
- if (i == (CGFloat)self.count - 1) {//last one
+ if (i == self.count - 1) {//last one
make.right.equalTo(tempSuperView).offset(-tailSpacing);
}
else {
+ CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1));
make.right.equalTo(tempSuperView).multipliedBy(i/((CGFloat)self.count-1)).with.offset(offset);
}
}
else {//first one
make.left.equalTo(tempSuperView).offset(leadSpacing);
- make.width.equalTo(@(fixedItemLength));
}
}];
prev = v;
@@ -120,21 +119,20 @@
else {
MAS_VIEW *prev;
for (int i = 0; i < self.count; i++) {
- MAS_VIEW *v = [self objectAtIndex:i];
+ MAS_VIEW *v = self[i];
[v mas_makeConstraints:^(MASConstraintMaker *make) {
+ make.height.equalTo(@(fixedItemLength));
if (prev) {
- CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1));
- make.height.equalTo(@(fixedItemLength));
- if (i == (CGFloat)self.count - 1) {//last one
+ if (i == self.count - 1) {//last one
make.bottom.equalTo(tempSuperView).offset(-tailSpacing);
}
else {
+ CGFloat offset = (1-(i/((CGFloat)self.count-1)))*(fixedItemLength+leadSpacing)-i*tailSpacing/(((CGFloat)self.count-1));
make.bottom.equalTo(tempSuperView).multipliedBy(i/((CGFloat)self.count-1)).with.offset(offset);
}
}
else {//first one
make.top.equalTo(tempSuperView).offset(leadSpacing);
- make.height.equalTo(@(fixedItemLength));
}
}];
prev = v;
--
Gitblit v1.8.0