From 6553290a694fc850917efd9fbd232a27c702851f Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Wed, 3 Apr 2024 16:18:08 +0800 Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E6=9B=B4=E6=94=B9V2=E9=80=80?= =?UTF-8?q?=E5=87=BA=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3=202=EF=BC=8C?= =?UTF-8?q?=E7=8C=AB=E7=9C=BC=E8=AE=BE=E7=BD=AE=E9=83=A8=E5=88=86=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../catEyeSet/catEyeSet/catEyeSet_logic.dart | 27 +++++++++++++++ .../catEyeSet/catEyeSet/catEyeSet_page.dart | 25 +++++++++----- .../catEyeWorkMode/catEyeWorkMode_logic.dart | 6 ---- .../catEyeWorkMode/catEyeWorkMode_page.dart | 21 +++++++----- .../catEyeWorkMode/catEyeWorkMode_state.dart | 33 +++++++++++-------- star_lock/lib/network/api.dart | 5 +-- 6 files changed, 79 insertions(+), 38 deletions(-) diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart index 542f134d..1992e46e 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart @@ -1,3 +1,4 @@ +import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/tools/baseGetXController.dart'; @@ -50,4 +51,30 @@ class CatEyeSetLogic extends BaseGetXController { showToast('设置成功'); } } + + // 获取锁设置信息 + Future getLockSettingInfoData() async { + LockSetInfoEntity entity = await ApiRepository.to.getLockSettingInfoData( + lockId: state.lockSetInfoData.value.lockId.toString(), + ); + if (entity.errorCode!.codeIsSuccessful) { + state.lockSetInfoData.value = entity.data!; + state.selectBrightDuration.value = + '${state.lockSetInfoData.value.lockSettingInfo!.autoLightScreenTime}秒'; //选中的亮屏持续时间 + state.isAutoBright.value = + state.lockSetInfoData.value.lockSettingInfo!.autoLightScreen == 0 + ? false + : true; //自动亮屏 + state.isStayWarning.value = + state.lockSetInfoData.value.lockSettingInfo!.stayWarn == 0 + ? false + : true; //逗留警告 + state.isExceptionWarning.value = + state.lockSetInfoData.value.lockSettingInfo!.abnormalWarn == 0 + ? false + : true; //异常警告 + state.selectCatEyeWorkMode.value = ''; //猫眼工作模式 + } + return entity; + } } diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart index 066086fb..6e55945c 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart @@ -21,6 +21,13 @@ class _CatEyeSetPageState extends State { final logic = Get.put(CatEyeSetLogic()); final state = Get.find().state; + @override + void initState() { + super.initState(); + + logic.getLockSettingInfoData(); + } + @override Widget build(BuildContext context) { return Scaffold( @@ -38,14 +45,16 @@ class _CatEyeSetPageState extends State { isHaveLine: true, isHaveDirection: true, action: () { - Get.toNamed(Routers.catEyeWorkModePage, arguments: { - 'lockSetInfoData': state.lockSetInfoData.value, - 'catEyeConfigata': state - .lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] - })?.then((value) { - if (value != null) { - state.selectCatEyeWorkMode.value = value; - } + Navigator.pushNamed(context, Routers.catEyeWorkModePage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value, + 'catEyeConfigata': state.lockSetInfoData.value + .lockSettingInfo!.catEyeConfig!.isNotEmpty + ? state.lockSetInfoData.value.lockSettingInfo! + .catEyeConfig![0] + : null + }).then((value) { + logic.getLockSettingInfoData(); }); }), Obx(() => CommonItem( diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart index 1ce793ac..5d44b635 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_logic.dart @@ -27,10 +27,4 @@ class CatEyeWorkModeLogic extends BaseGetXController { showToast('设置成功'); } } - - @override - void onReady() { - // TODO: implement onReady - super.onReady(); - } } diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart index ee44fae7..4ec91f25 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_page.dart @@ -26,29 +26,34 @@ class _CatEyeWorkModePageState extends State { appBar: TitleAppBar( barTitle: '猫眼工作模式', haveBack: true, + backAction: () { + Navigator.pop(context, true); + }, backgroundColor: AppColors.mainColor), body: Column( children: [ SizedBox( height: 30.h, ), - _buildTipsView('省电模式：\n', - '适合门口较为安全的环境。\n仅发生特定事件才录像，并可查看实时画面。\n一般情况下，满电可使用7-8个月', 0), + Obx( + () => _buildTipsView('省电模式：\n', + '适合门口较为安全的环境。\n仅发生特定事件才录像，并可查看实时画面。\n一般情况下，满电可使用7-8个月', 0), + ), SizedBox( height: 30.h, ), - _buildTipsView('逗留抓拍模式：\n', - '有人逗留或发生特定事件才录像，可随时查看\n实时画面。\n一般情况下，满电可使用5~6个月。', 1), + Obx(() => _buildTipsView('逗留抓拍模式：\n', + '有人逗留或发生特定事件才录像，可随时查看\n实时画面。\n一般情况下，满电可使用5~6个月。', 1)), SizedBox( height: 30.h, ), - _buildTipsView('实时监控模式：\n', - '适合门口人员复杂、较不安全的环境。\n有人出现就录像，可随时查看实时画面。\n一般情况下，满电可使用2~4个月。', 2), + Obx(() => _buildTipsView('实时监控模式：\n', + '适合门口人员复杂、较不安全的环境。\n有人出现就录像，可随时查看实时画面。\n一般情况下，满电可使用2~4个月。', 2)), SizedBox( height: 30.h, ), - _buildTipsView( - '自定义模式：\n', '根据您家门口实际情况设置录像和实时画面功能。\n可使用时长由具体设置决定。', 3) + Obx(() => _buildTipsView( + '自定义模式：\n', '根据您家门口实际情况设置录像和实时画面功能。\n可使用时长由具体设置决定。', 3)) ], )); } diff --git a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_state.dart b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_state.dart index e838b3be..9399bf60 100644 --- a/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_state.dart +++ b/star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_state.dart @@ -18,21 +18,26 @@ class CatEyeWorkModeState { CatEyeWorkModeState() { Map map = Get.arguments; lockSetInfoData.value = map["lockSetInfoData"]; - catEyeConfigData.value = map['catEyeConfigata']; - selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!; + if (map['catEyeConfigata'] != null) { + catEyeConfigData.value = map['catEyeConfigata']; + print('得到的猫眼配置数据是：${catEyeConfigData.value}'); + selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!; - if (catEyeConfigData.value.catEyeMode == - XSConstantMacro.catEyeWorkModePowerSaving) { - boolList[0] = true; - } else if (catEyeConfigData.value.catEyeMode == - XSConstantMacro.catEyeWorkModeStayCapture) { - boolList[1] = true; - } else if (catEyeConfigData.value.catEyeMode == - XSConstantMacro.catEyeWorkModeRealTimeMonitoring) { - boolList[2] = true; - } else if (catEyeConfigData.value.catEyeMode == - XSConstantMacro.catEyeWorkModeCustom) { - boolList[3] = true; + if (catEyeConfigData.value.catEyeMode == + XSConstantMacro.catEyeWorkModePowerSaving) { + boolList[0] = true; + } else if (catEyeConfigData.value.catEyeMode == + XSConstantMacro.catEyeWorkModeStayCapture) { + boolList[1] = true; + } else if (catEyeConfigData.value.catEyeMode == + XSConstantMacro.catEyeWorkModeRealTimeMonitoring) { + boolList[2] = true; + } else if (catEyeConfigData.value.catEyeMode == + XSConstantMacro.catEyeWorkModeCustom) { + boolList[3] = true; + } + } else { + catEyeConfigData.value = CatEyeConfig(); } } } diff --git a/star_lock/lib/network/api.dart b/star_lock/lib/network/api.dart index ac04ac88..bbc274cd 100644 --- a/star_lock/lib/network/api.dart +++ b/star_lock/lib/network/api.dart @@ -149,7 +149,8 @@ abstract class Api { final String expireLockListURL = '/keyUser/listExpireUser'; //即将到期的锁列表 final String expirePasswordListURL = '/keyUser/listExpirePwd'; //即将到期的密码列表 final String expireCardListURL = '/keyUser/listExpireCard'; //即将到期的卡列表 - final String expireFingerprintListURL = '/keyUser/listExpireFingerprint'; //即将到期的指纹列表 + final String expireFingerprintListURL = + '/keyUser/listExpireFingerprint'; //即将到期的指纹列表 final String expireFaceListURL = '//keyUser/listExpireFace'; //即将到期的人脸列表 final String userSettingsInfoURL = '/user/userSettingsInfo'; //个人设置信息 final String setAlertModeURL = '/user/setAlertMode'; //提示音 @@ -158,7 +159,7 @@ abstract class Api { final String selectLockListURL = '/room/listForTransfer'; //选择锁列表 final String setAppUnlockMustOnlineURL = '/room/setAppUnlockMustOnline'; //APP开锁时需手机联网的锁 - final String userLogoutURL = '/user/logout'; //退出登录 + final String userLogoutURL = '/v2/user/logout'; //退出登录 final String deleteAccountURL = '/user/delete'; //删除账号 final String getUserInfoURL = '/user/getUserInfo'; //获取个人信息 final String getValidationCodeAuthURL =