From 823b268380043b92f97f9d331cd0b00994548364 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Tue, 8 Apr 2025 14:34:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=85=8D=E7=BD=91=E6=97=B6=E8=93=9D?=
 =?UTF-8?q?=E7=89=99=E8=B6=85=E6=97=B6=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=91=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E4=B8=8A=E6=8A=A5=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuringWifi_logic.dart                | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart
index f4688019..c38d4761 100755
--- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart
+++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart
@@ -62,10 +62,8 @@ class ConfiguringWifiLogic extends BaseGetXController {
       peerId: peerId,
     );
     if (entity.errorCode!.codeIsSuccessful) {
-      await _getUploadLockSet();
+
       showToast('配网成功'.tr, something: () async {
-        eventBus
-            .fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
         // 设置锁的peerID
         StartChartManage().lockNetworkInfo = DeviceNetworkInfo(
           wifiName: wifiName,
@@ -74,6 +72,7 @@ class ConfiguringWifiLogic extends BaseGetXController {
           peerId: peerId,
         );
       });
+       _getUploadLockSet();
     }
   }
 
@@ -135,7 +134,7 @@ class ConfiguringWifiLogic extends BaseGetXController {
         // 保存到缓存
         await Storage.saveLockNetWorkInfo(jsonMap);
         // 上报服务器
-         updateNetworkInfo(
+        updateNetworkInfo(
             peerId: peerId ?? '',
             wifiName: wifiName ?? '',
             secretKey: secretKey ?? '',
@@ -231,6 +230,13 @@ class ConfiguringWifiLogic extends BaseGetXController {
             password: state.wifiPWDController.text,
             gatewayConfigurationStr: state.getGatewayConfigurationStr,
           );
+        } else if (connectionState == BluetoothConnectionState.disconnected) {
+          dismissEasyLoading();
+          cancelBlueConnetctToastTimer();
+          state.sureBtnState.value = 0;
+          if (state.ifCurrentScreen.value == true) {
+            showBlueConnetctToast();
+          }
         }
       },
       isAddEquipment: true,
@@ -391,10 +397,10 @@ class ConfiguringWifiLogic extends BaseGetXController {
 
   // 上传数据获取设置
   Future<void> _getUploadLockSet() async {
-    showEasyLoading();
-    showBlueConnetctToastTimer(action: () {
-      dismissEasyLoading();
-    });
+    // showEasyLoading();
+    // showBlueConnetctToastTimer(action: () {
+    //   dismissEasyLoading();
+    // });
     BlueManage().blueSendData(BlueManage().connectDeviceName,
         (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
@@ -476,6 +482,8 @@ class ConfiguringWifiLogic extends BaseGetXController {
         Get.offAllNamed(Routers.starLockMain);
       }
       dismissEasyLoading();
+      eventBus
+          .fire(PassCurrentLockInformationEvent(state.lockSetInfoData.value));
       if (state.loadingTimer != null) {
         state.loadingTimer!.cancel();
         state.loadingTimer = null;
@@ -493,6 +501,5 @@ class ConfiguringWifiLogic extends BaseGetXController {
       state.loadingTimer!.cancel();
       state.loadingTimer = null;
     }
-
   }
 }