From 02c3429e306b4e11b8d2d864b123357e177dbf07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com>
Date: Sat, 2 Nov 2024 09:22:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lan/lan_it.json                               |  2 +-
 .../authorizedAdmin/authorizedAdmin_page.dart |  2 +-
 .../doorLockLog/doorLockLog_logic.dart        | 12 +++++++----
 .../passwordKey_perpetual_logic.dart          | 21 +++++++++++--------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/lan/lan_it.json b/lan/lan_it.json
index 24602a78..46df6491 100644
--- a/lan/lan_it.json
+++ b/lan/lan_it.json
@@ -507,7 +507,7 @@
     "您的钥匙已过期": "La tua chiave è scaduta",
     "常开模式开启": "La serratura è in modalità Passage",
     "超级管理员": "Super amministratore",
-    "授权管理员": "Amministratore autorizzato",
+    "授权管理员": "Amministratore",
     "普通用户": "Utente ordinario",
     "余": "Equilibrio",
     "天": "Giorno",
diff --git a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
index 06cb6c8f..f6ebb88b 100755
--- a/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
+++ b/lib/main/lockDetail/authorizedAdmin/authorizedAdmin/authorizedAdmin_page.dart
@@ -192,7 +192,7 @@ class _AuthorizedAdminPageState extends State<AuthorizedAdminPage>
     return Column(
       children: <Widget>[
         CommonItem(
-            leftTitel: '仅管理自己创建的用户',
+            leftTitel: '仅管理自己创建的用户'.tr,
             rightTitle: '',
             isHaveRightWidget: true,
             isTipsImg: true,
diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
index 49c8729d..d76c1280 100755
--- a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
+++ b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
@@ -26,6 +25,7 @@ class DoorLockLogLogic extends BaseGetXController {
 
   // 获取解析后的数据
   late StreamSubscription<Reply> _replySubscription;
+
   void _initReplySubscription() {
     _replySubscription =
         EventBusManager().eventBus!.on<Reply>().listen((Reply reply) {
@@ -103,16 +103,19 @@ class DoorLockLogLogic extends BaseGetXController {
     showBlueConnetctToastTimer(action: () {
       dismissEasyLoading();
     });
-    BlueManage().blueSendData(BlueManage().connectDeviceName, (BluetoothConnectionState connectionStateState) async {
+    BlueManage().blueSendData(BlueManage().connectDeviceName,
+        (BluetoothConnectionState connectionStateState) async {
       if (connectionStateState == BluetoothConnectionState.connected) {
-        final List<String>? privateKey = await Storage.getStringList(saveBluePrivateKey);
+        final List<String>? privateKey =
+            await Storage.getStringList(saveBluePrivateKey);
         final List<int> getPrivateKeyList =
             changeStringListToIntList(privateKey!);
 
         final List<String>? token = await Storage.getStringList(saveBlueToken);
         final List<int> getTokenList = changeStringListToIntList(token!);
 
-        final List<String>? publicKey = await Storage.getStringList(saveBluePublicKey);
+        final List<String>? publicKey =
+            await Storage.getStringList(saveBluePublicKey);
         final List<int> getPublicKeyList =
             changeStringListToIntList(publicKey!);
 
@@ -164,6 +167,7 @@ class DoorLockLogLogic extends BaseGetXController {
 
   /// 刷新门锁日志列表
   StreamSubscription? _getDoorLockLogListRefreshUIEvent;
+
   void _getDoorLockLogListRefreshUIAction() {
     _getDoorLockLogListRefreshUIEvent = eventBus
         .on<DoorLockLogListRefreshUI>()
diff --git a/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart b/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart
index 945a09f6..610912a4 100755
--- a/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart
+++ b/lib/main/lockDetail/passwordKey/passwordKey_perpetual/passwordKey_perpetual_logic.dart
@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
@@ -432,27 +431,31 @@ class PasswordKeyPerpetualLogic extends BaseGetXController {
         break;
       case 1:
         //限时	在开始和结束时间内有效，必需在开始时间24小时内使用一次，否则将失效
-        useDateStr =
-            '类型'.tr + ':' + '限时\n${'有效期'.tr}:${state.beginTime.value} -- ${state.endTime.value}';
+        useDateStr = '类型'.tr +
+            ':' +
+            '限时\n${'有效期'.tr}:${state.beginTime.value} -- ${state.endTime.value}';
         break;
       case 2:
         //单次		只能在开始时间后6小时内使用一次
-        useDateStr =
-            '类型'.tr + ':' + '单次\n${'有效期'.tr}:${state.beginTime.value} -- ${state.endTime.value}';
+        useDateStr = '类型'.tr +
+            ':' +
+            '单次\n${'有效期'.tr}:${state.beginTime.value} -- ${state.endTime.value}';
         break;
       case 3:
         //自定义
         if (state.isPermanent.value == false) {
-          useDateStr =
-              '类型'.tr + ':' + '自定义-限时\n${'有效期'.tr}:${state.customBeginTime.value} -- ${state.customEndTime.value}';
+          useDateStr = '类型'.tr +
+              ':' +
+              '自定义-限时\n${'有效期'.tr}:${state.customBeginTime.value} -- ${state.customEndTime.value}';
         } else {
           useDateStr = '类型:自定义-永久'.tr;
         }
         break;
       case 4:
         //周未循环	在周未开始和结束时间指定时间段内有效
-        useDateStr =
-            '类型'.tr + ':' + '循环\n${state.loopModeStr.value} ${state.loopEffectiveDate.value}:00-${state.loopFailureDate.value}';
+        useDateStr = '类型'.tr +
+            ':' +
+            '循环\n${state.loopModeStr.value} ${state.loopEffectiveDate.value}:00-${state.loopFailureDate.value}';
         break;
       case 5:
         //删除	4	在锁上使用后会删除之前在锁上使用过的密码