From 01db54a34694d9fa95d8e0642f1456878e747b38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9CDaisyWu=E2=80=9D?= <“18682150237@163.com”>
Date: Wed, 7 Aug 2024 10:54:36 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95b?=
 =?UTF-8?q?ug=E4=BF=AE=E5=A4=8D=202=EF=BC=8C=E5=BE=AE=E4=BF=A1=E5=85=AC?=
 =?UTF-8?q?=E4=BC=97=E5=8F=B7=E6=8E=A8=E9=80=81=E6=89=93=E5=BC=80=E5=90=8E?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=8A=A5=E9=94=99=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lan/lan_zh.json                                     |  2 +-
 .../lockDetail/doorLockLog/doorLockLog_page.dart    |  7 +++----
 lib/tools/showCupertinoAlertView.dart               | 13 ++++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lan/lan_zh.json b/lan/lan_zh.json
index 6b833cb2..a3f4307b 100755
--- a/lan/lan_zh.json
+++ b/lan/lan_zh.json
@@ -65,7 +65,7 @@
   "accountNumber": "账号",
   "volumeAuthorizationLock": "批量授权锁",
   "authorizedAdminTip": "授权管理员拥有操作这把锁的重要权限，请确保只发给我你信任的人",
-  "lockOperatingRecordTip": "只能保留一定时间内的记录，如果您需要保留历史记录，可以在右上角导出",
+  "lockOperatingRecordTip": "如果您需要保留历史记录，可以在右上角导出",
   "rankingList": "排列榜",
   "earlyArrivalList": "早到榜",
   "lateList": "迟到榜",
diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
index e5ac1bd9..3221ec45 100755
--- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
+++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
@@ -53,7 +53,7 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
                 ),
                 onTap: () {
                   ShowTipView().showSureAlertDialog(
-                      '1.锁没有联网，密码、IC卡、指纹等开门记录无法实时上传，可以点击右上角按钮，然后读取记录。\n2.只能保留一定时间内的记录，如果您需要保留历史记录，可以点击右上角按钮，然后导出记录',
+                      '1.锁没有联网，密码、IC卡、指纹等开门记录无法实时上传，可以点击右上角按钮，然后读取记录。\n2.如果您需要保留历史记录，可以点击右上角按钮，然后导出记录',
                       tipTitle: '看不到操作记录，可能原因有',
                       sureStr: '我知道了'.tr);
                 },
@@ -276,9 +276,8 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
 
         return GestureDetector(
           onTap: () {
-            Get.toNamed(Routers.doorLockLogDetailPage, arguments: {
-              'doorLockLogDataItem': timelineData
-            });
+            Get.toNamed(Routers.doorLockLogDetailPage,
+                arguments: {'doorLockLogDataItem': timelineData});
           },
           child: Padding(
             padding: EdgeInsets.only(left: 20.w, top: 20.h),
diff --git a/lib/tools/showCupertinoAlertView.dart b/lib/tools/showCupertinoAlertView.dart
index 2e67d597..a5eeb46a 100755
--- a/lib/tools/showCupertinoAlertView.dart
+++ b/lib/tools/showCupertinoAlertView.dart
@@ -30,11 +30,14 @@ class ShowCupertinoAlertView {
                       SizedBox(
                         height: 60.h,
                       ),
-                      Image.network(
-                        qrCodeUrl,
-                        width: 400.w,
-                        height: 400.w,
-                      ),
+                      if (qrCodeUrl.isNotEmpty)
+                        Image.network(
+                          qrCodeUrl,
+                          width: 400.w,
+                          height: 400.w,
+                        )
+                      else
+                        Container(),
                       SizedBox(
                         height: 20.h,
                       ),