From 4c1abca185a5727da6fb314a0cb4cd44bfe1b3bf Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期五, 07 六月 2024 17:48:47 +0800
Subject: [PATCH] feature appkey修改
---
EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m | 84 ++++++++++++++++++++++++++----------------
1 files changed, 52 insertions(+), 32 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m
index 43a5a90..ef8df2c 100644
--- a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m
+++ b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZVideoDoorMsgCell.m
@@ -10,7 +10,7 @@
@interface HDLEZVideoDoorMsgCell ()
@property (strong, nonatomic) UILabel *messageTitle;
-@property (strong, nonatomic) UILabel *statusLabel;
+//@property (strong, nonatomic) UILabel *statusLabel;
@property (strong, nonatomic) UILabel *timeLabel;
@property (strong, nonatomic) UIImageView *messageImageView;
@property (strong, nonatomic) UIView *separatorLine;
@@ -29,7 +29,7 @@
- (void)createSubviews {
self.contentView.backgroundColor = UIColor.whiteColor;
[self.contentView addSubview:self.messageTitle];
- [self.contentView addSubview:self.statusLabel];
+// [self.contentView addSubview:self.statusLabel];
[self.contentView addSubview:self.timeLabel];
[self.contentView addSubview:self.messageImageView];
[self.contentView addSubview:self.separatorLine];
@@ -37,15 +37,16 @@
[self.messageTitle mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.mas_equalTo(self.contentView.mas_top).offset(24.);
make.left.mas_equalTo(self.contentView.mas_left).offset(16.);
+ make.right.mas_lessThanOrEqualTo(self.messageImageView.mas_left).offset(-16.);
}];
- [self.statusLabel mas_makeConstraints:^(MASConstraintMaker *make) {
- 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.statusLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+// 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.);
@@ -70,22 +71,38 @@
}
#pragma mark - PublishMethod
-- (void)configMessageInfoWithTitle:(NSString *)title deviceStatus:(NSString *)deviceStatus messageTime:(NSString *)time messageImage:(NSString *)messageUrl {
- if (title && title.length > 0) {
- self.messageTitle.text = title;
- }
+- (void)configMessageInfoWithTitle:(NSString *)title deviceStatus:(NSString *)deviceStatus messageTime:(NSString *)time messageImage:(NSString *)messageUrl {
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.);
+ NSMutableAttributedString *abs = [[NSMutableAttributedString alloc] initWithString:[NSString stringWithFormat:@"%@ ", title]];
+ UIImage *image = [UIImage imageNamed:([deviceStatus isEqualToString:@"宸叉帴"] ? @"hdl_ez_msg_answer" : @"hdl_ez_msg_no_answer")];
+ NSTextAttachment *attach = [[NSTextAttachment alloc] init];
+ attach.image = image;
+ NSAttributedString *imageStr = [NSAttributedString attributedStringWithAttachment:attach];
+ [abs appendAttributedString:imageStr];
+ [abs addAttribute:NSBaselineOffsetAttributeName value:@(-5) range:NSMakeRange(title.length + 2, 1)]; // +2鏄�傞厤绌烘牸
+ self.messageTitle.attributedText = abs;
} else {
- [self.statusLabel mas_updateConstraints:^(MASConstraintMaker *make) {
- make.width.mas_equalTo(0.);
- }];
+ 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;
@@ -93,10 +110,12 @@
if (messageUrl && messageUrl.length > 0) {
[self.messageImageView sd_setImageWithURL:[NSURL URLWithString:messageUrl] placeholderImageScale:[UIImage imageNamed:@"hdl_ez_msg_placeholder"]];
[self.messageImageView mas_updateConstraints:^(MASConstraintMaker *make) {
+ make.right.mas_equalTo(self.contentView.mas_right).offset(-16.);
make.width.mas_equalTo(72.);
}];
} else {
[self.messageImageView mas_updateConstraints:^(MASConstraintMaker *make) {
+ make.right.mas_equalTo(self.contentView.mas_right).offset(0.);
make.width.mas_equalTo(0.);
}];
}
@@ -112,22 +131,23 @@
_messageTitle=[[UILabel alloc] init];
_messageTitle.font = HDLEZ_Get_FontRegularWithSize(HDLEZ_FontSize_14);
_messageTitle.textColor=HDLEZ_COLOR_TITLE_BLACK;
+ _messageTitle.lineBreakMode = NSLineBreakByTruncatingMiddle;
_messageTitle.numberOfLines = 2;
}
return _messageTitle;
}
-- (UILabel *)statusLabel {
- if (!_statusLabel) {
- _statusLabel=[[UILabel alloc] init];
- _statusLabel.font = HDLEZ_Get_FontRegularWithSize(HDLEZ_FontSize_12);
- _statusLabel.textColor = HDLEZ_COLOR_TEXT_WHITE;
- _statusLabel.textAlignment = NSTextAlignmentCenter;
- _statusLabel.layer.cornerRadius = 4;
- _statusLabel.clipsToBounds = YES;
- }
- return _statusLabel;
-}
+//- (UILabel *)statusLabel {
+// if (!_statusLabel) {
+// _statusLabel=[[UILabel alloc] init];
+// _statusLabel.font = HDLEZ_Get_FontRegularWithSize(HDLEZ_FontSize_12);
+// _statusLabel.textColor = HDLEZ_COLOR_TEXT_WHITE;
+// _statusLabel.textAlignment = NSTextAlignmentCenter;
+// _statusLabel.layer.cornerRadius = 4;
+// _statusLabel.clipsToBounds = YES;
+// }
+// return _statusLabel;
+//}
- (UILabel *)timeLabel {
if (!_timeLabel) {
--
Gitblit v1.8.0