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/TableViewCells/MessageListCell.m | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/MessageListCell.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/MessageListCell.m
index 1709c69..e07bace 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/MessageListCell.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/MessageListCell.m
@@ -9,9 +9,9 @@
#import "MessageListCell.h"
#import "UIImageView+EzvizOpenSDK.h"
#import "UIImageView+AFNetworking.h"
-
+#import "HDLAlarmInfo.h"
#import "DDKit.h"
-
+#import "NSDate-Utilities.h"
static dispatch_semaphore_t ezviz_sema; //鍏ㄥ眬淇″彿閲�
#define device_verify_code_check_queue_name "com.ys7.open.verify.check.queue"
@@ -55,13 +55,13 @@
dispatch_semaphore_signal(ezviz_sema);
}
-- (void)setAlarmInfo:(EZAlarmInfo *)info
+- (void)setAlarmInfo:(HDLAlarmInfo *)info
{
NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
formatter.dateFormat = @"HH:mm:ss";
- self.timeLabel.text = [formatter stringFromDate:info.alarmStartTime];
+ self.timeLabel.text = [formatter stringFromDate:[info getAlarmStartTime]];
self.readStatusIcon.hidden = NO;
- if(info.isRead)
+ if(info.isChecked)
{
self.readStatusIcon.hidden = YES;
}
@@ -129,5 +129,27 @@
[alertView show];
});
}
-
+- (NSString *)compareCurrentTime:(NSDate *)timeDate
+{
+ NSString *result;
+ if([timeDate isThisYear]){
+ //灏忎簬1骞�
+ if([timeDate isToday]){
+ //灏忎簬涓�澶�
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ formatter.dateFormat = @"HH:mm:ss";
+ result = [formatter stringFromDate:timeDate];
+ }else{
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ formatter.dateFormat = @"MM/dd HH:mm";
+ result = [formatter stringFromDate:timeDate];
+ }
+ }else{
+ //澶т簬1骞�
+ NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+ formatter.dateFormat = @"yyyy/MM/dd";
+ result = [formatter stringFromDate:timeDate];
+ }
+ return result;
+}
@end
--
Gitblit v1.8.0