From 8d27d592b7f86199213efe40f4e67a3b790b5749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com>
Date: Wed, 17 Apr 2024 15:35:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8C=81=E4=B9=85=E5=8C=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lockMian/lockMain/lockMain_logic.dart     | 20 ++++++++++---------
 .../main/lockMian/lockMain/lockMain_page.dart |  9 +++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart b/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart
index 22da7622..10020b36 100644
--- a/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart
+++ b/star_lock/lib/main/lockMian/lockMain/lockMain_logic.dart
@@ -24,17 +24,18 @@ class LockMainLogic extends BaseGetXController {
       loadMainDataLogic(entity.data!);
       Storage.saveMainListData(entity.data!);
       // return entity.data!;
-    } else {
-      Get.log("首页锁列表请求失败");
-      // showToast("数据请求失败");
-      // state.dataLength.value = 0;
-      LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData();
-      loadMainDataLogic(lockListInfoGroupEntity!);
     }
+    // else {
+    //   Get.log("首页锁列表请求失败");
+    //   // showToast("数据请求失败");
+    //   // state.dataLength.value = 0;
+    //   LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData();
+    //   loadMainDataLogic(lockListInfoGroupEntity!);
+    // }
     return entity;
   }
 
-  loadMainDataLogic(LockListInfoGroupEntity entity){
+  Future<void> loadMainDataLogic(LockListInfoGroupEntity entity){
     if (entity.groupList!.isEmpty) {
       state.dataLength.value = 0;
     } else if (entity.groupList!.length == 1) {
@@ -48,6 +49,7 @@ class LockMainLogic extends BaseGetXController {
       state.dataLength.value = 2;
     }
     state.lockListInfoGroupEntity.value = entity;
+    return Future.value();
   }
 
   /// 获取联网类型
@@ -106,9 +108,9 @@ class LockMainLogic extends BaseGetXController {
 
     // getLockInfo();
     // 设置网络变化监听
-    connectListener();
+    // connectListener();
     // 获取网络连接状态
-    getConnectType();
+    // getConnectType();
   }
 
   @override
diff --git a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart
index 805efc39..f17c22ac 100644
--- a/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart
+++ b/star_lock/lib/main/lockMian/lockMain/lockMain_page.dart
@@ -36,6 +36,15 @@ class _StarLockMainPageState extends State<StarLockMainPage> with BaseWidget {
   final state = Get.find<LockMainLogic>().state;
 
   Future<void> getHttpData() async {
+    LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData();
+    Get.log("lockListInfoGroupEntity:${lockListInfoGroupEntity!.groupList!.length}");
+    if (lockListInfoGroupEntity != null) {
+      logic.loadMainDataLogic(lockListInfoGroupEntity).then((value) {
+        if (mounted) {
+          setState(() {});
+        }
+      });
+    }
     logic.getStarLockInfo().then((LockListInfoEntity value) {
       if (mounted) {
         setState(() {});