From cf2fd775ec33240eb99860739eb5b8d08138ba63 Mon Sep 17 00:00:00 2001
From: liyi <m18269109817@163.com>
Date: Mon, 12 May 2025 09:59:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=94=81=E4=B9=8B=E5=90=8E=E4=B8=8D=E5=87=BA=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuringWifi_logic.dart                |  1 +
 .../lockMian/lockList/lockList_logic.dart     | 13 ++++++++-
 .../lockMian/lockMain/lockMain_logic.dart     | 29 ++++++++++---------
 lib/tools/eventBusEventManage.dart            |  9 ++++++
 4 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart
index 76cc2bf4..7b266390 100755
--- a/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart
+++ b/lib/main/lockDetail/lockSet/configuringWifi/configuringWifi/configuringWifi_logic.dart
@@ -189,6 +189,7 @@ class ConfiguringWifiLogic extends BaseGetXController {
                 Get.offAllNamed(Routers.starLockMain);
               }
               eventBus.fire(SuccessfulDistributionNetwork());
+              eventBus.fire(RefreshLockListInfoDataEvent());
             });
 
             // 获取锁设置
diff --git a/lib/main/lockMian/lockList/lockList_logic.dart b/lib/main/lockMian/lockList/lockList_logic.dart
index 4ecd4e62..76a9bb2b 100755
--- a/lib/main/lockMian/lockList/lockList_logic.dart
+++ b/lib/main/lockMian/lockList/lockList_logic.dart
@@ -61,7 +61,7 @@ class LockListLogic extends BaseGetXController {
   void setLockListInfoGroupEntity(LockListInfoGroupEntity entity) {
     this.entity = entity;
     // if (entity.pageNo == 1) {
-      _groupDataList = <GroupList>[];
+    _groupDataList = <GroupList>[];
     // }
     _groupDataList.addAll(entity.groupList!);
     update();
@@ -69,6 +69,7 @@ class LockListLogic extends BaseGetXController {
 
   // 监听蓝牙协议返回结果
   late StreamSubscription<Reply> _replySubscription;
+  late StreamSubscription _setLockListInfoGroupEntity;
 
   void _initReplySubscription() {
     _replySubscription =
@@ -336,6 +337,7 @@ class LockListLogic extends BaseGetXController {
   void onReady() {
     super.onReady();
     _initReplySubscription();
+    _initEventHandler();
   }
 
   @override
@@ -348,5 +350,14 @@ class LockListLogic extends BaseGetXController {
   @override
   void onClose() {
     _replySubscription.cancel();
+    _setLockListInfoGroupEntity.cancel();
+  }
+
+  void _initEventHandler() {
+    _setLockListInfoGroupEntity = eventBus
+        .on<SetLockListInfoGroupEntity>()
+        .listen((SetLockListInfoGroupEntity event) async {
+      setLockListInfoGroupEntity(event.lockListInfoGroupEntity);
+    });
   }
 }
diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart
index 802e9bbe..3ac67134 100755
--- a/lib/main/lockMian/lockMain/lockMain_logic.dart
+++ b/lib/main/lockMian/lockMain/lockMain_logic.dart
@@ -132,20 +132,21 @@ class LockMainLogic extends BaseGetXController {
     state.lockListInfoGroupEntity.refresh();
     // AppLog.log('entity:$entity state.lockListInfoGroupEntity.value.groupList!.length:${state.lockListInfoGroupEntity.value.groupList![0].lockList!.length}');
     //检测控制器是否存在
-    if (Get.isRegistered<LockListLogic>()) {
-      //设置控制器数据并刷新
-      // AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity');
-      Get.find<LockListLogic>().setLockListInfoGroupEntity(entity);
-    } else {
-      //延迟加载
-      Future<dynamic>.delayed(200.milliseconds, () {
-        if (Get.isRegistered<LockListLogic>()) {
-          //设置控制器数据并刷新
-          // AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity');
-          Get.find<LockListLogic>().setLockListInfoGroupEntity(entity);
-        }
-      });
-    }
+    eventBus.fire(SetLockListInfoGroupEntity(lockListInfoGroupEntity: entity));
+    // if (Get.isRegistered<LockListLogic>()) {
+    //   //设置控制器数据并刷新
+    //   // AppLog.log('检测控制器是否存 调用了 setLockListInfoGroupEntity');
+    //   Get.find<LockListLogic>().setLockListInfoGroupEntity(entity);
+    // } else {
+    //   //延迟加载
+    //   Future<dynamic>.delayed(500.milliseconds, () {
+    //     if (Get.isRegistered<LockListLogic>()) {
+    //       //设置控制器数据并刷新
+    //       // AppLog.log('检测控制器是否存 延迟调用了 setLockListInfoGroupEntity');
+    //       Get.find<LockListLogic>().setLockListInfoGroupEntity(entity);
+    //     }
+    //   });
+    // }
 
     if (state.dataLength.value == 1) {
       if (Get.isRegistered<LockDetailLogic>()) {
diff --git a/lib/tools/eventBusEventManage.dart b/lib/tools/eventBusEventManage.dart
index 810ad0a6..4c4fbb3d 100755
--- a/lib/tools/eventBusEventManage.dart
+++ b/lib/tools/eventBusEventManage.dart
@@ -1,4 +1,5 @@
 import 'package:event_bus/event_bus.dart';
+import 'package:star_lock/main/lockMian/entity/lockListInfo_entity.dart';
 
 import '../main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
 
@@ -195,6 +196,7 @@ class RogerThatLockInfoDataEvent {
 class GetGatewayListRefreshUI {
   GetGatewayListRefreshUI();
 }
+
 /// 同意隐私协议
 class AgreePrivacyAgreement {
   AgreePrivacyAgreement();
@@ -204,3 +206,10 @@ class AgreePrivacyAgreement {
 class SuccessfulDistributionNetwork {
   SuccessfulDistributionNetwork();
 }
+
+/// 设置锁列表数据
+class SetLockListInfoGroupEntity {
+  SetLockListInfoGroupEntity({required this.lockListInfoGroupEntity});
+
+  LockListInfoGroupEntity lockListInfoGroupEntity;
+}