Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/MessageListCell.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a | 补丁 | 查看 | 原始文档 | blame | 历史 | |
EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
EZSDK/EZSDK/EZ/TableViewCells/MessageListCell.m | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/TableViewCells/MessageListCell.m
@@ -11,7 +11,7 @@ #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" @@ -59,7 +59,8 @@ { NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; formatter.dateFormat = @"HH:mm:ss"; self.timeLabel.text = [formatter stringFromDate:[info getAlarmStartTime]]; // self.timeLabel.text = [formatter stringFromDate:[info getAlarmStartTime]]; self.timeLabel.text = [self compareCurrentTime:[info getAlarmStartTime]]; self.readStatusIcon.hidden = NO; if(info.isChecked) { @@ -129,5 +130,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 EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.aBinary files differ
EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. [assembly: AssemblyVersion("1.5.1")] [assembly: AssemblyVersion("1.5.3")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing. EZSDK/EZSDK/EZ/TableViewCells/MessageListCell.m
@@ -11,7 +11,7 @@ #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" @@ -59,7 +59,8 @@ { NSDateFormatter *formatter = [[NSDateFormatter alloc] init]; formatter.dateFormat = @"HH:mm:ss"; self.timeLabel.text = [formatter stringFromDate:[info getAlarmStartTime]]; // self.timeLabel.text = [formatter stringFromDate:[info getAlarmStartTime]]; self.timeLabel.text = [self compareCurrentTime:[info getAlarmStartTime]]; self.readStatusIcon.hidden = NO; if(info.isChecked) { @@ -129,5 +130,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