From 9ea328968ad6bee618b42ee6eaeb1976c797f181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com>
Date: Mon, 28 Oct 2024 11:53:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=93=9D=E7=89=99?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../doorLockLog/doorLockLog_logic.dart        | 20 +++++++------------
 .../doorLockLog/doorLockLog_page.dart         |  2 +-
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
index cb2e84a4..c9733078 100755
--- a/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
+++ b/lib/main/lockDetail/doorLockLog/doorLockLog_logic.dart
@@ -138,9 +138,8 @@ class DoorLockLogLogic extends BaseGetXController {
       privateKey: getPrivateKeyList,
     ).toString();
 
-    showEasyLoading();
-    showBlueConnetctToastTimer(action: () async {
-      dismissEasyLoading();
+    showBlueConnetctToastTimer(isShowBlueConnetctToast:false, action: () async {
+      cancelBlueConnetctToastTimer();
 
       final String getMobile = (await Storage.getMobile())!;
       UmengCommonSdk.onEvent('check_doorLockLog', {
@@ -156,10 +155,8 @@ class DoorLockLogLogic extends BaseGetXController {
           eventStr: '查询锁记录事件超时',
           upload: true
       );
-
     });
-    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<int> getPrivateKeyList = changeStringListToIntList(privateKey!);
@@ -182,9 +179,7 @@ class DoorLockLogLogic extends BaseGetXController {
           publicKey: getPublicKeyList,
           privateKey: getPrivateKeyList,
         );
-      } else if (connectionStateState ==
-          BluetoothConnectionState.disconnected) {
-        dismissEasyLoading();
+      } else if (connectionStateState == BluetoothConnectionState.disconnected) {
         cancelBlueConnetctToastTimer();
 
         final String getMobile = (await Storage.getMobile())!;
@@ -201,9 +196,6 @@ class DoorLockLogLogic extends BaseGetXController {
             eventStr: '查询锁记录事件断开连接',
             upload: true
         );
-        if (state.ifCurrentScreen.value == true) {
-          showBlueConnetctToast();
-        }
       }
     });
   }
@@ -254,6 +246,7 @@ class DoorLockLogLogic extends BaseGetXController {
           .millisecondsSinceEpoch;
 
       pageNo = 1;
+      AppLog.log('_getDoorLockLogListRefreshUIAction');
       mockNetworkDataRequest(isRefresh: true);
     });
   }
@@ -336,9 +329,10 @@ class DoorLockLogLogic extends BaseGetXController {
     // 获取是否是演示模式 演示模式不获取接口
     final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
     if (isDemoMode == false) {
+      mockNetworkDataRequest(isRefresh: true);
+
       getLockRecordLastUploadDataTime();
       _initReplySubscription();
-      mockNetworkDataRequest(isRefresh: true);
     }
   }
 
diff --git a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
index 3221ec45..9775feda 100755
--- a/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
+++ b/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
@@ -124,7 +124,7 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> with RouteAware {
     switch (value) {
       case '读取记录':
         {
-          logic.mockNetworkDataRequest(isRefresh: true);
+          logic.getLockRecordLastUploadDataTime();
         }
         break;
       case '清空记录':