From 9df1c3243b58924c01c54766022a0d355a645b83 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Fri, 8 Aug 2025 09:55:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E6=98=BE=E7=A4=BA=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doorLockLog/doorLockLog_page.dart         | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
index dbbe4187..e9f93968 100755
--- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
+++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
@@ -321,24 +321,23 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
         } else {
           return item.recordStr ?? '';
         }
-
       case 20:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '密码'.tr +
             '开锁'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）'+'（${'密码'.tr}：${item.keyboardPwd}）';
       case 30:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '卡'.tr +
             '开锁'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）';
       case 40:
         if (item.username != null && item.username != '') {
           return '${formatTimestampToHHmm(item.operateDate!)} ' +
               '蓝牙'.tr +
               '开锁'.tr +
               '（' +
-              'ID'.tr +
+              '${'昵称'.tr}'.tr +
               '：${item.username}）';
         } else {
           return '${formatTimestampToHHmm(item.operateDate!)} ' +
@@ -353,55 +352,58 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '组合模式'.tr +
             '开锁'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）';
       case 60:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
-            '添加指纹'.tr +
-            '（ID：${item.username}）';
+            '添加'.tr +
+            '指纹'.tr +
+            '（${'昵称'.tr}：${item.username}）';
       case 70:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
-            '添加密码'.tr +
-            '（ID：${item.username}）';
+            '添加'.tr +
+            '密码'.tr +
+            '（${'昵称'.tr}：${item.username}）';
       case 80:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
-            '添加卡'.tr +
-            '（ID：${item.username}）';
+            '添加'.tr +
+            '卡'.tr +
+            '（${'昵称'.tr}：${item.username}）';
       case 90:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '删除'.tr +
             '指纹'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）';
       case 100:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '删除'.tr +
             '密码'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）';
       case 110:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '删除'.tr +
             '卡'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）';
 
       case 160:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '人脸'.tr +
             '开锁'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）';
       case 190:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '胁迫指纹'.tr +
             '开锁'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）';
       case 200:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '胁迫密码'.tr +
             '开锁'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）';
       case 210:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '胁迫卡片'.tr +
             '开锁'.tr +
-            '（ID：${item.username}）';
+            '（${'昵称'.tr}：${item.username}）';
       default:
         return item.recordStr ?? '';
     }