From c67db6e324e1f87f04e691d17546776b806129c5 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Mon, 4 Aug 2025 18:02:14 +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=84id=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doorLockLog/doorLockLog_page.dart         | 71 ++++++++++++++++---
 .../fingerprintList_logic.dart                |  4 +-
 2 files changed, 63 insertions(+), 12 deletions(-)

diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
index e84e8cba..9335bc27 100755
--- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
+++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
@@ -324,16 +324,59 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
             '（ID：${item.username}）';
       case 30:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
-            '卡片'.tr +
+            '卡'.tr +
             '开锁'.tr +
             '（ID：${item.username}）';
       case 40:
-        return item.recordStr ?? '';
+        if (item.username != null && item.username != '') {
+          return '${formatTimestampToHHmm(item.operateDate!)} ' +
+              '蓝牙'.tr +
+              '开锁'.tr +
+              '（' +
+              'ID'.tr +
+              '：${item.username}）';
+        } else {
+          return '${formatTimestampToHHmm(item.operateDate!)} ' +
+              '蓝牙'.tr +
+              '开锁'.tr +
+              '（' +
+              'ID'.tr +
+              '：${item.userid}）';
+        }
+
       case 50:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '组合模式'.tr +
             '开锁'.tr +
             '（ID：${item.username}）';
+      case 60:
+        return '${formatTimestampToHHmm(item.operateDate!)} ' +
+            '添加指纹'.tr +
+            '（ID：${item.username}）';
+      case 70:
+        return '${formatTimestampToHHmm(item.operateDate!)} ' +
+            '添加密码'.tr +
+            '（ID：${item.username}）';
+      case 80:
+        return '${formatTimestampToHHmm(item.operateDate!)} ' +
+            '添加卡'.tr +
+            '（ID：${item.username}）';
+      case 90:
+        return '${formatTimestampToHHmm(item.operateDate!)} ' +
+            '删除'.tr +
+            '指纹'.tr +
+            '（ID：${item.username}）';
+      case 100:
+        return '${formatTimestampToHHmm(item.operateDate!)} ' +
+            '删除'.tr +
+            '密码'.tr +
+            '（ID：${item.username}）';
+      case 110:
+        return '${formatTimestampToHHmm(item.operateDate!)} ' +
+            '删除'.tr +
+            '卡'.tr +
+            '（ID：${item.username}）';
+
       case 160:
         return '${formatTimestampToHHmm(item.operateDate!)} ' +
             '人脸'.tr +
@@ -373,18 +416,26 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
             );
           },
           child: Padding(
-            padding: EdgeInsets.only(left: 20.w, top: 20.h),
+            padding: EdgeInsets.only(left: 20.w, top: 20.h,right: 20.w),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.start,
               crossAxisAlignment: CrossAxisAlignment.start,
               children: <Widget>[
-                Text(
-                  _buildIDByType(timelineData),
-                  textAlign: TextAlign.left,
-                  style: TextStyle(
-                    color: Colors.black,
-                    fontSize: 24.sp,
-                    fontWeight: FontWeight.w600,
+                // 使用 SingleChildScrollView 实现横向滚动
+                SingleChildScrollView(
+                  scrollDirection: Axis.horizontal, // 横向滚动
+                  child: Text(
+                    _buildIDByType(timelineData),
+                    textAlign: TextAlign.left,
+                    style: TextStyle(
+                      color: Colors.black,
+                      fontSize: 24.sp,
+                      fontWeight: FontWeight.w600,
+                    ),
+                    // 关键：禁用换行，强制单行显示
+                    maxLines: 1,
+                    // 可选：添加省略号（如果文本过长）
+                    overflow: TextOverflow.ellipsis,
                   ),
                 ),
                 SizedBox(
diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart
index f2a1a7d9..ab32de1f 100755
--- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart
+++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_logic.dart
@@ -340,10 +340,10 @@ class FingerprintListLogic extends BaseGetXController {
   Future<FingerprintListDataEntity> getFingerprintsListData(
       {required bool isRefresh}) async {
     // 如果是下拉刷新，清空已有数据
-    if (isRefresh) {
+    // if (isRefresh) {
       state.fingerprintItemListData.clear();
       pageNo = 1;
-    }
+
     final FingerprintListDataEntity entity =
         await ApiRepository.to.getFingerprintsListData(
       lockId: state.lockId.value.toString(),