From 539cef3ac4bb3bcbb0d2dc51325c963ab751174d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=B0=91=E9=98=B3?= <786612630@qq.com> Date: Tue, 25 Jun 2024 16:10:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=87=E7=BA=B9=E3=80=81?= =?UTF-8?q?=E5=8D=A1=E3=80=81=E4=BA=BA=E8=84=B8=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?/=E9=87=8D=E7=BD=AE=E4=B9=8B=E5=89=8D=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E7=BD=91=E7=BB=9C=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lockDetail/card/cardDetail/cardDetail_page.dart | 6 +++++- lib/main/lockDetail/card/cardList/cardList_page.dart | 11 +++++++++-- .../lockDetail/face/faceDetail/faceDetail_page.dart | 6 +++++- lib/main/lockDetail/face/faceList/faceList_page.dart | 11 ++++++++++- .../fingerprintDetail/fingerprintDetail_page.dart | 6 +++++- .../fingerprintList/fingerprintList_page.dart | 12 +++++++++--- .../passwordKeyDetail/passwordKeyDetail_page.dart | 6 +++++- .../passwordKeyList/passwordKeyList_page.dart | 9 ++++++--- lib/tools/baseGetXController.dart | 7 ------- 9 files changed, 54 insertions(+), 20 deletions(-) diff --git a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart index ca0d70b8..d6d951ca 100755 --- a/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart +++ b/lib/main/lockDetail/card/cardDetail/cardDetail_page.dart @@ -16,6 +16,7 @@ import '../../../../tools/showTipView.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; +import '../../../lockMian/lockMain/lockMain_logic.dart'; import 'cardDetail_logic.dart'; class CardDetailPage extends StatefulWidget { @@ -197,7 +198,10 @@ class _CardDetailPageState extends State with RouteAware { margin: EdgeInsets.only(left: 30.w, right: 30.w, top: 30.w, bottom: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: () { - logic.checkNetworkSituation(); + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog('确定要删除吗?'.tr, () async { state.isDeletCard.value = true; diff --git a/lib/main/lockDetail/card/cardList/cardList_page.dart b/lib/main/lockDetail/card/cardList/cardList_page.dart index 77e5e9d1..6731b623 100755 --- a/lib/main/lockDetail/card/cardList/cardList_page.dart +++ b/lib/main/lockDetail/card/cardList/cardList_page.dart @@ -17,6 +17,7 @@ import '../../../../tools/storage.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; +import '../../../lockMian/lockMain/lockMain_logic.dart'; import '../../fingerprint/fingerprintList/fingerprintListData_entity.dart'; import 'cardList_logic.dart'; @@ -69,7 +70,10 @@ class _CardListPageState extends State with RouteAware { onPressed: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - logic.checkNetworkSituation(); + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog( '重置后，该锁的卡都将被删除哦，确认要重置吗？'.tr, () async { @@ -142,7 +146,10 @@ class _CardListPageState extends State with RouteAware { children: [ SlidableAction( onPressed: (BuildContext context) { - logic.checkNetworkSituation(); + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog( '确定要删除吗?'.tr, () async { diff --git a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart index 73c70435..8ba6a825 100755 --- a/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart +++ b/lib/main/lockDetail/face/faceDetail/faceDetail_page.dart @@ -17,6 +17,7 @@ import '../../../../tools/showTipView.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; +import '../../../lockMian/lockMain/lockMain_logic.dart'; class FaceDetailPage extends StatefulWidget { const FaceDetailPage({Key? key}) : super(key: key); @@ -207,7 +208,10 @@ class _FaceDetailPageState extends State with RouteAware { left: 30.w, right: 30.w, top: 30.w, bottom: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: () { - logic.checkNetworkSituation(); + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog('确定要删除吗?'.tr, () async { diff --git a/lib/main/lockDetail/face/faceList/faceList_page.dart b/lib/main/lockDetail/face/faceList/faceList_page.dart index 614350f4..e923b267 100755 --- a/lib/main/lockDetail/face/faceList/faceList_page.dart +++ b/lib/main/lockDetail/face/faceList/faceList_page.dart @@ -18,6 +18,7 @@ import '../../../../tools/storage.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; +import '../../../lockMian/lockMain/lockMain_logic.dart'; import 'faceList_logic.dart'; class FaceListPage extends StatefulWidget { @@ -67,7 +68,10 @@ class _FaceListPageState extends State with RouteAware { onPressed: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - logic.checkNetworkSituation(); + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } // showDeletAlertDialog(context); ShowTipView().showIosTipWithContentDialog( @@ -181,6 +185,11 @@ class _FaceListPageState extends State with RouteAware { Widget _buildDeleteBtn(FingerprintItemData faceItemData) { return GestureDetector( onTap: () { + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } + // 省略: 弹出是否删除的确认对话框。 ShowTipView().showIosTipWithContentDialog('确定要删除吗?'.tr, () async { state.isDeletAll = false; diff --git a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart index d7cce814..358b4712 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintDetail/fingerprintDetail_page.dart @@ -15,6 +15,7 @@ import '../../../../tools/showTipView.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; +import '../../../lockMian/lockMain/lockMain_logic.dart'; import 'fingerprintDetail_logic.dart'; class FingerprintDetailPage extends StatefulWidget { @@ -211,7 +212,10 @@ class _FingerprintDetailPageState extends State left: 30.w, right: 30.w, top: 30.w, bottom: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: () { - logic.checkNetworkSituation(); + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog('确定要删除吗?'.tr, () async { diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart index 3871fce9..f3e80240 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart @@ -70,7 +70,10 @@ class _FingerprintListPageState extends State onPressed: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - logic.checkNetworkSituation(); + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog( '重置后，该锁的指纹都将被删除哦，确认要重置吗?'.tr, () async { @@ -141,8 +144,11 @@ class _FingerprintListPageState extends State extentRatio: 0.2, motion: const ScrollMotion(), children: [ - SlidableAction( - onPressed: (BuildContext context) { + SlidableAction(onPressed: (BuildContext context) { + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog( '确定要删除吗?'.tr, () async { state.isDeletAll = false; diff --git a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart index 8e3c7b1a..81ff813e 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart @@ -19,6 +19,7 @@ import '../../../../tools/commonItem.dart'; import '../../../../tools/submitBtn.dart'; import '../../../../tools/titleAppBar.dart'; import '../../../../translations/trans_lib.dart'; +import '../../../lockMian/lockMain/lockMain_logic.dart'; class PasswordKeyDetailPage extends StatefulWidget { const PasswordKeyDetailPage({Key? key}) : super(key: key); @@ -243,7 +244,10 @@ class _PasswordKeyDetailPageState extends State left: 30.w, right: 30.w, top: 30.w, bottom: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: () { - logic.checkNetworkSituation(); + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog('确定要删除吗?'.tr, () { state.isDeletPasswordKey.value = true; diff --git a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart index 591c9243..33ccdc4d 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart @@ -68,11 +68,11 @@ class _PasswordKeyListPageState extends State final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { - final bool isNetWork = - LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; if (!isNetWork) { return; } + if (state.itemDataList.isEmpty) { logic.showToast('暂无密码,无需重置'.tr); return; @@ -155,7 +155,10 @@ class _PasswordKeyListPageState extends State children: [ SlidableAction( onPressed: (BuildContext context) { - logic.checkNetworkSituation(); + final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog( '确定要删除吗?'.tr, () async { diff --git a/lib/tools/baseGetXController.dart b/lib/tools/baseGetXController.dart index b26b372c..89f983ea 100755 --- a/lib/tools/baseGetXController.dart +++ b/lib/tools/baseGetXController.dart @@ -177,13 +177,6 @@ class BaseGetXController extends GetxController { }); } - void checkNetworkSituation (){ - final bool isNetWork = LockMainLogic.to()?.judgeTheNetwork() ?? false; - if (!isNetWork) { - return; - } - } - String getUseKeyTypeStr(int? startDate, int? endDate, int? keyType) { String useDateStr = ''; if (keyType == XSConstantMacro.keyTypeTime) {