From 70d549d04d9073787e3c6f252b56ccccaf88d41e Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Tue, 25 Mar 2025 14:05:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=91?=
 =?UTF-8?q?=E5=90=8E=E7=9A=84=E5=86=8D=E6=AC=A1=E8=AF=BB=E5=8F=96=E4=B8=80?=
 =?UTF-8?q?=E9=81=8D=E4=B8=8A=E4=BC=A0=E4=B8=80=E9=81=8D=E9=94=81=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuringWifi_logic.dart                | 39 ++++++++++---------
 .../configuringWifi/configuringWifi_page.dart | 17 +++++---
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart
index ca0be0d9..4373a087 100755
--- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart
+++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart
@@ -72,17 +72,6 @@ class ConfiguringWifiLogic extends BaseGetXController {
           secretKey: secretKey,
           peerId: peerId,
         );
-
-        if (state.pageName.value == 'lockSet') {
-          Get.close(2);
-        } else {
-          Get.offAllNamed(Routers.starLockMain);
-        }
-        dismissEasyLoading();
-        if (state.loadingTimer != null) {
-          state.loadingTimer!.cancel();
-          state.loadingTimer = null;
-        }
       });
     }
   }
@@ -398,8 +387,10 @@ class ConfiguringWifiLogic extends BaseGetXController {
 
   // 上传数据获取设置
   Future<void> _getUploadLockSet() async {
-    // showBlueConnetctToastTimer(action: (){
-    // });
+    showEasyLoading();
+    showBlueConnetctToastTimer(action: () {
+      dismissEasyLoading();
+    });
     BlueManage().blueSendData(BlueManage().connectDeviceName,
         (BluetoothConnectionState connectionState) async {
       if (connectionState == BluetoothConnectionState.connected) {
@@ -408,10 +399,10 @@ class ConfiguringWifiLogic extends BaseGetXController {
 
         _uploadLockSet(getTokenList);
       } else if (connectionState == BluetoothConnectionState.disconnected) {
-        // cancelBlueConnetctToastTimer();
-        // if(state.ifCurrentScreen.value == true){
-        //   showBlueConnetctToast();
-        // }
+        cancelBlueConnetctToastTimer();
+        if (state.ifCurrentScreen.value == true) {
+          showBlueConnetctToast();
+        }
       }
     });
   }
@@ -468,13 +459,23 @@ class ConfiguringWifiLogic extends BaseGetXController {
       required int recordType,
       required List records}) async {
     final LoginEntity entity = await ApiRepository.to.lockDataUpload(
-        lockId: CommonDataManage().currentKeyInfo.lockId!,
+        lockId: state.lockBasicInfo.value.lockId ?? -1,
         uploadType: uploadType,
         recordType: recordType,
         records: records,
         isUnShowLoading: true);
     if (entity.errorCode!.codeIsSuccessful) {
-      update();
+      await Future.delayed((Duration(seconds: 1)));
+      if (state.pageName.value == 'lockSet') {
+        Get.close(2);
+      } else {
+        Get.offAllNamed(Routers.starLockMain);
+      }
+      dismissEasyLoading();
+      if (state.loadingTimer != null) {
+        state.loadingTimer!.cancel();
+        state.loadingTimer = null;
+      }
     }
   }
 
diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart
index 1e6d6ac4..ed653308 100755
--- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart
+++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_page.dart
@@ -44,12 +44,17 @@ class _ConfiguringWifiPageState extends State<ConfiguringWifiPage>
             SizedBox(
               height: 50.h,
             ),
-            SubmitBtn(
-              btnName: '确定'.tr,
-              onClick: () {
-                FocusScope.of(context).requestFocus(FocusNode());
-                logic.senderConfiguringWifiAction();
-              },
+            Obx(
+              () => SubmitBtn(
+                btnName: '确定'.tr,
+                isDisabled: state.isLoading.isFalse,
+                onClick: state.isLoading.isTrue
+                    ? null
+                    : () {
+                        FocusScope.of(context).requestFocus(FocusNode());
+                        logic.senderConfiguringWifiAction();
+                      },
+              ),
             ),
             SizedBox(
               height: 20.h,