sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复 无网络状态可以点击设备删除，卡/密码/指纹等清除操作

Browse Source
This commit is contained in:
anfe 2024-06-24 17:38:34 +08:00
parent 103570a97b
commit 3de600acda
14 changed files with 318 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/login/forgetPassword/starLock_forgetPassword_page.dart
View File

@ -7,6 +7,7 @@ import 'package:get/get.dart';
import 'package:star_lock/app_settings/app_settings.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_logic.dart';
import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_state.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 '../../appRouters.dart';
import '../../app_settings/app_colors.dart'; import '../../app_settings/app_colors.dart';
@ -23,9 +24,12 @@ class StarLockForgetPasswordPage extends StatefulWidget {
_StarLockForgetPasswordPageState(); _StarLockForgetPasswordPageState();
} }
class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage> { class _StarLockForgetPasswordPageState
final StarLockForgetPasswordLogic logic = Get.put(StarLockForgetPasswordLogic()); extends State<StarLockForgetPasswordPage> {
final StarLockForgetPasswordState state = Get.find<StarLockForgetPasswordLogic>().state; final StarLockForgetPasswordLogic logic =
Get.put(StarLockForgetPasswordLogic());
final StarLockForgetPasswordState state =
Get.find<StarLockForgetPasswordLogic>().state;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -57,7 +61,8 @@ class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage>
children: <Widget>[ children: <Widget>[
SizedBox(width: 5.w), SizedBox(width: 5.w),
Expanded( Expanded(
child: Text(TranslationLoader.lanKeys!.countryAndRegion!.tr, child: Text(
TranslationLoader.lanKeys!.countryAndRegion!.tr,
style: TextStyle( style: TextStyle(
fontSize: 26.sp, color: AppColors.blackColor))), fontSize: 26.sp, color: AppColors.blackColor))),
SizedBox(width: 20.w), SizedBox(width: 20.w),
@ -65,14 +70,14 @@ class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage>
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[ children: <Widget>[
Obx(() => Text( Obx(() => Text(
'${state.countryName} +${state.countryCode}', '${state.countryName} +${state.countryCode}',
// state.isIphoneType.value // state.isIphoneType.value
// ? '${state.countryName} +${state.countryCode}' // ? '${state.countryName} +${state.countryCode}'
// : "${state.countryName}", // : "${state.countryName}",
textAlign: TextAlign.end, textAlign: TextAlign.end,
style: TextStyle( style: TextStyle(
fontSize: 26.sp, color: AppColors.blackColor), fontSize: 26.sp, color: AppColors.blackColor),
)) ))
], ],
), ),
SizedBox(width: 5.w), SizedBox(width: 5.w),
@ -95,14 +100,16 @@ class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage>
logic.checkNext(state.phoneController); logic.checkNext(state.phoneController);
}, },
leftWidget: Padding( 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( child: Image.asset(
'images/icon_login_account.png', 'images/icon_login_account.png',
width: 36.w, width: 36.w,
height: 36.w, height: 36.w,
), ),
), ),
hintText:TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr, hintText:
TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(30), LengthLimitingTextInputFormatter(30),
@ -232,6 +239,11 @@ class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage>
isDisabled: state.canSub.value, isDisabled: state.canSub.value,
onClick: state.canSub.value onClick: state.canSub.value
? () { ? () {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
logic.resetPassword(); logic.resetPassword();
} }
: null); : null);

25
lib/login/forgetPassword/starLock_forgetPassword_xhj_page.dart
View File

@ -1,4 +1,3 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.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/app_settings/app_colors.dart';
import 'package:star_lock/login/forgetPassword/starLock_forgetPassword_logic.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/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/submitBtn.dart';
import 'package:star_lock/tools/tf_loginInput.dart'; import 'package:star_lock/tools/tf_loginInput.dart';
import 'package:star_lock/tools/titleAppBar.dart'; import 'package:star_lock/tools/titleAppBar.dart';
@ -22,8 +22,10 @@ class StarLockForgetPasswordXHJPage extends StatefulWidget {
class _StarLockForgetPasswordPageState class _StarLockForgetPasswordPageState
extends State<StarLockForgetPasswordXHJPage> { extends State<StarLockForgetPasswordXHJPage> {
final StarLockForgetPasswordLogic logic = Get.put(StarLockForgetPasswordLogic()); final StarLockForgetPasswordLogic logic =
final StarLockForgetPasswordState state = Get.find<StarLockForgetPasswordLogic>().state; Get.put(StarLockForgetPasswordLogic());
final StarLockForgetPasswordState state =
Get.find<StarLockForgetPasswordLogic>().state;
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
@ -102,7 +104,7 @@ class _StarLockForgetPasswordPageState
padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w), padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w),
), ),
label: label:
'${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}', '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}',
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
@ -122,7 +124,7 @@ class _StarLockForgetPasswordPageState
padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w), padding: EdgeInsets.only(top: 30.w, bottom: 20.w, left: 5.w),
), ),
label: label:
'${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}', '${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}',
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
@ -136,7 +138,7 @@ class _StarLockForgetPasswordPageState
}, },
leftWidget: SizedBox(), leftWidget: SizedBox(),
hintText: hintText:
'${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}', '${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}',
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
@ -179,14 +181,21 @@ class _StarLockForgetPasswordPageState
Obx(() { Obx(() {
return SubmitBtn( return SubmitBtn(
btnName: 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], // backgroundColorList: state.canSub.value ? [AppColors.mainColor] :[Colors.grey],
fontSize: 30.sp, fontSize: 30.sp,
borderRadius: 20.w, borderRadius: 20.w,
padding: EdgeInsets.only(top: 25.w, bottom: 25.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
isDisabled: state.canSub.value, isDisabled: state.canSub.value,
onClick: state.canSub.value onClick: state.canSub.value
? logic.resetPassword ? () {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
logic.resetPassword();
}
: null); : null);
}), }),
], ],

6
lib/main.dart
View File

@ -33,10 +33,12 @@ FutureOr<void> main() async {
final bool isLogin = await getLoginStatus(); final bool isLogin = await getLoginStatus();
if (isLogin) { if (isLogin) {
await privacySDKInitialization(); await privacySDKInitialization();
Future<void>.delayed(const Duration(milliseconds: 500), () async{ Future<void>.delayed(const Duration(milliseconds: 500), () async {
final GetAppInfo entity = await ApiRepository.to.getAppInfo(); final GetAppInfo entity = await ApiRepository.to.getAppInfo();
CustomerTool.init(entity.data?.wechatServiceUrl ?? ''); CustomerTool.init(entity.data?.wechatServiceUrl ?? '');
WxPayTool.setAssociationUrl(entity.data!.appSiteUrl!); if (entity.data?.appSiteUrl != null) {
WxPayTool.setAssociationUrl(entity.data!.appSiteUrl!);
}
}); });
} }

6
lib/main/lockDetail/card/cardList/cardList_page.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/card/cardList/cardList_state.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 '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart'; import '../../../../app_settings/app_colors.dart';
@ -68,6 +69,11 @@ class _CardListPageState extends State<CardListPage> with RouteAware {
onPressed: () async { onPressed: () async {
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
ShowTipView().showIosTipWithContentDialog( ShowTipView().showIosTipWithContentDialog(
'重置后，该锁的卡都将被删除哦，确认要重置吗？'.tr, () async { '重置后，该锁的卡都将被删除哦，确认要重置吗？'.tr, () async {
state.isDeletAll = true; state.isDeletAll = true;

6
lib/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_page.dart
View File

@ -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_logic.dart';
import 'package:star_lock/main/lockDetail/electronicKey/electronicKeyList/electronicKeyList_state.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/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/noData.dart';
import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/tools/storage.dart';
@ -67,6 +68,11 @@ class _ElectronicKeyListPageState extends State<ElectronicKeyListPage> {
final bool? isDemoMode = final bool? isDemoMode =
await Storage.getBool(ifIsDemoModeOrNot); await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
ShowTipView().showIosTipWithContentDialog( ShowTipView().showIosTipWithContentDialog(
'该锁的电子钥匙都将被删除'.tr, logic.resetElectronicKeyListRequest); '该锁的电子钥匙都将被删除'.tr, logic.resetElectronicKeyListRequest);
} else { } else {

6
lib/main/lockDetail/face/faceList/faceList_page.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter_easyloading/flutter_easyloading.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.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/keySearchWidget.dart';
import 'package:star_lock/tools/left_slide/left_slide_actions.dart'; import 'package:star_lock/tools/left_slide/left_slide_actions.dart';
import 'package:star_lock/tools/showTipView.dart'; import 'package:star_lock/tools/showTipView.dart';
@ -63,6 +64,11 @@ class _FaceListPageState extends State<FaceListPage> with RouteAware {
onPressed: () async { onPressed: () async {
var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
// showDeletAlertDialog(context); // showDeletAlertDialog(context);
ShowTipView().showIosTipWithContentDialog( ShowTipView().showIosTipWithContentDialog(
"重置后，该锁的人脸都将被删除哦，确认要重置吗?", () async { "重置后，该锁的人脸都将被删除哦，确认要重置吗?", () async {

6
lib/main/lockDetail/fingerprint/fingerprintList/fingerprintList_page.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:flutter_slidable/flutter_slidable.dart'; import 'package:flutter_slidable/flutter_slidable.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/fingerprint/fingerprintList/fingerprintList_state.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 '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart'; import '../../../../app_settings/app_colors.dart';
@ -69,6 +70,11 @@ class _FingerprintListPageState extends State<FingerprintListPage>
onPressed: () async { onPressed: () async {
final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); final bool? isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
ShowTipView().showIosTipWithContentDialog( ShowTipView().showIosTipWithContentDialog(
'重置后，该锁的指纹都将被删除哦，确认要重置吗?'.tr, () async { '重置后，该锁的指纹都将被删除哦，确认要重置吗?'.tr, () async {
state.isDeletAll = true; state.isDeletAll = true;

6
lib/main/lockDetail/iris/irisList/irisList_page.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.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/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/keySearchWidget.dart';
import 'package:star_lock/tools/left_slide/left_slide_actions.dart'; import 'package:star_lock/tools/left_slide/left_slide_actions.dart';
@ -44,6 +45,11 @@ class _IrisListPageState extends State<IrisListPage> {
onPressed: () async { onPressed: () async {
final isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); final isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
showDeletAlertDialog(context); showDeletAlertDialog(context);
} else { } else {
// Get.toNamed(Routers.selectLockTypePage); // Get.toNamed(Routers.selectLockTypePage);

408
lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart
View File

@ -5,6 +5,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.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/checkingInInfoData_entity.dart';
import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSet_state.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 '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart'; import '../../../../app_settings/app_colors.dart';
@ -28,9 +29,7 @@ class LockSetPage extends StatefulWidget {
class _LockSetPageState extends State<LockSetPage> with RouteAware { class _LockSetPageState extends State<LockSetPage> with RouteAware {
final LockSetLogic logic = Get.put(LockSetLogic()); final LockSetLogic logic = Get.put(LockSetLogic());
final LockSetState state = Get final LockSetState state = Get.find<LockSetLogic>().state;
.find<LockSetLogic>()
.state;
Future<void> getHttpData() async { Future<void> getHttpData() async {
logic.getLockSettingInfoData().then((LockSetInfoEntity value) { logic.getLockSettingInfoData().then((LockSetInfoEntity value) {
@ -65,8 +64,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
child: Column( child: Column(
children: <Widget>[ children: <Widget>[
Expanded( Expanded(
child: Obx(() => child: Obx(() => ListView(
ListView(
children: getListWidget(), children: getListWidget(),
)), )),
), ),
@ -104,47 +102,43 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
}), }),
SizedBox(height: 10.h), SizedBox(height: 10.h),
// 自动闭锁 // 自动闭锁
Obx(() => Obx(() => Visibility(
Visibility( visible: state.lockFeature.value.autoLock == 1,
visible: state.lockFeature.value.autoLock == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr,
leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr, rightTitle: (state.lockSettingInfo.value.autoLock ?? 0) > 0
rightTitle: (state.lockSettingInfo.value.autoLock ?? 0) > 0 ? '${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond ?? 0}s'
? '${state.lockSetInfoData.value.lockSettingInfo! : TranslationLoader.lanKeys!.closed!.tr,
.autoLockSecond ?? 0}s' isHaveLine: true,
: TranslationLoader.lanKeys!.closed!.tr, isHaveDirection: true,
isHaveLine: true, // isHaveRightWidget: true,
isHaveDirection: true, // rightWidget: rightText((state.lockSetInfoData.value.lockSetting!.autoLock ?? 0) > 0
// isHaveRightWidget: true, // ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s"
// rightWidget: rightText((state.lockSetInfoData.value.lockSetting!.autoLock ?? 0) > 0 // : TranslationLoader.lanKeys!.closed!.tr),
// ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s" action: () {
// : TranslationLoader.lanKeys!.closed!.tr), Get.toNamed(Routers.automaticBlockingPage,
action: () { arguments: <String, LockSetInfoData>{
Get.toNamed(Routers.automaticBlockingPage, 'lockSetInfoData': state.lockSetInfoData.value,
arguments: <String, LockSetInfoData>{ // 'lockBasicInfo': state.lockBasicInfo.value
'lockSetInfoData': state.lockSetInfoData.value, });
// 'lockBasicInfo': state.lockBasicInfo.value }))),
});
}))),
// 常开模式 // 常开模式
Obx(() => Obx(() => Visibility(
Visibility( visible: state.lockFeature.value.passageMode == 1,
visible: state.lockFeature.value.passageMode == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr,
leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1
rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == ? TranslationLoader.lanKeys!.opened!.tr
1 : TranslationLoader.lanKeys!.closed!.tr,
? TranslationLoader.lanKeys!.opened!.tr isHaveLine: true,
: TranslationLoader.lanKeys!.closed!.tr, isHaveDirection: true,
isHaveLine: true, action: () {
isHaveDirection: true, Get.toNamed(Routers.normallyOpenModePage,
action: () { arguments: <String, Object>{
Get.toNamed(Routers.normallyOpenModePage, 'lockSetInfoData': state.lockSetInfoData.value,
arguments: <String, Object>{ 'lockBasicInfo': state.lockBasicInfo.value
'lockSetInfoData': state.lockSetInfoData.value, });
'lockBasicInfo': state.lockBasicInfo.value }))),
});
}))),
Visibility( Visibility(
visible: true, visible: true,
child: CommonItem( child: CommonItem(
@ -153,10 +147,10 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed( Get.toNamed(Routers.lockTimePage,
Routers.lockTimePage, arguments: <String, LockSetInfoData>{ arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
})), })),
SizedBox(height: 30.h), SizedBox(height: 30.h),
Container( Container(
@ -166,10 +160,14 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
isDelete: true, isDelete: true,
onClick: () { onClick: () {
// logic.deletUserAction(); // logic.deletUserAction();
// logic.deletLockInfoData(); // logic.deletLockInfoData();
// showDeletAlertDialog(context); // showDeletAlertDialog(context);
// showDeletPasswordAlertDialog(context); // showDeletPasswordAlertDialog(context);
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
logic.deleyLockLogicOfRoles(); logic.deleyLockLogicOfRoles();
}), }),
), ),
@ -242,27 +240,25 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// })), // })),
// SizedBox(height: 10.h), // SizedBox(height: 10.h),
// 自动闭锁 // 自动闭锁
Obx(() => Obx(() => Visibility(
Visibility( visible: state.lockFeature.value.autoLock == 1,
visible: state.lockFeature.value.autoLock == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr,
leftTitel: TranslationLoader.lanKeys!.automaticBlocking!.tr, rightTitle: state.lockSettingInfo.value.autoLock! > 0
rightTitle: state.lockSettingInfo.value.autoLock! > 0 ? '${state.lockSetInfoData.value.lockSettingInfo!.autoLockSecond}s'
? '${state.lockSetInfoData.value.lockSettingInfo! : TranslationLoader.lanKeys!.closed!.tr,
.autoLockSecond}s' isHaveLine: true,
: TranslationLoader.lanKeys!.closed!.tr, isHaveDirection: true,
isHaveLine: true, // isHaveRightWidget: true,
isHaveDirection: true, // rightWidget: rightText((state.lockSetInfoData.value.lockSetting!.autoLock ?? 0) > 0
// isHaveRightWidget: true, // ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s"
// rightWidget: rightText((state.lockSetInfoData.value.lockSetting!.autoLock ?? 0) > 0 // : TranslationLoader.lanKeys!.closed!.tr),
// ? "${state.lockSetInfoData.value.lockSetting!.autoLockSecond ?? 0}s" action: () {
// : TranslationLoader.lanKeys!.closed!.tr), Get.toNamed(Routers.automaticBlockingPage,
action: () { arguments: <String, LockSetInfoData>{
Get.toNamed(Routers.automaticBlockingPage, 'lockSetInfoData': state.lockSetInfoData.value
arguments: <String, LockSetInfoData>{ });
'lockSetInfoData': state.lockSetInfoData.value }))),
});
}))),
// 锁声音 // 锁声音
Obx(() { Obx(() {
String titleStr = ''; String titleStr = '';
@ -302,80 +298,72 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
})); }));
}), }),
// 防撬报警 // 防撬报警
Obx(() => Obx(() => Visibility(
Visibility( visible: state.lockFeature.value.antiPrySwitch == 1,
visible: state.lockFeature.value.antiPrySwitch == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.burglarAlarm!.tr,
leftTitel: TranslationLoader.lanKeys!.burglarAlarm!.tr, rightTitle: (state.lockSettingInfo.value.antiPrySwitch ?? 0) == 1
rightTitle: (state.lockSettingInfo.value.antiPrySwitch ?? ? TranslationLoader.lanKeys!.opened!.tr
0) == 1 : TranslationLoader.lanKeys!.closed!.tr,
? TranslationLoader.lanKeys!.opened!.tr isHaveLine: true,
: TranslationLoader.lanKeys!.closed!.tr, isHaveDirection: true,
isHaveLine: true, action: () {
isHaveDirection: true, Get.toNamed(Routers.burglarAlarmPage,
action: () { arguments: <String, LockSetInfoData>{
Get.toNamed(Routers.burglarAlarmPage, 'lockSetInfoData': state.lockSetInfoData.value
arguments: <String, LockSetInfoData>{ });
'lockSetInfoData': state.lockSetInfoData.value }))),
});
}))),
SizedBox(height: 10.h), SizedBox(height: 10.h),
// 常开模式 // 常开模式
Obx(() => Obx(() => Visibility(
Visibility( visible: state.lockFeature.value.passageMode == 1,
visible: state.lockFeature.value.passageMode == 1, // visible: true,
// visible: true, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr,
leftTitel: TranslationLoader.lanKeys!.normallyOpenMode!.tr, rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == 1
rightTitle: (state.lockSettingInfo.value.passageMode ?? 0) == ? TranslationLoader.lanKeys!.opened!.tr
1 : TranslationLoader.lanKeys!.closed!.tr,
? TranslationLoader.lanKeys!.opened!.tr isHaveLine: true,
: TranslationLoader.lanKeys!.closed!.tr, isHaveDirection: true,
isHaveLine: true, action: () {
isHaveDirection: true, Get.toNamed(Routers.normallyOpenModePage,
action: () { arguments: <String, LockSetInfoData>{
Get.toNamed(Routers.normallyOpenModePage, 'lockSetInfoData': state.lockSetInfoData.value
arguments: <String, LockSetInfoData>{ });
'lockSetInfoData': state.lockSetInfoData.value }))),
});
}))),
// 远程开锁 // 远程开锁
Obx(() => Obx(() => Visibility(
Visibility( visible: state.lockFeature.value.remoteUnlock == 1,
visible: state.lockFeature.value.remoteUnlock == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.remoteUnlocking!.tr,
leftTitel: TranslationLoader.lanKeys!.remoteUnlocking!.tr, rightTitle: (state.lockSettingInfo.value.remoteUnlock ?? 0) == 1
rightTitle: (state.lockSettingInfo.value.remoteUnlock ?? 0) == ? TranslationLoader.lanKeys!.opened!.tr
1 : TranslationLoader.lanKeys!.closed!.tr,
? TranslationLoader.lanKeys!.opened!.tr isHaveLine: true,
: TranslationLoader.lanKeys!.closed!.tr, isHaveDirection: true,
isHaveLine: true, action: () {
isHaveDirection: true, Get.toNamed(Routers.remoteUnlockingPage,
action: () { arguments: <String, LockSetInfoData>{
Get.toNamed(Routers.remoteUnlockingPage, 'lockSetInfoData': state.lockSetInfoData.value
arguments: <String, LockSetInfoData>{ });
'lockSetInfoData': state.lockSetInfoData.value }))),
});
}))),
// 重置键 // 重置键
Obx(() => Obx(() => Visibility(
Visibility( visible: state.lockBasicInfo.value.isLockOwner == 1 &&
visible: state.lockBasicInfo.value.isLockOwner == 1 && state.lockFeature.value.resetSwitch == 1,
state.lockFeature.value.resetSwitch == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.resetButton!.tr,
leftTitel: TranslationLoader.lanKeys!.resetButton!.tr, rightTitle: (state.lockSettingInfo.value.resetSwitch ?? 0) == 1
rightTitle: (state.lockSettingInfo.value.resetSwitch ?? 0) == ? TranslationLoader.lanKeys!.opened!.tr
1 : TranslationLoader.lanKeys!.closed!.tr,
? TranslationLoader.lanKeys!.opened!.tr isHaveLine: true,
: TranslationLoader.lanKeys!.closed!.tr, isHaveDirection: true,
isHaveLine: true, action: () {
isHaveDirection: true, Get.toNamed(Routers.resetButtonPage,
action: () { arguments: <String, LockSetInfoData>{
Get.toNamed(Routers.resetButtonPage, 'lockSetInfoData': state.lockSetInfoData.value
arguments: <String, LockSetInfoData>{ });
'lockSetInfoData': state.lockSetInfoData.value }))),
});
}))),
SizedBox(height: 10.h), SizedBox(height: 10.h),
//---田总新增展示 //---田总新增展示
// Obx(() => // Obx(() =>
@ -409,20 +397,19 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
}); });
})), })),
//猫眼设置 //猫眼设置
Obx(() => Obx(() => Visibility(
Visibility( visible: state.lockFeature.value.isSupportCatEye == 1,
visible: state.lockFeature.value.isSupportCatEye == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.catEyeSet!.tr,
leftTitel: TranslationLoader.lanKeys!.catEyeSet!.tr, rightTitle: '',
rightTitle: '', isHaveLine: true,
isHaveLine: true, isHaveDirection: true,
isHaveDirection: true, action: () {
action: () { Get.toNamed(Routers.catEyeSetPage,
Get.toNamed(Routers.catEyeSetPage, arguments: <String, LockSetInfoData>{
arguments: <String, LockSetInfoData>{ 'lockSetInfoData': state.lockSetInfoData.value
'lockSetInfoData': state.lockSetInfoData.value });
}); }))),
}))),
// Obx(() => // Obx(() =>
//自动亮屏已包括至面容开锁模块 //自动亮屏已包括至面容开锁模块
// Visibility( // Visibility(
@ -477,7 +464,7 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// 蓝牙广播（关闭则不能使用蓝牙主动开锁） // 蓝牙广播（关闭则不能使用蓝牙主动开锁）
/* 2024-01-12 会议确定去掉“蓝牙广播” by DaisyWu /* 2024-01-12 会议确定去掉“蓝牙广播” by DaisyWu
Obx(() => Visibility( Obx(() => Visibility(
visible: true, visible: true,
child: CommonItem( child: CommonItem(
leftTitel: TranslationLoader.lanKeys!.bluetoothBroadcast!.tr, leftTitel: TranslationLoader.lanKeys!.bluetoothBroadcast!.tr,
rightTitle: "", rightTitle: "",
@ -511,66 +498,62 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
// }), // }),
// 考勤 // 考勤
Obx( Obx(
() => () => Visibility(
Visibility( visible: state.lockBasicInfo.value.isLockOwner == 1 &&
visible: state.lockBasicInfo.value.isLockOwner == 1 && state.lockFeature.value.attendance == 1,
state.lockFeature.value.attendance == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.checkingIn!.tr,
leftTitel: TranslationLoader.lanKeys!.checkingIn!.tr, rightTitle: '',
rightTitle: '', isHaveLine: true,
isHaveLine: true, isHaveRightWidget: true,
isHaveRightWidget: true, rightWidget: _openCheckInSwitch())),
rightWidget: _openCheckInSwitch())),
), ),
// 开锁提醒 // 开锁提醒
Obx( Obx(
() => () => Visibility(
Visibility( visible: state.lockBasicInfo.value.isLockOwner == 1 &&
visible: state.lockBasicInfo.value.isLockOwner == 1 && state.lockFeature.value.unlockReminder == 1,
state.lockFeature.value.unlockReminder == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader.lanKeys!.unlockReminder!.tr,
leftTitel: TranslationLoader.lanKeys!.unlockReminder!.tr, rightTitle: '',
rightTitle: '', isHaveLine: true,
isHaveLine: true, isHaveRightWidget: true,
isHaveRightWidget: true, rightWidget: _lockRemindSwitch())),
rightWidget: _lockRemindSwitch())),
), ),
// APP开锁时是否需联网 // APP开锁时是否需联网
Obx( Obx(
() => () => Visibility(
Visibility( visible: state.lockBasicInfo.value.isLockOwner == 1 &&
visible: state.lockBasicInfo.value.isLockOwner == 1 && state.lockFeature.value.appUnlockOnline == 1,
state.lockFeature.value.appUnlockOnline == 1, child: CommonItem(
child: CommonItem( leftTitel: TranslationLoader
leftTitel: TranslationLoader .lanKeys!.whetherInternetRequiredWhenUnlocking!.tr,
.lanKeys!.whetherInternetRequiredWhenUnlocking!.tr, rightTitle: '',
rightTitle: '', isHaveLine: false,
isHaveLine: false, isHaveRightWidget: true,
isHaveRightWidget: true, rightWidget: _openLockNeedOnlineSwitch()),
rightWidget: _openLockNeedOnlineSwitch()), ),
),
), ),
SizedBox(height: 10.h), SizedBox(height: 10.h),
// wifi配网 // wifi配网
Obx( Obx(
() => () => Visibility(
Visibility( visible: state.lockFeature.value.wifi == 1,
visible: state.lockFeature.value.wifi == 1, child: CommonItem(
child: CommonItem( leftTitel:
leftTitel:
TranslationLoader.lanKeys!.wifiDistributionNetwork!.tr, TranslationLoader.lanKeys!.wifiDistributionNetwork!.tr,
rightTitle: '', rightTitle: '',
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed(Routers.wifiListPage, Get.toNamed(Routers.wifiListPage,
arguments: <String, LockSetInfoData>{ arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
// Get.toNamed(Routers.configuringWifiPage, arguments: { // Get.toNamed(Routers.configuringWifiPage, arguments: {
// 'lockSetInfoData': state.lockSetInfoData.value // 'lockSetInfoData': state.lockSetInfoData.value
// }); // });
})), })),
), ),
// Obx(() => // Obx(() =>
// 锁时间 // 锁时间
@ -582,10 +565,10 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
isHaveLine: true, isHaveLine: true,
isHaveDirection: true, isHaveDirection: true,
action: () { action: () {
Get.toNamed( Get.toNamed(Routers.lockTimePage,
Routers.lockTimePage, arguments: <String, LockSetInfoData>{ arguments: <String, LockSetInfoData>{
'lockSetInfoData': state.lockSetInfoData.value 'lockSetInfoData': state.lockSetInfoData.value
}); });
})), })),
// ), // ),
// Obx(() => // Obx(() =>
@ -676,12 +659,11 @@ class _LockSetPageState extends State<LockSetPage> with RouteAware {
thumbColor: CupertinoColors.white, thumbColor: CupertinoColors.white,
value: state.isAttendance.value == 1, value: state.isAttendance.value == 1,
onChanged: (bool value) { onChanged: (bool value) {
logic.openCheckingInData(( logic.openCheckingInData(
CheckingInInfoDataEntity checkingInInfoDataEntity) { (CheckingInInfoDataEntity checkingInInfoDataEntity) {
if (checkingInInfoDataEntity.data!.companyId == 0) { if (checkingInInfoDataEntity.data!.companyId == 0) {
// logic.showCupertinoAlertDialog(context); // logic.showCupertinoAlertDialog(context);
ShowTipView().showIosTipWithContentDialog( ShowTipView().showIosTipWithContentDialog('创建公司后,考勤功能才能使用'.tr, () {
'创建公司后,考勤功能才能使用'.tr, () {
// 删除锁 // 删除锁
Get.toNamed(Routers.checkInCreatCompanyPage, Get.toNamed(Routers.checkInCreatCompanyPage,
arguments: <String, LockSetInfoData>{ arguments: <String, LockSetInfoData>{

7
lib/main/lockDetail/lockSet/wirelessKeyboard/wirelessKeyboardList/wirelessKeyboard_page.dart
View File

@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart';
import 'package:star_lock/tools/noData.dart'; import 'package:star_lock/tools/noData.dart';
import '../../../../../appRouters.dart'; import '../../../../../appRouters.dart';
@ -19,6 +20,7 @@ class WirelessKeyboardPage extends StatefulWidget {
class _WirelessKeyboardPageState extends State<WirelessKeyboardPage> { class _WirelessKeyboardPageState extends State<WirelessKeyboardPage> {
List dataList = []; List dataList = [];
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
@ -34,6 +36,11 @@ class _WirelessKeyboardPageState extends State<WirelessKeyboardPage> {
style: TextStyle(color: Colors.white, fontSize: 24.sp), style: TextStyle(color: Colors.white, fontSize: 24.sp),
), ),
onPressed: () { onPressed: () {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
_showDialog(context); _showDialog(context);
}, },
), ),

6
lib/main/lockDetail/palm/palmList/palmList_page.dart
View File

@ -4,6 +4,7 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/fingerprint/fingerprintList/fingerprintListData_entity.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/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/keySearchWidget.dart';
import 'package:star_lock/tools/left_slide/left_slide_actions.dart'; import 'package:star_lock/tools/left_slide/left_slide_actions.dart';
@ -44,6 +45,11 @@ class _PalmListPageState extends State<PalmListPage> {
onPressed: () async { onPressed: () async {
var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
showDeletAlertDialog(context); showDeletAlertDialog(context);
} else { } else {
// Get.toNamed(Routers.selectLockTypePage); // Get.toNamed(Routers.selectLockTypePage);

11
lib/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_page.dart
View File

@ -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_logic.dart';
import 'package:star_lock/main/lockDetail/passwordKey/passwordKeyList/passwordKeyList_state.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/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/noData.dart';
import 'package:star_lock/tools/storage.dart'; import 'package:star_lock/tools/storage.dart';
import '../../../../appRouters.dart'; import '../../../../appRouters.dart';
@ -67,6 +68,11 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage>
final bool? isDemoMode = final bool? isDemoMode =
await Storage.getBool(ifIsDemoModeOrNot); await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
if (state.itemDataList.isEmpty) { if (state.itemDataList.isEmpty) {
logic.showToast('暂无密码,无需重置'.tr); logic.showToast('暂无密码,无需重置'.tr);
return; return;
@ -227,7 +233,8 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage>
Row( Row(
children: <Widget>[ children: <Widget>[
SizedBox( 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 - 100.w
: 1.sw - 110.w - 50.w, : 1.sw - 110.w - 50.w,
child: Row(children: <Widget>[ child: Row(children: <Widget>[
@ -247,7 +254,7 @@ class _PasswordKeyListPageState extends State<PasswordKeyListPage>
'已过期'.tr, '已过期'.tr,
style: TextStyle(color: Colors.red, fontSize: 20.sp), style: TextStyle(color: Colors.red, fontSize: 20.sp),
) )
else if (passwordKeyListItem.keyboardPwdStatus == 3) else if (passwordKeyListItem.keyboardPwdStatus == 3)
Text( Text(
'未生效'.tr, '未生效'.tr,
style: TextStyle(color: Colors.red, fontSize: 20.sp), style: TextStyle(color: Colors.red, fontSize: 20.sp),

6
lib/main/lockDetail/remoteControl/remoteControlList/remoteControlList_page.dart
View File

@ -3,6 +3,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockMian/lockMain/lockMain_logic.dart';
import '../../../../appRouters.dart'; import '../../../../appRouters.dart';
import '../../../../app_settings/app_colors.dart'; import '../../../../app_settings/app_colors.dart';
@ -44,6 +45,11 @@ class _RemoteControlListPageState extends State<RemoteControlListPage> {
onPressed: () async { onPressed: () async {
var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot); var isDemoMode = await Storage.getBool(ifIsDemoModeOrNot);
if (isDemoMode == false) { if (isDemoMode == false) {
final bool isNetWork =
LockMainLogic.to()?.judgeTheNetwork() ?? false;
if (!isNetWork) {
return;
}
showDeletAlertDialog(context); showDeletAlertDialog(context);
} else { } else {
// Get.toNamed(Routers.selectLockTypePage); // Get.toNamed(Routers.selectLockTypePage);

19
lib/main/lockMian/lockMain/lockMain_logic.dart
View File

@ -109,11 +109,20 @@ class LockMainLogic extends BaseGetXController {
result != ConnectivityResult.none) { result != ConnectivityResult.none) {
// 从无网络到有网络 // 从无网络到有网络
state.networkConnectionStatus.value = 1; 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<void> checkWhetherPushIsEnabled() async { Future<void> checkWhetherPushIsEnabled() async {
bool notificationEnabled = false; bool notificationEnabled = false;
@ -261,6 +270,7 @@ class LockMainLogic extends BaseGetXController {
super.onInit(); super.onInit();
checkWhetherPushIsEnabled(); checkWhetherPushIsEnabled();
_initSubscription(); _initSubscription();
connectListener();
} }
@override @override
@ -270,4 +280,11 @@ class LockMainLogic extends BaseGetXController {
}); });
super.onClose(); super.onClose();
} }
static LockMainLogic? to() {
if (Get.isRegistered<LockMainLogic>()) {
return Get.find<LockMainLogic>();
}
return null;
}
} }