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.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.delayed(const Duration(milliseconds: 200)).then((e) { - Get.close(1); - }); - } else { - Future.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.delayed(const Duration(milliseconds: 200)).then((e) { + await Future.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()); + }); } }