From 3e6868c39512adda68f495db8a8bbb4b03eb6197 Mon Sep 17 00:00:00 2001 From: anfe <448468458@qq.com> Date: Fri, 7 Jun 2024 11:39:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=9C=AA=E5=8A=A0=E8=BD=BD=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 8196 -> 8196 bytes .../lockMian/lockMain/lockMain_logic.dart | 7 --- lib/main/lockMian/lockMain/lockMain_page.dart | 48 +++++++----------- lib/tools/EasyRefreshTool.dart | 1 - 4 files changed, 18 insertions(+), 38 deletions(-) diff --git a/.DS_Store b/.DS_Store index 3035c4ed779c60f0963863631eba7089bc783d7d..2e1f43b30d6f6ee3763f1adbbe77a14a8a743420 100755 GIT binary patch delta 73 zcmZp1XmQw}D$KZj@*BZIHSy|dQ)3ey1tYUs9ffL3BLf`;6H}wwT22m8Wqs?Q`0SkA dy!_6|`-J5gyEfkw)@0etCh?tR^FI-GW&lK@7WDuC delta 43 zcmZp1XmQw}Dm?kMU@3=%p|OsFiJ8gdg~HO4n}t+1KM+=9*~~8Sjb-y65q4$(I-m|3 diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index 7b006eb1..f658cffa 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -30,14 +30,7 @@ class LockMainLogic extends BaseGetXController { if (entity.errorCode!.codeIsSuccessful) { loadMainDataLogic(entity.data!); Storage.saveMainListData(entity.data!); - // return entity.data!; } - // else { - // // showToast("数据请求失败"); - // // state.dataLength.value = 0; - // LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData(); - // loadMainDataLogic(lockListInfoGroupEntity!); - // } return entity; } diff --git a/lib/main/lockMian/lockMain/lockMain_page.dart b/lib/main/lockMian/lockMain/lockMain_page.dart index ffa55bf2..46aec398 100755 --- a/lib/main/lockMian/lockMain/lockMain_page.dart +++ b/lib/main/lockMian/lockMain/lockMain_page.dart @@ -6,6 +6,7 @@ import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/blue/blue_manage.dart'; import 'package:star_lock/main/lockMian/lockList/lockList_xhj_page.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_state.dart'; import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/submitBtn.dart'; @@ -33,24 +34,26 @@ class StarLockMainPage extends StatefulWidget { State createState() => _StarLockMainPageState(); } -class _StarLockMainPageState extends State with BaseWidget ,AutomaticKeepAliveClientMixin { - final logic = Get.put(LockMainLogic()); - final state = Get.find().state; +class _StarLockMainPageState extends State + with BaseWidget, AutomaticKeepAliveClientMixin { + final LockMainLogic logic = Get.put(LockMainLogic()); + final LockMainState state = Get.find().state; Future getHttpData( {bool clearScanDevices = false, bool isUnShowLoading = false}) async { LockListInfoGroupEntity? lockListInfoGroupEntity = await Storage.getLockMainListData(); if (lockListInfoGroupEntity != null) { - var localLockListInfoGroupEntity = lockListInfoGroupEntity; - logic.loadMainDataLogic(localLockListInfoGroupEntity); + logic.loadMainDataLogic(lockListInfoGroupEntity); + } + lockListInfoGroupEntity = + (await logic.getStarLockInfo(isUnShowLoading: isUnShowLoading)).data; + if (lockListInfoGroupEntity != null) { + logic.loadMainDataLogic(lockListInfoGroupEntity); } - await logic.getStarLockInfo(isUnShowLoading: isUnShowLoading); - await Future.delayed(const Duration(milliseconds: 200)); if (clearScanDevices) { BlueManage().scanDevices.clear(); } - WidgetsBinding.instance.addPostFrameCallback((_) async { setState(() {}); }); @@ -93,7 +96,7 @@ class _StarLockMainPageState extends State with BaseWidget ,Au haveBack: false, haveOtherLeftWidget: true, leftWidget: Builder( - builder: (context) => IconButton( + builder: (BuildContext context) => IconButton( icon: Image.asset( 'images/main/mainLeft_menu_icon.png', color: Colors.white, @@ -125,23 +128,6 @@ class _StarLockMainPageState extends State with BaseWidget ,Au fit: BoxFit.cover, ), ), - // decoration: BoxDecoration( - // // 设置渐变 - // gradient: LinearGradient( - // // 渐变颜色列表 - // colors: [ - // AppColors.mainColor.withOpacity(0.8), // 左上角颜色 - // AppColors.mainColor.withOpacity(0.4), // 右上角颜色 - // Colors.white, // 右下角颜色 - // Colors.white, // 左下角颜色 - // ], - // // 渐变的起始和结束位置 - // begin: Alignment.topLeft, - // end: Alignment.bottomRight, - // // 颜色停靠点，对应颜色数组的索引位置 - // stops: [0.0, 0.23, 0.47, 1], - // ), - // ), child: child, )); return child; @@ -189,16 +175,16 @@ class _StarLockMainPageState extends State with BaseWidget ,Au Widget unHaveData() { return ListView( - children: [ + children: [ Column( mainAxisAlignment: MainAxisAlignment.center, - children: [ + children: [ SizedBox( height: 160.h, ), Row( mainAxisAlignment: MainAxisAlignment.center, - children: [ + children: [ SizedBox( width: 330.w, child: InkWell( @@ -255,7 +241,9 @@ class _StarLockMainPageState extends State with BaseWidget ,Au late StreamSubscription _teamEvent; void _initLoadDataAction() { - _teamEvent = eventBus.on().listen((event) { + _teamEvent = eventBus + .on() + .listen((RefreshLockListInfoDataEvent event) { logic.pageNo = 1; getHttpData( clearScanDevices: event.clearScanDevices, diff --git a/lib/tools/EasyRefreshTool.dart b/lib/tools/EasyRefreshTool.dart index 1a086fa4..f754a6fd 100755 --- a/lib/tools/EasyRefreshTool.dart +++ b/lib/tools/EasyRefreshTool.dart @@ -36,7 +36,6 @@ class _EasyRefreshToolState extends State { @override void initState() { - // TODO: implement initState super.initState(); _controller = EasyRefreshController(); }