From 9f2c0491472f36fe7270fb95b20c288c33159041 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 13 Jun 2025 14:01:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=EF=BC=88=E5=88=A4=E6=96=AD=E8=81=94?= =?UTF-8?q?=E7=BD=91=EF=BC=89=E8=B0=83=E6=95=B4=E5=88=A4=E6=96=AD=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E7=8A=B6=E6=80=81=E6=96=B9=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/cardList/cardList_page.dart | 9 +- .../electronicKeyDetail_page.dart | 4 +- .../electronicKeyList_page.dart | 3 +- .../face/faceList/faceList_page.dart | 6 +- .../fingerprintList/fingerprintList_page.dart | 6 +- .../iris/irisList/irisList_page.dart | 84 +++++++++---------- .../lockDetail/lockDetail_page.dart | 2 +- .../uploadElectricQuantity_page.dart | 59 +++++++------ .../burglarAlarm/burglarAlarm_page.dart | 30 ++++--- .../lockSet/lockSet/lockSet_page.dart | 3 +- .../palm/palmList/palmList_page.dart | 4 +- .../passwordKeyList/passwordKeyList_page.dart | 2 +- .../remoteControlDetail_page.dart | 2 +- .../remoteControlList_page.dart | 4 +- .../minePersonInfoResetPassword_page.dart | 2 +- 15 files changed, 107 insertions(+), 113 deletions(-) diff --git a/lib/main/lockDetail/card/cardList/cardList_page.dart b/lib/main/lockDetail/card/cardList/cardList_page.dart index f5fe77e1..b0a8c38b 100755 --- a/lib/main/lockDetail/card/cardList/cardList_page.dart +++ b/lib/main/lockDetail/card/cardList/cardList_page.dart @@ -69,8 +69,7 @@ class _CardListPageState extends State with RouteAware { onPressed: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -148,8 +147,7 @@ class _CardListPageState extends State with RouteAware { SlidableAction( onPressed: (BuildContext context) async { final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? - false; + await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -180,7 +178,8 @@ class _CardListPageState extends State with RouteAware { arguments: { 'fingerprintItemData': fingerprintItemData, })! - .then((value) => logic.getICCardListData(isRefresh: true)); + .then((value) => + logic.getICCardListData(isRefresh: true)); // if (data != null) { // logic.getICCardListData(isRefresh: true); // } diff --git a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart index 8b4d1fac..e292cfb9 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyDetail/electronicKeyDetail/electronicKeyDetail_page.dart @@ -335,7 +335,7 @@ class _ElectronicKeyDetailPageState extends State { thumbColor: CupertinoColors.white, value: state.isRemoteUnlock.value, onChanged: (bool value) async { - final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -352,7 +352,7 @@ class _ElectronicKeyDetailPageState extends State { thumbColor: CupertinoColors.white, value: state.onlyManageYouCreatesUser.value, onChanged: (bool value) async { - final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } diff --git a/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart b/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart index c10bcd24..99d2b728 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart @@ -68,8 +68,7 @@ class _ElectronicKeyListPageState extends State { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } diff --git a/lib/main/lockDetail/face/faceList/faceList_page.dart b/lib/main/lockDetail/face/faceList/faceList_page.dart index 43248d26..461f8434 100755 --- a/lib/main/lockDetail/face/faceList/faceList_page.dart +++ b/lib/main/lockDetail/face/faceList/faceList_page.dart @@ -48,8 +48,7 @@ class _FaceListPageState extends State with RouteAware { onPressed: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -160,8 +159,7 @@ class _FaceListPageState extends State with RouteAware { Widget _buildDeleteBtn(FingerprintItemData faceItemData) { return GestureDetector( onTap: () async { - final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart index 15c16dbd..81b07930 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart @@ -54,8 +54,7 @@ class _FingerprintListPageState extends State onPressed: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -133,8 +132,7 @@ class _FingerprintListPageState extends State SlidableAction( onPressed: (BuildContext context) async { final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? - false; + await logic.isConnected() ?? false; if (!isNetWork) { return; } diff --git a/lib/main/lockDetail/iris/irisList/irisList_page.dart b/lib/main/lockDetail/iris/irisList/irisList_page.dart index 8b63e481..93177784 100755 --- a/lib/main/lockDetail/iris/irisList/irisList_page.dart +++ b/lib/main/lockDetail/iris/irisList/irisList_page.dart @@ -1,4 +1,3 @@ - import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -46,8 +45,7 @@ class _IrisListPageState extends State { onPressed: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -80,11 +78,11 @@ class _IrisListPageState extends State { // "lockId": state.lockId.value, // "fromType": 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入 // }); - final data = - await Get.toNamed(Routers.addIrisTypeManagePage, arguments: { - 'lockId': state.lockId.value, - 'fromType': 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入 - }); + final data = await Get.toNamed(Routers.addIrisTypeManagePage, + arguments: { + 'lockId': state.lockId.value, + 'fromType': 1 // 1从添加钥匙列表进入 2从考勤添加员工入口进入 + }); if (data != null) { // logic.getFaceListData(); } @@ -130,10 +128,10 @@ class _IrisListPageState extends State { // ? "永久" // : "${DateTool().dateToYMDHNString(fingerprintItemData.startDate.toString())} - ${DateTool().dateToYMDHNString(fingerprintItemData.endDate.toString())}", () async { - final data = - await Get.toNamed(Routers.faceDetailPage, arguments: { - 'faceItemData': getFaceItemData, - }); + final data = await Get.toNamed(Routers.faceDetailPage, + arguments: { + 'faceItemData': getFaceItemData, + }); if (data != null) { // logic.getFaceListData(); } @@ -254,35 +252,35 @@ class _IrisListPageState extends State { ); } - // void showDeletAlertDialog(BuildContext context) { - // showCupertinoDialog( - // context: context, - // builder: (BuildContext context) { - // return CupertinoAlertDialog( - // title: const Text('提示'), - // content: const Text('重置后，该锁的人脸都将被删除哦，确认要重置吗？'), - // actions: [ - // CupertinoDialogAction( - // child: Text('取消'.tr), - // onPressed: () { - // Navigator.pop(context); - // }, - // ), - // CupertinoDialogAction( - // child: Text('确定'.tr), - // onPressed: () { - // Navigator.pop(context); - // state.isDeletFaceData = true; - // state.isDeletAll = true; - // state.deletKeyID = '1'; - // state.deletUserID = 'DeleteAll!@#'; - // state.deletFaceNo = 255; - // // logic.senderAddFace(); - // }, - // ), - // ], - // ); - // }, - // ); - // } +// void showDeletAlertDialog(BuildContext context) { +// showCupertinoDialog( +// context: context, +// builder: (BuildContext context) { +// return CupertinoAlertDialog( +// title: const Text('提示'), +// content: const Text('重置后，该锁的人脸都将被删除哦，确认要重置吗？'), +// actions: [ +// CupertinoDialogAction( +// child: Text('取消'.tr), +// onPressed: () { +// Navigator.pop(context); +// }, +// ), +// CupertinoDialogAction( +// child: Text('确定'.tr), +// onPressed: () { +// Navigator.pop(context); +// state.isDeletFaceData = true; +// state.isDeletAll = true; +// state.deletKeyID = '1'; +// state.deletUserID = 'DeleteAll!@#'; +// state.deletFaceNo = 255; +// // logic.senderAddFace(); +// }, +// ), +// ], +// ); +// }, +// ); +// } } diff --git a/lib/main/lockDetail/lockDetail/lockDetail_page.dart b/lib/main/lockDetail/lockDetail/lockDetail_page.dart index f7605c48..55dae498 100755 --- a/lib/main/lockDetail/lockDetail/lockDetail_page.dart +++ b/lib/main/lockDetail/lockDetail/lockDetail_page.dart @@ -1432,7 +1432,7 @@ class _LockDetailPageState extends State //如果需要实名认证，需认证完成，方可开锁 Future isNeedRealNameAuthThenOpenLock() async { - final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; final bool isOpenLockNeedOnline = state.isOpenLockNeedOnline.value == 0; if (!isOpenLockNeedOnline && !isNetWork) { return; diff --git a/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart b/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart index a377545a..e7a35262 100755 --- a/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart +++ b/lib/main/lockDetail/lockSet/basicInformation/uploadElectricQuantity/uploadElectricQuantity_page.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -22,9 +21,12 @@ class UploadElectricQuantityPage extends StatefulWidget { _UploadElectricQuantityPageState(); } -class _UploadElectricQuantityPageState extends State with RouteAware { - final UploadElectricQuantityLogic logic = Get.put(UploadElectricQuantityLogic()); - final UploadElectricQuantityState state = Get.find().state; +class _UploadElectricQuantityPageState extends State + with RouteAware { + final UploadElectricQuantityLogic logic = + Get.put(UploadElectricQuantityLogic()); + final UploadElectricQuantityState state = + Get.find().state; @override Widget build(BuildContext context) { @@ -42,7 +44,8 @@ class _UploadElectricQuantityPageState extends State mainAxisAlignment: MainAxisAlignment.start, children: [ Expanded( - child: Text('电量信息可以通过网关远程更新，或通过手机蓝牙在锁旁边更新'.tr, + child: Text( + '电量信息可以通过网关远程更新，或通过手机蓝牙在锁旁边更新'.tr, style: TextStyle(fontSize: 20.sp), )), ], @@ -51,39 +54,42 @@ class _UploadElectricQuantityPageState extends State height: 40.h, ), Obx(() => Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Expanded( - child: Text( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Expanded( + child: Text( "${"电池1电量".tr}:${state.lockBasicInfo.value.electricQuantity ?? ""}%", style: TextStyle(fontSize: 20.sp), )), - ], - )), + ], + )), Visibility( - visible: (state.lockSetInfoData.value.lockFeature ?? LockFeature()).isSupportBackupBattery == 1, + visible: + (state.lockSetInfoData.value.lockFeature ?? LockFeature()) + .isSupportBackupBattery == + 1, child: Obx(() => Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Expanded( - child: Text( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Expanded( + child: Text( "${"电池2电量".tr}:${state.lockBasicInfo.value.electricQuantityStandby ?? ""}%", style: TextStyle(fontSize: 20.sp), )), - ], - )), + ], + )), ), SizedBox(height: 10.h), Obx(() => Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Expanded( - child: Text( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Expanded( + child: Text( "${"电量更新时间".tr}:${state.uploadElectricQuantityDate.value == 0 ? "-" : DateTool().dateToYMDHNString(state.uploadElectricQuantityDate.value.toString())}", style: TextStyle(fontSize: 20.sp), )), - ], - )), + ], + )), SizedBox( height: 30.h, ), @@ -94,7 +100,7 @@ class _UploadElectricQuantityPageState extends State // margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w), padding: EdgeInsets.only(top: 20.w, bottom: 20.w), onClick: () async { - final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -102,8 +108,7 @@ class _UploadElectricQuantityPageState extends State }), ], ), - ) - ); + )); } @override diff --git a/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart b/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart index 451405ee..a542f147 100755 --- a/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart +++ b/lib/main/lockDetail/lockSet/burglarAlarm/burglarAlarm_page.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -19,7 +18,7 @@ class BurglarAlarmPage extends StatefulWidget { State createState() => _BurglarAlarmPageState(); } -class _BurglarAlarmPageState extends State with RouteAware{ +class _BurglarAlarmPageState extends State with RouteAware { final BurglarAlarmLogic logic = Get.put(BurglarAlarmLogic()); final BurglarAlarmState state = Get.find().state; @@ -49,27 +48,28 @@ class _BurglarAlarmPageState extends State with RouteAware{ height: 20.h, ), Obx(() => Row( - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Expanded( - child: Text( - "${"当前模式".tr} : ${state.burglarAlarmEnable.value == 1 ? '已开启'.tr : '已关闭'.tr}", - style: - TextStyle(fontSize: 22.sp, fontWeight: FontWeight.w600), + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Expanded( + child: Text( + "${"当前模式".tr} : ${state.burglarAlarmEnable.value == 1 ? '已开启'.tr : '已关闭'.tr}", + style: TextStyle( + fontSize: 22.sp, fontWeight: FontWeight.w600), )), - ], - )), + ], + )), SizedBox( height: 40.h, ), Obx(() => SubmitBtn( - btnName: state.burglarAlarmEnable.value == 1 ? '关闭'.tr : '开启'.tr, + btnName: + state.burglarAlarmEnable.value == 1 ? '关闭'.tr : '开启'.tr, borderRadius: 20.w, fontSize: 32.sp, // margin: EdgeInsets.only(left: 03.w, right: 30.w, top: 20.w), padding: EdgeInsets.only(top: 20.w, bottom: 20.w), onClick: () async { - final bool isNetWork = await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -77,8 +77,7 @@ class _BurglarAlarmPageState extends State with RouteAware{ })), ], ), - ) - ); + )); } @override @@ -137,5 +136,4 @@ class _BurglarAlarmPageState extends State with RouteAware{ state.ifCurrentScreen.value = false; state.sureBtnState.value = 0; } - } diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index f11e9624..e4d22536 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -182,8 +182,7 @@ class _LockSetPageState extends State // logic.deletLockInfoData(); // showDeletAlertDialog(context); // showDeletPasswordAlertDialog(context); - final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected() ?? false; if (!isNetWork) { return; } diff --git a/lib/main/lockDetail/palm/palmList/palmList_page.dart b/lib/main/lockDetail/palm/palmList/palmList_page.dart index b1336f25..3b40134e 100755 --- a/lib/main/lockDetail/palm/palmList/palmList_page.dart +++ b/lib/main/lockDetail/palm/palmList/palmList_page.dart @@ -68,7 +68,7 @@ class _PalmListPageState extends State with RouteAware { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -143,7 +143,7 @@ class _PalmListPageState extends State with RouteAware { SlidableAction( onPressed: (BuildContext context) async { final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? + await logic.isConnected() ?? false; if (!isNetWork) { return; diff --git a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart index 37ae6d45..c35b7ed2 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart @@ -156,7 +156,7 @@ class _PasswordKeyListPageState extends State SlidableAction( onPressed: (BuildContext context) async { final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? + await logic.isConnected() ?? false; if (!isNetWork) { return; diff --git a/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart b/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart index f0ad4e40..07ffd552 100755 --- a/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart +++ b/lib/main/lockDetail/remoteControl/remoteControlDetail/remoteControlDetail_page.dart @@ -207,7 +207,7 @@ class _RemoteControlDetailPageState extends State with padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: () async { final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + await logic.isConnected() ?? false; if (!isNetWork) { return; } diff --git a/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart b/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart index 0fdfee6e..b5357604 100755 --- a/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart +++ b/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart @@ -68,7 +68,7 @@ class _RemoteControlListPageState extends State with Rout final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + await logic.isConnected() ?? false; if (!isNetWork) { return; } @@ -144,7 +144,7 @@ class _RemoteControlListPageState extends State with Rout SlidableAction( onPressed: (BuildContext context) async { final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? + await logic.isConnected() ?? false; if (!isNetWork) { return; diff --git a/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart b/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart index 94718501..7c3a7ae6 100755 --- a/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart +++ b/lib/mine/minePersonInfo/minePersonInfoResetPassword/minePersonInfoResetPassword_page.dart @@ -62,7 +62,7 @@ class _MinePersonInfoResetPasswordPageState onClick: state.canSub.value ? () async { final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? + await logic.isConnected() ?? false; if (!isNetWork) { return;