From d10de9b3bcd2b4328f0e0839f2febf3ae3c656c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Wed, 3 Jul 2024 15:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E9=94=81=E9=A1=B5-?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95-=E5=8D=A1=E3=80=81?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E3=80=81=E6=8C=87=E7=BA=B9=E3=80=81=E4=BA=BA?=
 =?UTF-8?q?=E8=84=B8=E7=9A=84=E5=A2=9E=E5=8A=A0=E5=92=8C=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=BA=94=E6=9C=89=E5=A7=93=E5=90=8D=EF=BC=8C=E5=9B=A0=E9=94=81?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=87=8C=E6=9C=89=E7=BC=96=E5=8F=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart | 6 +++++-
 lib/main/lockDetail/doorLockLog/doorLockLog_page.dart   | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart
index e043b762..74395fbf 100755
--- a/lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart
+++ b/lib/main/lockDetail/doorLockLog/doorLockLog_entity.dart
@@ -72,7 +72,8 @@ class DoorLockLogDataItem {
       this.videoUrl,
       this.headUrl,
       this.userid,
-      this.keyboardPwd});
+      this.keyboardPwd,
+      this.recordStr});
 
   DoorLockLogDataItem.fromJson(Map<String, dynamic> json) {
     recordId = json['recordId'];
@@ -87,6 +88,7 @@ class DoorLockLogDataItem {
     headUrl = json['headUrl'];
     userid = json['userid'];
     keyboardPwd = json['keyboardPwd'];
+    recordStr = json['recordStr'];
   }
   int? recordId;
   int? lockId;
@@ -100,6 +102,7 @@ class DoorLockLogDataItem {
   String? headUrl;
   String? userid;
   String? keyboardPwd;
+  String? recordStr;
 
   Map<String, dynamic> toJson() {
     final Map<String, dynamic> data = <String, dynamic>{};
@@ -115,6 +118,7 @@ class DoorLockLogDataItem {
     data['headUrl'] = headUrl;
     data['userid'] = userid;
     data['keyboardPwd'] = keyboardPwd;
+    data['recordStr'] = recordStr;
     return data;
   }
 }
diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
index 63c87ed3..7c076e8e 100755
--- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
+++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
@@ -281,7 +281,8 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: <Widget>[
               Text(
-                '$formattedTime ${timelineData.username!.isNotEmpty ? "${timelineData.username}操作" : ""}${timelineData.recordTypeName}',
+                // '$formattedTime ${timelineData.username!.isNotEmpty ? "${timelineData.username}操作" : ""}${timelineData.recordTypeName}',
+                timelineData.recordStr ?? '',
                 textAlign: TextAlign.left,
                 style: TextStyle(
                   color: Colors.black,