diff --git a/lib/login/forgetPassword/starLock_forgetPassword_page.dart b/lib/login/forgetPassword/starLock_forgetPassword_page.dart index 3569619a..27e22275 100755 --- a/lib/login/forgetPassword/starLock_forgetPassword_page.dart +++ b/lib/login/forgetPassword/starLock_forgetPassword_page.dart @@ -7,6 +7,7 @@ import 'package:get/get.dart'; import 'package:star_lock/app_settings/app_settings.dart'; import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_logic.dart'; import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_state.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import '../../appRouters.dart'; import '../../app_settings/app_colors.dart'; @@ -23,9 +24,12 @@ class StarLockForgetPasswordPage extends StatefulWidget { _StarLockForgetPasswordPageState(); } -class _StarLockForgetPasswordPageState extends State { - final StarLockForgetPasswordLogic logic = Get.put(StarLockForgetPasswordLogic()); - final StarLockForgetPasswordState state = Get.find().state; +class _StarLockForgetPasswordPageState + extends State { + final StarLockForgetPasswordLogic logic = + Get.put(StarLockForgetPasswordLogic()); + final StarLockForgetPasswordState state = + Get.find().state; @override Widget build(BuildContext context) { @@ -57,7 +61,8 @@ class _StarLockForgetPasswordPageState extends State children: [ SizedBox(width: 5.w), Expanded( - child: Text(TranslationLoader.lanKeys!.countryAndRegion!.tr, + child: Text( + TranslationLoader.lanKeys!.countryAndRegion!.tr, style: TextStyle( fontSize: 26.sp, color: AppColors.blackColor))), SizedBox(width: 20.w), @@ -65,14 +70,14 @@ class _StarLockForgetPasswordPageState extends State mainAxisAlignment: MainAxisAlignment.end, children: [ Obx(() => Text( - '${state.countryName} +${state.countryCode}', - // state.isIphoneType.value - // ? '${state.countryName} +${state.countryCode}' - // : "${state.countryName}", - textAlign: TextAlign.end, - style: TextStyle( - fontSize: 26.sp, color: AppColors.blackColor), - )) + '${state.countryName} +${state.countryCode}', + // state.isIphoneType.value + // ? '${state.countryName} +${state.countryCode}' + // : "${state.countryName}", + textAlign: TextAlign.end, + style: TextStyle( + fontSize: 26.sp, color: AppColors.blackColor), + )) ], ), SizedBox(width: 5.w), @@ -95,14 +100,16 @@ class _StarLockForgetPasswordPageState extends State logic.checkNext(state.phoneController); }, leftWidget: Padding( - padding: EdgeInsets.only(top: 30.w, bottom: 20.w, right: 5.w, left: 5.w), + padding: EdgeInsets.only( + top: 30.w, bottom: 20.w, right: 5.w, left: 5.w), child: Image.asset( 'images/icon_login_account.png', width: 36.w, height: 36.w, ), ), - hintText:TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, + hintText: + TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, keyboardType: TextInputType.number, inputFormatters: [ LengthLimitingTextInputFormatter(30), @@ -232,6 +239,11 @@ class _StarLockForgetPasswordPageState extends State isDisabled: state.canSub.value, onClick: state.canSub.value ? () { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } logic.resetPassword(); } : null); diff --git a/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart b/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart index 0fe04748..ae08975b 100755 --- a/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart +++ b/lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -7,6 +6,7 @@ import 'package:star_lock/appRouters.dart'; import 'package:star_lock/app_settings/app_colors.dart'; import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_logic.dart'; import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_state.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import 'package:star_lock/tools/submitBtn.dart'; import 'package:star_lock/tools/tf_loginInput.dart'; import 'package:star_lock/tools/titleAppBar.dart'; @@ -22,8 +22,10 @@ class StarLockForgetPasswordXHJPage extends StatefulWidget { class _StarLockForgetPasswordPageState extends State { - final StarLockForgetPasswordLogic logic = Get.put(StarLockForgetPasswordLogic()); - final StarLockForgetPasswordState state = Get.find().state; + final StarLockForgetPasswordLogic logic = + Get.put(StarLockForgetPasswordLogic()); + final StarLockForgetPasswordState state = + Get.find().state; @override Widget build(BuildContext context) { @@ -102,7 +104,7 @@ class _StarLockForgetPasswordPageState padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w), ), label: - '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}', + '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}', inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -122,7 +124,7 @@ class _StarLockForgetPasswordPageState padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w), ), label: - '${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}', + '${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}', inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -136,7 +138,7 @@ class _StarLockForgetPasswordPageState }, leftWidget: SizedBox(), hintText: - '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}', + '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}', inputFormatters: [ LengthLimitingTextInputFormatter(20), ]), @@ -179,14 +181,21 @@ class _StarLockForgetPasswordPageState Obx(() { return SubmitBtn( btnName: - '${TranslationLoader.lanKeys!.reset!.tr}${TranslationLoader.lanKeys!.password!.tr}', + '${TranslationLoader.lanKeys!.reset!.tr}${TranslationLoader.lanKeys!.password!.tr}', // backgroundColorList: state.canSub.value ? [AppColors.mainColor] :[Colors.grey], fontSize: 30.sp, borderRadius: 20.w, padding: EdgeInsets.only(top: 25.w, bottom: 25.w), isDisabled: state.canSub.value, onClick: state.canSub.value - ? logic.resetPassword + ? () { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } + logic.resetPassword(); + } : null); }), ], diff --git a/lib/main.dart b/lib/main.dart index d68c857f..38ebdf90 100755 --- a/lib/main.dart +++ b/lib/main.dart @@ -33,10 +33,12 @@ FutureOr main() async { final bool isLogin = await getLoginStatus(); if (isLogin) { await privacySDKInitialization(); - Future.delayed(const Duration(milliseconds: 500), () async{ + Future.delayed(const Duration(milliseconds: 500), () async { final GetAppInfo entity = await ApiRepository.to.getAppInfo(); CustomerTool.init(entity.data?.wechatServiceUrl ?? ''); - WxPayTool.setAssociationUrl(entity.data!.appSiteUrl!); + if (entity.data?.appSiteUrl != null) { + WxPayTool.setAssociationUrl(entity.data!.appSiteUrl!); + } }); } diff --git a/lib/main/lockDetail/card/cardList/cardList_page.dart b/lib/main/lockDetail/card/cardList/cardList_page.dart index e7e7a4c2..7e201210 100755 --- a/lib/main/lockDetail/card/cardList/cardList_page.dart +++ b/lib/main/lockDetail/card/cardList/cardList_page.dart @@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/card/cardList/cardList_state.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import '../../../../appRouters.dart'; import '../../../../app_settings/app_colors.dart'; @@ -68,6 +69,11 @@ class _CardListPageState extends State with RouteAware { onPressed: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog( '重置后,该锁的卡都将被删除哦,确认要重置吗?'.tr, () async { state.isDeletAll = true; diff --git a/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart b/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart index be44eeee..df183855 100755 --- a/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart +++ b/lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart @@ -6,6 +6,7 @@ import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_logic.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_state.dart'; import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/entity/ElectronicKeyListEntity.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/storage.dart'; @@ -67,6 +68,11 @@ class _ElectronicKeyListPageState extends State { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog( '该锁的电子钥匙都将被删除'.tr, logic.resetElectronicKeyListRequest); } else { diff --git a/lib/main/lockDetail/face/faceList/faceList_page.dart b/lib/main/lockDetail/face/faceList/faceList_page.dart index 947627e9..6b1ec731 100755 --- a/lib/main/lockDetail/face/faceList/faceList_page.dart +++ b/lib/main/lockDetail/face/faceList/faceList_page.dart @@ -3,6 +3,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import 'package:star_lock/tools/keySearchWidget.dart'; import 'package:star_lock/tools/left_slide/left_slide_actions.dart'; import 'package:star_lock/tools/showTipView.dart'; @@ -63,6 +64,11 @@ class _FaceListPageState extends State with RouteAware { onPressed: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } // showDeletAlertDialog(context); ShowTipView().showIosTipWithContentDialog( "重置后,该锁的人脸都将被删除哦,确认要重置吗?", () async { diff --git a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart index 09c5759e..c654e693 100755 --- a/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart +++ b/lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart @@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/fingerprint/fingerprintList/fingerprintList_state.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import '../../../../appRouters.dart'; import '../../../../app_settings/app_colors.dart'; @@ -69,6 +70,11 @@ class _FingerprintListPageState extends State onPressed: () async { final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } ShowTipView().showIosTipWithContentDialog( '重置后,该锁的指纹都将被删除哦,确认要重置吗?'.tr, () async { state.isDeletAll = true; diff --git a/lib/main/lockDetail/iris/irisList/irisList_page.dart b/lib/main/lockDetail/iris/irisList/irisList_page.dart index 6a12c535..bc4f4fe8 100755 --- a/lib/main/lockDetail/iris/irisList/irisList_page.dart +++ b/lib/main/lockDetail/iris/irisList/irisList_page.dart @@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.dart'; import 'package:star_lock/main/lockDetail/iris/irisList/irisList_logic.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import 'package:star_lock/tools/keySearchWidget.dart'; import 'package:star_lock/tools/left_slide/left_slide_actions.dart'; @@ -44,6 +45,11 @@ class _IrisListPageState extends State { onPressed: () async { final isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } showDeletAlertDialog(context); } else { // Get.toNamed(Routers.selectLockTypePage); diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index c15dfa29..411ce532 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -5,6 +5,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/checkingInInfoData_entity.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSet_state.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import '../../../../appRouters.dart'; import '../../../../app_settings/app_colors.dart'; @@ -28,9 +29,7 @@ class LockSetPage extends StatefulWidget { class _LockSetPageState extends State with RouteAware { final LockSetLogic logic = Get.put(LockSetLogic()); - final LockSetState state = Get - .find() - .state; + final LockSetState state = Get.find().state; Future getHttpData() async { logic.getLockSettingInfoData().then((LockSetInfoEntity value) { @@ -65,8 +64,7 @@ class _LockSetPageState extends State with RouteAware { child: Column( children: [ Expanded( - child: Obx(() => - ListView( + child: Obx(() => ListView( children: getListWidget(), )), ), @@ -104,47 +102,43 @@ class _LockSetPageState extends State with RouteAware { }), SizedBox(height: 10.h), // 自动闭锁 - Obx(() => - Visibility( - visible: state.lockFeature.value.autoLock == 1, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr, - rightTitle: (state.lockSettingInfo.value.autoLock ?? 0) > 0 - ? '${state.lockSetInfoData.value.lockSettingInfo! - .autoLockSecond ?? 0}s' - : TranslationLoader.lanKeys!.closed!.tr, - isHaveLine: true, - isHaveDirection: true, - // isHaveRightWidget: true, - // rightWidget: rightText((state.lockSetInfoData.value.lockSetting!.autoLock ?? 0) > 0 - // ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s" - // : TranslationLoader.lanKeys!.closed!.tr), - action: () { - Get.toNamed(Routers.automaticBlockingPage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value, - // 'lockBasicInfo': state.lockBasicInfo.value - }); - }))), + Obx(() => Visibility( + visible: state.lockFeature.value.autoLock == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr, + rightTitle: (state.lockSettingInfo.value.autoLock ?? 0) > 0 + ? '${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond ?? 0}s' + : TranslationLoader.lanKeys!.closed!.tr, + isHaveLine: true, + isHaveDirection: true, + // isHaveRightWidget: true, + // rightWidget: rightText((state.lockSetInfoData.value.lockSetting!.autoLock ?? 0) > 0 + // ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s" + // : TranslationLoader.lanKeys!.closed!.tr), + action: () { + Get.toNamed(Routers.automaticBlockingPage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value, + // 'lockBasicInfo': state.lockBasicInfo.value + }); + }))), // 常开模式 - Obx(() => - Visibility( - visible: state.lockFeature.value.passageMode == 1, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, - rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == - 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.normallyOpenModePage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value, - 'lockBasicInfo': state.lockBasicInfo.value - }); - }))), + Obx(() => Visibility( + visible: state.lockFeature.value.passageMode == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, + rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1 + ? TranslationLoader.lanKeys!.opened!.tr + : TranslationLoader.lanKeys!.closed!.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.normallyOpenModePage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value, + 'lockBasicInfo': state.lockBasicInfo.value + }); + }))), Visibility( visible: true, child: CommonItem( @@ -153,10 +147,10 @@ class _LockSetPageState extends State with RouteAware { isHaveLine: true, isHaveDirection: true, action: () { - Get.toNamed( - Routers.lockTimePage, arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); + Get.toNamed(Routers.lockTimePage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); })), SizedBox(height: 30.h), Container( @@ -166,10 +160,14 @@ class _LockSetPageState extends State with RouteAware { isDelete: true, onClick: () { // logic.deletUserAction(); - // logic.deletLockInfoData(); // showDeletAlertDialog(context); // showDeletPasswordAlertDialog(context); + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } logic.deleyLockLogicOfRoles(); }), ), @@ -242,27 +240,25 @@ class _LockSetPageState extends State with RouteAware { // })), // SizedBox(height: 10.h), // 自动闭锁 - Obx(() => - Visibility( - visible: state.lockFeature.value.autoLock == 1, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr, - rightTitle: state.lockSettingInfo.value.autoLock! > 0 - ? '${state.lockSetInfoData.value.lockSettingInfo! - .autoLockSecond}s' - : TranslationLoader.lanKeys!.closed!.tr, - isHaveLine: true, - isHaveDirection: true, - // isHaveRightWidget: true, - // rightWidget: rightText((state.lockSetInfoData.value.lockSetting!.autoLock ?? 0) > 0 - // ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s" - // : TranslationLoader.lanKeys!.closed!.tr), - action: () { - Get.toNamed(Routers.automaticBlockingPage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); - }))), + Obx(() => Visibility( + visible: state.lockFeature.value.autoLock == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr, + rightTitle: state.lockSettingInfo.value.autoLock! > 0 + ? '${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond}s' + : TranslationLoader.lanKeys!.closed!.tr, + isHaveLine: true, + isHaveDirection: true, + // isHaveRightWidget: true, + // rightWidget: rightText((state.lockSetInfoData.value.lockSetting!.autoLock ?? 0) > 0 + // ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s" + // : TranslationLoader.lanKeys!.closed!.tr), + action: () { + Get.toNamed(Routers.automaticBlockingPage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); + }))), // 锁声音 Obx(() { String titleStr = ''; @@ -302,80 +298,72 @@ class _LockSetPageState extends State with RouteAware { })); }), // 防撬报警 - Obx(() => - Visibility( - visible: state.lockFeature.value.antiPrySwitch == 1, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.burglarAlarm!.tr, - rightTitle: (state.lockSettingInfo.value.antiPrySwitch ?? - 0) == 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.burglarAlarmPage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); - }))), + Obx(() => Visibility( + visible: state.lockFeature.value.antiPrySwitch == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.burglarAlarm!.tr, + rightTitle: (state.lockSettingInfo.value.antiPrySwitch ?? 0) == 1 + ? TranslationLoader.lanKeys!.opened!.tr + : TranslationLoader.lanKeys!.closed!.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.burglarAlarmPage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); + }))), SizedBox(height: 10.h), // 常开模式 - Obx(() => - Visibility( - visible: state.lockFeature.value.passageMode == 1, - // visible: true, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, - rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == - 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.normallyOpenModePage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); - }))), + Obx(() => Visibility( + visible: state.lockFeature.value.passageMode == 1, + // visible: true, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, + rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1 + ? TranslationLoader.lanKeys!.opened!.tr + : TranslationLoader.lanKeys!.closed!.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.normallyOpenModePage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); + }))), // 远程开锁 - Obx(() => - Visibility( - visible: state.lockFeature.value.remoteUnlock == 1, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.remoteUnlocking!.tr, - rightTitle: (state.lockSettingInfo.value.remoteUnlock ?? 0) == - 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.remoteUnlockingPage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); - }))), + Obx(() => Visibility( + visible: state.lockFeature.value.remoteUnlock == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.remoteUnlocking!.tr, + rightTitle: (state.lockSettingInfo.value.remoteUnlock ?? 0) == 1 + ? TranslationLoader.lanKeys!.opened!.tr + : TranslationLoader.lanKeys!.closed!.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.remoteUnlockingPage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); + }))), // 重置键 - Obx(() => - Visibility( - visible: state.lockBasicInfo.value.isLockOwner == 1 && - state.lockFeature.value.resetSwitch == 1, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.resetButton!.tr, - rightTitle: (state.lockSettingInfo.value.resetSwitch ?? 0) == - 1 - ? TranslationLoader.lanKeys!.opened!.tr - : TranslationLoader.lanKeys!.closed!.tr, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.resetButtonPage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); - }))), + Obx(() => Visibility( + visible: state.lockBasicInfo.value.isLockOwner == 1 && + state.lockFeature.value.resetSwitch == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.resetButton!.tr, + rightTitle: (state.lockSettingInfo.value.resetSwitch ?? 0) == 1 + ? TranslationLoader.lanKeys!.opened!.tr + : TranslationLoader.lanKeys!.closed!.tr, + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.resetButtonPage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); + }))), SizedBox(height: 10.h), //---田总新增展示 // Obx(() => @@ -409,20 +397,19 @@ class _LockSetPageState extends State with RouteAware { }); })), //猫眼设置 - Obx(() => - Visibility( - visible: state.lockFeature.value.isSupportCatEye == 1, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.catEyeSet!.tr, - rightTitle: '', - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.catEyeSetPage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); - }))), + Obx(() => Visibility( + visible: state.lockFeature.value.isSupportCatEye == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.catEyeSet!.tr, + rightTitle: '', + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.catEyeSetPage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); + }))), // Obx(() => //自动亮屏已包括至面容开锁模块 // Visibility( @@ -477,7 +464,7 @@ class _LockSetPageState extends State with RouteAware { // 蓝牙广播(关闭则不能使用蓝牙主动开锁) /* 2024-01-12 会议确定去掉“蓝牙广播” by DaisyWu Obx(() => Visibility( - visible: true, + visible: true, child: CommonItem( leftTitel: TranslationLoader.lanKeys!.bluetoothBroadcast!.tr, rightTitle: "", @@ -511,66 +498,62 @@ class _LockSetPageState extends State with RouteAware { // }), // 考勤 Obx( - () => - Visibility( - visible: state.lockBasicInfo.value.isLockOwner == 1 && - state.lockFeature.value.attendance == 1, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.checkingIn!.tr, - rightTitle: '', - isHaveLine: true, - isHaveRightWidget: true, - rightWidget: _openCheckInSwitch())), + () => Visibility( + visible: state.lockBasicInfo.value.isLockOwner == 1 && + state.lockFeature.value.attendance == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.checkingIn!.tr, + rightTitle: '', + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: _openCheckInSwitch())), ), // 开锁提醒 Obx( - () => - Visibility( - visible: state.lockBasicInfo.value.isLockOwner == 1 && - state.lockFeature.value.unlockReminder == 1, - child: CommonItem( - leftTitel: TranslationLoader.lanKeys!.unlockReminder!.tr, - rightTitle: '', - isHaveLine: true, - isHaveRightWidget: true, - rightWidget: _lockRemindSwitch())), + () => Visibility( + visible: state.lockBasicInfo.value.isLockOwner == 1 && + state.lockFeature.value.unlockReminder == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.unlockReminder!.tr, + rightTitle: '', + isHaveLine: true, + isHaveRightWidget: true, + rightWidget: _lockRemindSwitch())), ), // APP开锁时是否需联网 Obx( - () => - Visibility( - visible: state.lockBasicInfo.value.isLockOwner == 1 && - state.lockFeature.value.appUnlockOnline == 1, - child: CommonItem( - leftTitel: TranslationLoader - .lanKeys!.whetherInternetRequiredWhenUnlocking!.tr, - rightTitle: '', - isHaveLine: false, - isHaveRightWidget: true, - rightWidget: _openLockNeedOnlineSwitch()), - ), + () => Visibility( + visible: state.lockBasicInfo.value.isLockOwner == 1 && + state.lockFeature.value.appUnlockOnline == 1, + child: CommonItem( + leftTitel: TranslationLoader + .lanKeys!.whetherInternetRequiredWhenUnlocking!.tr, + rightTitle: '', + isHaveLine: false, + isHaveRightWidget: true, + rightWidget: _openLockNeedOnlineSwitch()), + ), ), SizedBox(height: 10.h), // wifi配网 Obx( - () => - Visibility( - visible: state.lockFeature.value.wifi == 1, - child: CommonItem( - leftTitel: + () => Visibility( + visible: state.lockFeature.value.wifi == 1, + child: CommonItem( + leftTitel: TranslationLoader.lanKeys!.wifiDistributionNetwork!.tr, - rightTitle: '', - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.wifiListPage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); - // Get.toNamed(Routers.configuringWifiPage, arguments: { - // 'lockSetInfoData': state.lockSetInfoData.value - // }); - })), + rightTitle: '', + isHaveLine: true, + isHaveDirection: true, + action: () { + Get.toNamed(Routers.wifiListPage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); + // Get.toNamed(Routers.configuringWifiPage, arguments: { + // 'lockSetInfoData': state.lockSetInfoData.value + // }); + })), ), // Obx(() => // 锁时间 @@ -582,10 +565,10 @@ class _LockSetPageState extends State with RouteAware { isHaveLine: true, isHaveDirection: true, action: () { - Get.toNamed( - Routers.lockTimePage, arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); + Get.toNamed(Routers.lockTimePage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); })), // ), // Obx(() => @@ -676,12 +659,11 @@ class _LockSetPageState extends State with RouteAware { thumbColor: CupertinoColors.white, value: state.isAttendance.value == 1, onChanged: (bool value) { - logic.openCheckingInData(( - CheckingInInfoDataEntity checkingInInfoDataEntity) { + logic.openCheckingInData( + (CheckingInInfoDataEntity checkingInInfoDataEntity) { if (checkingInInfoDataEntity.data!.companyId == 0) { // logic.showCupertinoAlertDialog(context); - ShowTipView().showIosTipWithContentDialog( - '创建公司后,考勤功能才能使用'.tr, () { + ShowTipView().showIosTipWithContentDialog('创建公司后,考勤功能才能使用'.tr, () { // 删除锁 Get.toNamed(Routers.checkInCreatCompanyPage, arguments: { diff --git a/lib/main/lockDetail/lockSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart b/lib/main/lockDetail/lockSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart index b04eca44..ca725531 100755 --- a/lib/main/lockDetail/lockSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart +++ b/lib/main/lockDetail/lockSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart @@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import 'package:star_lock/tools/noData.dart'; import '../../../../../appRouters.dart'; @@ -19,6 +20,7 @@ class WirelessKeyboardPage extends StatefulWidget { class _WirelessKeyboardPageState extends State { List dataList = []; + @override Widget build(BuildContext context) { return Scaffold( @@ -34,6 +36,11 @@ class _WirelessKeyboardPageState extends State { style: TextStyle(color: Colors.white, fontSize: 24.sp), ), onPressed: () { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } _showDialog(context); }, ), diff --git a/lib/main/lockDetail/palm/palmList/palmList_page.dart b/lib/main/lockDetail/palm/palmList/palmList_page.dart index 38d70903..18e153a0 100755 --- a/lib/main/lockDetail/palm/palmList/palmList_page.dart +++ b/lib/main/lockDetail/palm/palmList/palmList_page.dart @@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:star_lock/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.dart'; import 'package:star_lock/main/lockDetail/palm/palmList/palmList_logic.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import 'package:star_lock/tools/keySearchWidget.dart'; import 'package:star_lock/tools/left_slide/left_slide_actions.dart'; @@ -44,6 +45,11 @@ class _PalmListPageState extends State { onPressed: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } showDeletAlertDialog(context); } else { // Get.toNamed(Routers.selectLockTypePage); diff --git a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart index 2f206d13..7403cf35 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart @@ -6,6 +6,7 @@ import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKe import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_logic.dart'; import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_state.dart'; import 'package:star_lock/main/lockMian/entity/lockListInfo_entity.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/storage.dart'; import '../../../../appRouters.dart'; @@ -67,6 +68,11 @@ class _PasswordKeyListPageState extends State final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } if (state.itemDataList.isEmpty) { logic.showToast('暂无密码,无需重置'.tr); return; @@ -227,7 +233,8 @@ class _PasswordKeyListPageState extends State Row( children: [ SizedBox( - width: passwordKeyListItem.keyboardPwdStatus == 2 || passwordKeyListItem.keyboardPwdStatus == 3 + width: passwordKeyListItem.keyboardPwdStatus == 2 || + passwordKeyListItem.keyboardPwdStatus == 3 ? 1.sw - 110.w - 100.w : 1.sw - 110.w - 50.w, child: Row(children: [ @@ -247,7 +254,7 @@ class _PasswordKeyListPageState extends State '已过期'.tr, style: TextStyle(color: Colors.red, fontSize: 20.sp), ) - else if (passwordKeyListItem.keyboardPwdStatus == 3) + else if (passwordKeyListItem.keyboardPwdStatus == 3) Text( '未生效'.tr, style: TextStyle(color: Colors.red, fontSize: 20.sp), diff --git a/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart b/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart index b5527846..5f193cd1 100755 --- a/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart +++ b/lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart @@ -3,6 +3,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; +import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart'; import '../../../../appRouters.dart'; import '../../../../app_settings/app_colors.dart'; @@ -44,6 +45,11 @@ class _RemoteControlListPageState extends State { onPressed: () async { var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); if (isDemoMode == false) { + final bool isNetWork = + LockMainLogic.to()?.judgeTheNetwork() ?? false; + if (!isNetWork) { + return; + } showDeletAlertDialog(context); } else { // Get.toNamed(Routers.selectLockTypePage); diff --git a/lib/main/lockMian/lockMain/lockMain_logic.dart b/lib/main/lockMian/lockMain/lockMain_logic.dart index 2fa7974c..ae2daf05 100755 --- a/lib/main/lockMian/lockMain/lockMain_logic.dart +++ b/lib/main/lockMian/lockMain/lockMain_logic.dart @@ -109,11 +109,20 @@ class LockMainLogic extends BaseGetXController { result != ConnectivityResult.none) { // 从无网络到有网络 state.networkConnectionStatus.value = 1; - getStarLockInfo(); + getStarLockInfo(isUnShowLoading: true); } }); } + /// 判断是否有网络 + bool judgeTheNetwork() { + final bool isNetwork = state.networkConnectionStatus.value == 1; + if (!isNetwork) { + EasyLoading.showToast('网络访问失败,请检查网络是否正常'.tr); + } + return isNetwork; + } + /// 检测推送是否开启 Future checkWhetherPushIsEnabled() async { bool notificationEnabled = false; @@ -261,6 +270,7 @@ class LockMainLogic extends BaseGetXController { super.onInit(); checkWhetherPushIsEnabled(); _initSubscription(); + connectListener(); } @override @@ -270,4 +280,11 @@ class LockMainLogic extends BaseGetXController { }); super.onClose(); } + + static LockMainLogic? to() { + if (Get.isRegistered()) { + return Get.find(); + } + return null; + } }