From 413b74eb37fa6b9e7ae38b22e8d777a74bd7a972 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 21 六月 2023 15:09:03 +0800
Subject: [PATCH] feature 门锁历史记录UI调整
---
EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m | 78 +++++++++++++++++++++++++++++----------
1 files changed, 58 insertions(+), 20 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m
index 8c7c701..35f4305 100644
--- a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m
+++ b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m
@@ -13,6 +13,7 @@
@property (strong, nonatomic) UILabel *statusLabel;
@property (strong, nonatomic) UILabel *timeLabel;
@property (strong, nonatomic) UIImageView *messageImageView;
+@property (strong, nonatomic) UIView *separatorLine;
@end
@@ -31,33 +32,40 @@
[self.contentView addSubview:self.statusLabel];
[self.contentView addSubview:self.timeLabel];
[self.contentView addSubview:self.messageImageView];
+ [self.contentView addSubview:self.separatorLine];
[self.messageTitle mas_makeConstraints:^(MASConstraintMaker *make) {
- make.top.mas_equalTo(self.contentView.mas_top).offset(16.);
+ make.top.mas_equalTo(self.contentView.mas_top).offset(24.);
make.left.mas_equalTo(self.contentView.mas_left).offset(16.);
- make.height.mas_equalTo(22);
}];
[self.statusLabel mas_makeConstraints:^(MASConstraintMaker *make) {
- make.top.mas_equalTo(self.messageTitle.mas_bottom).offset(10.);
- make.left.mas_equalTo(self.messageTitle.mas_left);
- make.width.mas_equalTo(50);
- make.height.mas_equalTo(30);
+ make.top.mas_equalTo(self.messageTitle.mas_top).offset(0.);
+ make.left.mas_equalTo(self.messageTitle.mas_right).offset(8.);
+ make.right.mas_lessThanOrEqualTo(self.messageImageView.mas_left).offset(-8.);
+ make.width.mas_equalTo(40);
+ make.height.mas_equalTo(20);
}];
[self.timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+ make.top.mas_equalTo(self.messageTitle.mas_bottom).offset(4.);
make.left.mas_equalTo(self.messageTitle.mas_left);
- make.bottom.mas_equalTo(self.messageImageView.mas_bottom);
- make.right.mas_equalTo(self.messageTitle.mas_right);
- make.height.mas_equalTo(22);
+ make.bottom.mas_equalTo(self.contentView.mas_bottom).offset(-12.);
+ make.height.mas_equalTo(17);
}];
[self.messageImageView mas_makeConstraints:^(MASConstraintMaker *make) {
- make.top.mas_equalTo(self.contentView.mas_top).offset(16.);
- make.left.mas_equalTo(self.messageTitle.mas_right).offset(10.);
- make.bottom.mas_equalTo(self.contentView.mas_bottom).offset(-16.);
make.right.mas_equalTo(self.contentView.mas_right).offset(-16.);
- make.width.mas_equalTo(self.messageImageView.mas_height).multipliedBy(5/3.);
+ make.centerY.mas_equalTo(self.contentView.mas_centerY);
+ make.width.mas_equalTo(72.);
+ make.height.mas_equalTo(41.);
+ }];
+
+ [self.separatorLine mas_makeConstraints:^(MASConstraintMaker *make) {
+ make.left.mas_equalTo(self.messageTitle.mas_left);
+ make.bottom.mas_equalTo(self.contentView.mas_bottom);
+ make.right.mas_equalTo(self.messageImageView.mas_right);
+ make.height.mas_equalTo(0.5);
}];
}
@@ -66,16 +74,36 @@
if (title && title.length > 0) {
self.messageTitle.text = title;
}
+
if (deviceStatus && deviceStatus.length > 0) {
self.statusLabel.text = deviceStatus;
+ [self.statusLabel mas_updateConstraints:^(MASConstraintMaker *make) {
+ make.width.mas_equalTo(40.);
+ }];
+ self.statusLabel.backgroundColor = [deviceStatus isEqualToString:@"宸叉帴"] ? HDLEZHEXCOLOR(0x00C22D, 1.) : HDLEZHEXCOLOR(0xFF4747, 1.);
+ } else {
+ [self.statusLabel mas_updateConstraints:^(MASConstraintMaker *make) {
+ make.width.mas_equalTo(0.);
+ }];
}
+
if (time && time.length > 0) {
self.timeLabel.text = time;
}
if (messageUrl && messageUrl.length > 0) {
- NSLog(@"#######cell image url:%@", messageUrl);
[self.messageImageView sd_setImageWithURL:[NSURL URLWithString:messageUrl] placeholderImageScale:[UIImage imageNamed:@""]];
+ [self.messageImageView mas_updateConstraints:^(MASConstraintMaker *make) {
+ make.width.mas_equalTo(72.);
+ }];
+ } else {
+ [self.messageImageView mas_updateConstraints:^(MASConstraintMaker *make) {
+ make.width.mas_equalTo(0.);
+ }];
}
+}
+
+- (void)showSpearator:(BOOL)isShow {
+ self.separatorLine.hidden = !isShow;
}
#pragma mark - Getter
@@ -84,6 +112,7 @@
_messageTitle=[[UILabel alloc] init];
_messageTitle.font = HDLEZ_Get_FontRegularWithSize(HDLEZ_FontSize_14);
_messageTitle.textColor=HDLEZ_COLOR_TITLE_BLACK;
+ _messageTitle.numberOfLines = 2;
}
return _messageTitle;
}
@@ -92,9 +121,9 @@
if (!_statusLabel) {
_statusLabel=[[UILabel alloc] init];
_statusLabel.font = HDLEZ_Get_FontRegularWithSize(HDLEZ_FontSize_12);
- _statusLabel.textColor = HDLEZ_COLOR_TEXT_LIGHT_GRAY;
- _statusLabel.layer.cornerRadius = 5;
- _statusLabel.layer.borderColor = HDLEZ_COLOR_TEXT_GRAY.CGColor;
+ _statusLabel.textColor = HDLEZ_COLOR_TEXT_WHITE;
+ _statusLabel.textAlignment = NSTextAlignmentCenter;
+ _statusLabel.layer.cornerRadius = 4;
_statusLabel.clipsToBounds = YES;
}
return _statusLabel;
@@ -104,8 +133,7 @@
if (!_timeLabel) {
_timeLabel=[[UILabel alloc] init];
_timeLabel.font = HDLEZ_Get_FontRegularWithSize(HDLEZ_FontSize_12);
- _timeLabel.textColor=HDLEZ_COLOR_TEXT_GRAY;
- _timeLabel.textAlignment = NSTextAlignmentRight;
+ _timeLabel.textColor=HDLEZ_COLOR_TEXT_LIGHT_GRAY;
}
return _timeLabel;
}
@@ -113,10 +141,20 @@
- (UIImageView *)messageImageView {
if (!_messageImageView) {
_messageImageView = [[UIImageView alloc] init];
+ _messageImageView.contentMode = UIViewContentModeScaleAspectFill;
_messageImageView.backgroundColor = HDLEZ_COLOR_TEXT_LIGHT_GRAY;
-
+ _messageImageView.layer.cornerRadius = 4;
+ _messageImageView.clipsToBounds = YES;
}
return _messageImageView;
}
+- (UIView *)separatorLine {
+ if (!_separatorLine) {
+ _separatorLine = [[UIView alloc] init];
+ _separatorLine.backgroundColor = HDLEZ_COLOR_BACKGROUND_LINE;
+ }
+ return _separatorLine;
+}
+
@end
--
Gitblit v1.8.0