From 3e4be5ed4d2c0395dd60e392baf86c59762059b1 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期五, 30 六月 2023 10:14:50 +0800
Subject: [PATCH] feature 猫眼全屏布局调整 && UI细节适配
---
EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m
index 5fc3518..0596bbe 100644
--- a/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m
+++ b/EZSDK/EZSDK/EZ/TempPassword/Views/HDLEZDeviceMsgListView.m
@@ -30,6 +30,9 @@
self.delegate = self;
self.dataSource = self;
cellHeight=80;
+ self.rowHeight = UITableViewAutomaticDimension;
+ self.estimatedRowHeight = 80;
+ [self registerClass:[HDLEZVideoDoorMsgCell class] forCellReuseIdentifier:@"HDLEZVideoDoorMsgCell"];
[self setSeparatorInset:UIEdgeInsetsZero];
// [self setLayoutMargins:UIEdgeInsetsZero];
}
@@ -46,12 +49,12 @@
}
-(CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
- return cellHeight;
+ return UITableViewAutomaticDimension;
}
-(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
HDLEZLog(@"鍒濆鍖朿ell");
- HDLEZVideoDoorMsgCell *cell = [tableView dequeueReusableCellWithIdentifier:@"HDLEZVideoDoorMsgCell"];
+ HDLEZVideoDoorMsgCell *cell = [tableView dequeueReusableCellWithIdentifier:@"HDLEZVideoDoorMsgCell" forIndexPath:indexPath];
if(cell == nil){
cell=[[HDLEZVideoDoorMsgCell alloc]initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"HDLEZVideoDoorMsgCell"];
}
@@ -71,10 +74,8 @@
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
if (self.msgList.count <= indexPath.row) return;
HDLEZDeviceMsgInfoModel *messageModel = self.msgList[indexPath.row];
-#warning mock
- NSString *tempPicUrl = @"https://upload-images.jianshu.io/upload_images/5809200-a99419bb94924e6d.jpg?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240";
- if (self.previewPic) {
- self.previewPic(tempPicUrl);
+ if (self.previewPic && messageModel.imageUrl && messageModel.imageUrl.length > 0) {
+ self.previewPic(messageModel.imageUrl);
}
}
@@ -88,9 +89,27 @@
if (self.msgList.count <= indexPath.row) return;
HDLEZDeviceMsgInfoModel *messageModel = self.msgList[indexPath.row];
+
#warning mock
- NSString *tempPicUrl = @"https://upload-images.jianshu.io/upload_images/5809200-a99419bb94924e6d.jpg?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240";
- [cell configMessageInfoWithTitle:messageModel.title deviceStatus:@"鏈帴鍚�" messageTime:messageModel.createTime messageImage:tempPicUrl];
+ NSString *stataus = @"";
+ if (indexPath.row == 0) {
+ stataus = @"鏈帴";
+ messageModel.createTime = @"";
+ } else if (indexPath.row == 1) {
+ stataus = @"宸叉帴";
+ }
+ if (messageModel.createTime && messageModel.createTime.length == 13) {
+ messageModel.createTime = [messageModel.createTime substringToIndex:10];
+ }
+ NSString *messageTime = [self turnDate:messageModel.createTime];
+ [cell configMessageInfoWithTitle:messageModel.content deviceStatus:stataus messageTime:messageTime messageImage:indexPath.row != 0 ? messageModel.imageUrl : @""];
+ [cell showSpearator:(self.msgList.count != indexPath.row + 1)];
+}
+
+/*鏃堕棿鎴宠浆鏃堕棿
+ */
+-(NSString *)turnDate:(NSString*)dateStr{
+ return [HDLEZConstants timeStrWithFormate:@"yyyy.MM.dd HH:mm" data:[NSDate dateWithTimeIntervalSince1970:[dateStr integerValue]]];;
}
/*璁剧疆娑堟伅鍒楄〃鍊�
--
Gitblit v1.8.0