From 178dbdb93784dbc96a73fd90da1cac8a107a61d7 Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Tue, 18 Jun 2024 15:01:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E4=BC=9A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=97=A0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/main/lockMian/lockMain/lockMain_logic.dart | 10 +++++-----
 lib/main/lockMian/lockMain/lockMain_page.dart  | 12 +++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart
index 1ea35672..d1ee9dc2 100755
--- a/lib/main/lockMian/lockMain/lockMain_logic.dart
+++ b/lib/main/lockMian/lockMain/lockMain_logic.dart
@@ -36,16 +36,16 @@ class LockMainLogic extends BaseGetXController {
       isUnShowLoading: isUnShowLoading,
     );
     if (entity.errorCode!.codeIsSuccessful) {
-      loadMainDataLogic(entity.data!);
+     await loadMainDataLogic(entity.data!);
     }
     return entity;
   }
 
-  void loadMainDataLogic(LockListInfoGroupEntity entity) {
+  Future<void> loadMainDataLogic(LockListInfoGroupEntity entity) async {
     final bool every = entity.groupList?.every((GroupList list) =>
             (list.lockList ?? <LockListInfoItemEntity>[]).isEmpty) ??
-        false;
-    if ((entity.groupList??<GroupList>[]).isEmpty || every) {
+        true;
+    if ((entity.groupList ?? <GroupList>[]).isEmpty || every) {
       state.dataLength.value = 0;
     } else if (entity.groupList!.length == 1) {
       final GroupList groupList = entity.groupList![0];
@@ -71,7 +71,7 @@ class LockMainLogic extends BaseGetXController {
         }
       });
     }
-    Storage.saveMainListData(entity);
+    await Storage.saveMainListData(entity);
   }
 
   /// 获取联网类型
diff --git a/lib/main/lockMian/lockMain/lockMain_page.dart b/lib/main/lockMian/lockMain/lockMain_page.dart
index b5532c6a..3be70607 100755
--- a/lib/main/lockMian/lockMain/lockMain_page.dart
+++ b/lib/main/lockMian/lockMain/lockMain_page.dart
@@ -45,27 +45,25 @@ class _StarLockMainPageState extends State<StarLockMainPage>
         await Storage.getLockMainListData();
     if (lockListInfoGroupEntity != null) {
       logic.loadMainDataLogic(lockListInfoGroupEntity);
+      setState(() {});
     }
     lockListInfoGroupEntity =
         (await logic.getStarLockInfo(isUnShowLoading: isUnShowLoading)).data;
     if (lockListInfoGroupEntity != null) {
       logic.loadMainDataLogic(lockListInfoGroupEntity);
+      setState(() {});
     }
     if (clearScanDevices) {
       BlueManage().scanDevices.clear();
     }
-    setState(() {});
   }
 
   @override
   void initState() {
     super.initState();
-    WidgetsBinding.instance.addPostFrameCallback((_) async {
-      logic.pageNo = 1;
-      getHttpData();
-      _initLoadDataAction();
-      setState(() {});
-    });
+    logic.pageNo = 1;
+    getHttpData();
+    _initLoadDataAction();
   }
 
   @override