From 97bc564b5675c4975c8ef20df940ba3baa1a2f47 Mon Sep 17 00:00:00 2001 From: Daisy <> Date: Wed, 3 Apr 2024 17:25:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=8C=AB=E7=9C=BC=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E6=A8=A1=E5=BC=8F=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 | 21 +++++++++++++++++++ .../catEyeSet/catEyeSet/catEyeSet_page.dart | 4 ++-- .../catEyeWorkMode/catEyeWorkMode_state.dart | 1 - 3 files changed, 23 insertions(+), 3 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 1992e46e..e49a91bf 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/common/XSConstantMacro/XSConstantMacro.dart'; 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'; @@ -74,6 +75,26 @@ class CatEyeSetLogic extends BaseGetXController { ? false : true; //异常警告 state.selectCatEyeWorkMode.value = ''; //猫眼工作模式 + + // selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!; + + if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] + .catEyeMode == + XSConstantMacro.catEyeWorkModePowerSaving) { + state.selectCatEyeWorkMode.value = '省电模式'; + } else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] + .catEyeMode == + XSConstantMacro.catEyeWorkModeStayCapture) { + state.selectCatEyeWorkMode.value = '逗留抓拍模式'; + } else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] + .catEyeMode == + XSConstantMacro.catEyeWorkModeRealTimeMonitoring) { + state.selectCatEyeWorkMode.value = '实时监控模式'; + } else if (state.lockSetInfoData.value.lockSettingInfo!.catEyeConfig![0] + .catEyeMode == + XSConstantMacro.catEyeWorkModeCustom) { + 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 6e55945c..7ee2af12 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 @@ -38,7 +38,7 @@ class _CatEyeSetPageState extends State { backgroundColor: AppColors.mainColor), body: Column( children: [ - CommonItem( + Obx(() => CommonItem( leftTitel: '猫眼工作模式', rightTitle: state.selectCatEyeWorkMode.value, allHeight: 70.h, @@ -56,7 +56,7 @@ class _CatEyeSetPageState extends State { }).then((value) { logic.getLockSettingInfoData(); }); - }), + })), Obx(() => CommonItem( leftTitel: '自动亮屏', rightTitle: "", 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 9399bf60..1d9e29dc 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 @@ -20,7 +20,6 @@ class CatEyeWorkModeState { lockSetInfoData.value = map["lockSetInfoData"]; if (map['catEyeConfigata'] != null) { catEyeConfigData.value = map['catEyeConfigata']; - print('得到的猫眼配置数据是:${catEyeConfigData.value}'); selectCatEyeWorkMode.value = catEyeConfigData.value.catEyeMode!; if (catEyeConfigData.value.catEyeMode ==