From 97bc564b5675c4975c8ef20df940ba3baa1a2f47 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Wed, 3 Apr 2024 17:25:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=8C=AB=E7=9C=BC?=
 =?UTF-8?q?=E5=B7=A5=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<CatEyeSetPage> {
             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<CatEyeSetPage> {
                       }).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 ==

From 3d4e5f4d16f060a7d960959441288a68bab4b3b1 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Wed, 3 Apr 2024 18:09:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E9=94=81?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=AB=98=E4=BA=AE=E8=89=B2=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
index 6a458a4e..b1af4795 100644
--- a/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
+++ b/star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
@@ -94,7 +94,7 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> {
           ),
         ),
         primaryColor: AppColors.mainColor,
-        highlightColor: AppColors.blackColor,
+        highlightColor: Colors.yellow,
         disabledColor: Colors.grey,
       ),
       child: AdvancedCalendar(