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

Merge branch 'master' of https://gitee.com/starlock-cn/app-starlock

Browse Source
This commit is contained in:
魏少阳 2024-04-06 09:19:40 +08:00
commit c57426cbcc
4 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
star_lock/lib/main/lockDetail/doorLockLog/doorLockLog_page.dart
View File

@ -94,7 +94,7 @@ class _DoorLockLogPageState extends State<DoorLockLogPage> {
),
),
primaryColor: AppColors.mainColor,
highlightColor: AppColors.blackColor,
highlightColor: Colors.yellow,
disabledColor: Colors.grey,
),
child: AdvancedCalendar(

21
star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_logic.dart
View File

@ -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;
}

4
star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeSet/catEyeSet_page.dart
View File

@ -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: "",

1
star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeWorkMode/catEyeWorkMode_state.dart
View File

@ -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 ==