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 loadMainDataLogic(LockListInfoGroupEntity entity) async { final bool every = entity.groupList?.every((GroupList list) => (list.lockList ?? []).isEmpty) ?? - false; - if ((entity.groupList??[]).isEmpty || every) { + true; + if ((entity.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 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