From f44c86a5127f67601bf0e01655e8992772523cb5 Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Tue, 4 Jun 2024 15:09:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lockSet/lockSet/lockSet_logic.dart        | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart
index 2729d160..870e4a56 100755
--- a/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart
+++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_logic.dart
@@ -509,6 +509,7 @@ class LockSetLogic extends BaseGetXController {
 
   // 下级界面修改成功后传递数据
   StreamSubscription? _passCurrentLockInformationEvent;
+
   void initLoadDataAction(BlockSetStateCallback blockSetStateCallback) {
     // 蓝牙协议通知传输跟蓝牙之外的数据传输类不一样 eventBus
     _passCurrentLockInformationEvent = eventBus
@@ -567,18 +568,19 @@ class LockSetLogic extends BaseGetXController {
     );
     if (entity.errorCode!.codeIsSuccessful) {
       BlueManage().connectDeviceMacAddress = '';
+      final bool isXHJ = F.isXHJ;
+      final bool isOnlyOneData = state.isOnlyOneData.value == true;
+      await Future<dynamic>.delayed(const Duration(milliseconds: 200))
+          .then((e) {
+        if (isXHJ) {
+          Get.close(3);
+        } else {
+          Get.close(isOnlyOneData ? 1 : 2);
+        }
+      });
       SchedulerBinding.instance.addPostFrameCallback((_) {
         eventBus.fire(RefreshLockListInfoDataEvent());
       });
-      if (state.isOnlyOneData.value == true) {
-        Future<dynamic>.delayed(const Duration(milliseconds: 200)).then((e) {
-          Get.close(1);
-        });
-      } else {
-        Future<dynamic>.delayed(const Duration(milliseconds: 200)).then((e) {
-          Get.close(2);
-        });
-      }
     }
   }
 
@@ -591,12 +593,10 @@ class LockSetLogic extends BaseGetXController {
             state.deleteAdministratorIsHaveAllData.value == true ? 1 : 0);
     if (entity.errorCode!.codeIsSuccessful) {
       BlueManage().connectDeviceMacAddress = '';
-      SchedulerBinding.instance.addPostFrameCallback((_) {
-        eventBus.fire(RefreshLockListInfoDataEvent());
-      });
+
       final bool isXHJ = F.isXHJ;
       final bool isOnlyOneData = state.isOnlyOneData.value == true;
-      Future<dynamic>.delayed(const Duration(milliseconds: 200)).then((e) {
+      await Future<dynamic>.delayed(const Duration(milliseconds: 200)).then((e) {
         if (isXHJ) {
           Get.close(3);
         } else {
@@ -604,6 +604,9 @@ class LockSetLogic extends BaseGetXController {
           Get.close(onlyOneDataInt);
         }
       });
+      SchedulerBinding.instance.addPostFrameCallback((_) {
+        eventBus.fire(RefreshLockListInfoDataEvent());
+      });
     }
   }