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 with RouteAware { ), onTap: () { ShowTipView().showSureAlertDialog( - '1.锁没有联网,密码、IC卡、指纹等开门记录无法实时上传,可以点击右上角按钮,然后读取记录。\n2.只能保留一定时间内的记录,如果您需要保留历史记录,可以点击右上角按钮,然后导出记录', + '1.锁没有联网,密码、IC卡、指纹等开门记录无法实时上传,可以点击右上角按钮,然后读取记录。\n2.如果您需要保留历史记录,可以点击右上角按钮,然后导出记录', tipTitle: '看不到操作记录,可能原因有', sureStr: '我知道了'.tr); }, @@ -276,9 +276,8 @@ class _DoorLockLogPageState extends State 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, ),