From 23a4008d2da40b9393b5a6da032fa05172e5f6b8 Mon Sep 17 00:00:00 2001 From: liyi Date: Tue, 5 Aug 2025 14:46:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=8A=A5=E8=AD=A6?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E6=96=87=E6=9C=AC=E4=B8=BA=E7=BA=A2?= =?UTF-8?q?=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doorLockLog/doorLockLog_page.dart | 33 +++++++++++++++---- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart index 9335bc27..dbbe4187 100755 --- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart +++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart @@ -313,10 +313,15 @@ class _DoorLockLogPageState extends State with RouteAware { final recordType = item.recordType; switch (recordType) { case 10: - return '${formatTimestampToHHmm(item.operateDate!)} ' + - '指纹'.tr + - '开锁'.tr + - '(ID:${item.username})'; + if (item.username != null && item.username != '') { + return '${formatTimestampToHHmm(item.operateDate!)} ' + + '指纹'.tr + + '开锁'.tr + + '(ID:${item.username})'; + } else { + return item.recordStr ?? ''; + } + case 20: return '${formatTimestampToHHmm(item.operateDate!)} ' + '密码'.tr + @@ -402,6 +407,22 @@ class _DoorLockLogPageState extends State with RouteAware { } } + Color _buildTextColorByType(DoorLockLogDataItem item) { + final recordType = item.recordType; + switch (recordType) { + case 120: + case 150: + case 130: + case 190: + case 200: + case 210: + case 220: + return Colors.red; + default: + return Colors.black; + } + } + TimelineTileBuilder _timelineBuilderWidget() { return TimelineTileBuilder.fromStyle( contentsAlign: ContentsAlign.basic, @@ -416,7 +437,7 @@ class _DoorLockLogPageState extends State with RouteAware { ); }, child: Padding( - padding: EdgeInsets.only(left: 20.w, top: 20.h,right: 20.w), + padding: EdgeInsets.only(left: 20.w, top: 20.h, right: 20.w), child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, @@ -428,7 +449,7 @@ class _DoorLockLogPageState extends State with RouteAware { _buildIDByType(timelineData), textAlign: TextAlign.left, style: TextStyle( - color: Colors.black, + color: _buildTextColorByType(timelineData), fontSize: 24.sp, fontWeight: FontWeight.w600, ),