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

录像时间段接口对接及对应逻辑处理

Browse Source
This commit is contained in:
Daisy 2024-04-07 17:23:14 +08:00
parent 98ae80cba7
commit 4cd6e49564
4 changed files with 76 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
star_lock/lib/main/lockDetail/lockSet/catEyeSet/catEyeCustomMode/catEyeCustomMode_page.dart
View File

@ -39,26 +39,30 @@ class _CatEyeCustomModePageState extends State<CatEyeCustomModePage> {
backgroundColor: AppColors.mainColor), backgroundColor: AppColors.mainColor),
body: Obx(() => Column( body: Obx(() => Column(
children: [ children: [
CommonItem( Container(
leftTitel: TranslationLoader.lanKeys!.videoSlot!.tr, margin: EdgeInsets.only(left: 20.w),
rightTitle: "", child: CommonItem(
isHaveLine: false, leftTitel: TranslationLoader.lanKeys!.videoSlot!.tr,
isHaveDirection: true, rightTitle: '',
isHaveRightWidget: true, isHaveLine: false,
rightWidget: Text(state.selectVideoSlot.value, isHaveDirection: true,
style: TextStyle( isHaveRightWidget: true,
fontSize: 22.sp, color: AppColors.darkGrayTextColor)), rightWidget: Text(state.selectVideoSlot.value,
action: () { style: TextStyle(
Navigator.pushNamed(context, Routers.videoSlotPage, fontSize: 22.sp,
arguments: { color: AppColors.darkGrayTextColor)),
'lockSetInfoData': state.lockSetInfoData.value, action: () {
'catEyeConfigData': state.lockSetInfoData.value Navigator.pushNamed(context, Routers.videoSlotPage,
.lockSettingInfo!.catEyeConfig!.isNotEmpty arguments: {
? state.lockSetInfoData.value.lockSettingInfo! 'lockSetInfoData': state.lockSetInfoData.value,
.catEyeConfig![0] 'catEyeConfigData': state.lockSetInfoData.value
: null .lockSettingInfo!.catEyeConfig!.isNotEmpty
}).then((value) => {logic.getLockSettingInfoData()}); ? state.lockSetInfoData.value.lockSettingInfo!
}, .catEyeConfig![0]
: null
}).then((value) => {logic.getLockSettingInfoData()});
},
),
), ),
_buildSubTitleItem('有人出现时录像', '有人在门口出现10秒后开始录像。\n有人按门铃时立即录像', _buildSubTitleItem('有人出现时录像', '有人在门口出现10秒后开始录像。\n有人按门铃时立即录像',
state.recordTime.value, () { state.recordTime.value, () {
@ -74,23 +78,26 @@ class _CatEyeCustomModePageState extends State<CatEyeCustomModePage> {
SizedBox( SizedBox(
height: 30.h, height: 30.h,
), ),
CommonItem( Container(
leftTitel: '实时画面', margin: EdgeInsets.only(left: 20.w),
rightTitle: state.realTimeMode.value, child: CommonItem(
isHaveLine: false, leftTitel: '实时画面',
isHaveDirection: true, rightTitle: state.realTimeMode.value,
isHaveRightWidget: false, isHaveLine: false,
action: () { isHaveDirection: true,
Navigator.pushNamed(context, Routers.liveVideoPage, isHaveRightWidget: false,
arguments: { action: () {
'lockSetInfoData': state.lockSetInfoData.value, Navigator.pushNamed(context, Routers.liveVideoPage,
'catEyeConfigData': state.lockSetInfoData.value arguments: {
.lockSettingInfo!.catEyeConfig!.isNotEmpty 'lockSetInfoData': state.lockSetInfoData.value,
? state.lockSetInfoData.value.lockSettingInfo! 'catEyeConfigData': state.lockSetInfoData.value
.catEyeConfig![0] .lockSettingInfo!.catEyeConfig!.isNotEmpty
: null ? state.lockSetInfoData.value.lockSettingInfo!
}).then((value) => {logic.getLockSettingInfoData()}); .catEyeConfig![0]
}, : null
}).then((value) => {logic.getLockSettingInfoData()});
},
),
) )
], ],
))); )));
@ -102,7 +109,7 @@ class _CatEyeCustomModePageState extends State<CatEyeCustomModePage> {
onTap: action, onTap: action,
child: Container( child: Container(
color: Colors.white, color: Colors.white,
margin: EdgeInsets.only(left: 20.sp, right: 20.sp, top: 20.h), margin: EdgeInsets.only(left: 20.w, right: 20.w, top: 20.h),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [

25
star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart
View File

@ -3,6 +3,7 @@ import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_
import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
import 'package:star_lock/network/api_repository.dart'; import 'package:star_lock/network/api_repository.dart';
import 'package:star_lock/tools/baseGetXController.dart'; import 'package:star_lock/tools/baseGetXController.dart';
import 'package:star_lock/tools/dateTool.dart';
class VideoSlotLogic extends BaseGetXController { class VideoSlotLogic extends BaseGetXController {
final VideoSlotState state = VideoSlotState(); final VideoSlotState state = VideoSlotState();
@ -23,6 +24,13 @@ class VideoSlotLogic extends BaseGetXController {
} else { } else {
state.isCustom.value = false; state.isCustom.value = false;
} }
state.startDate.value = DateTool().dateToHNString(state
.catEyeConfigData.value.catEyeModeConfig!.recordStartTime!
.toString());
state.endDate.value = DateTool().dateToHNString(state
.catEyeConfigData.value.catEyeModeConfig!.recordEndTime!
.toString());
} }
} }
return entity; return entity;
@ -30,6 +38,23 @@ class VideoSlotLogic extends BaseGetXController {
//设置猫眼工作模式 //设置猫眼工作模式
void updateCatEyeModeConfig() async { void updateCatEyeModeConfig() async {
state.isCustom.value == false
? state.recordMode.value = 0
: state.recordMode.value = 1;
if (state.recordMode.value == 1) {
state.recordStartTime.value =
DateTool().dateToTimestamp(state.startDate.value, 0);
// 将当前时间加一天
DateTime tomorrow =
DateTime(DateTool().dateToTimestamp(state.startDate.value, 0))
.add(const Duration(days: 1));
// 获取明天时间的时间戳
state.recordEndTime.value = tomorrow.millisecondsSinceEpoch;
// state.recordEndTime.value =
// DateTool().dateToTimestamp(state.endDate.value, 0);
}
var entity = await ApiRepository.to.updateCatEyeModeConfig( var entity = await ApiRepository.to.updateCatEyeModeConfig(
lockId: state.lockSetInfoData.value.lockId!, lockId: state.lockSetInfoData.value.lockId!,
catEyeConfig: [ catEyeConfig: [

15
star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_page.dart
View File

@ -2,6 +2,7 @@ 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/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart'; import 'package:star_lock/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_logic.dart';
import 'package:star_lock/tools/dateTool.dart';
import 'package:star_lock/tools/pickers/pickers.dart'; import 'package:star_lock/tools/pickers/pickers.dart';
import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart'; import 'package:star_lock/tools/pickers/time_picker/model/date_mode.dart';
import 'package:star_lock/translations/trans_lib.dart'; import 'package:star_lock/translations/trans_lib.dart';
@ -44,15 +45,6 @@ class _VideoSlotPageState extends State<VideoSlotPage> {
style: TextStyle(color: Colors.white, fontSize: 24.sp), style: TextStyle(color: Colors.white, fontSize: 24.sp),
), ),
onPressed: () { onPressed: () {
state.isCustom.value == false
? state.recordMode.value = 0
: state.recordMode.value = 1;
if (state.recordMode.value == 1) {
state.recordStartTime.value =
state.startDateTime.value.millisecondsSinceEpoch;
state.recordEndTime.value =
state.endDateTime.value.millisecondsSinceEpoch;
}
logic.updateCatEyeModeConfig(); logic.updateCatEyeModeConfig();
}, },
), ),
@ -238,10 +230,9 @@ class _VideoSlotPageState extends State<VideoSlotPage> {
onTap: () { onTap: () {
Pickers.showDatePicker(context, mode: DateMode.HM, onConfirm: (p) { Pickers.showDatePicker(context, mode: DateMode.HM, onConfirm: (p) {
if (isEndTime == false) { if (isEndTime == false) {
state.startDate.value = state.startDate.value = DateTool().getYMDHNDateString(p, 3);
'${intToStr(p.hour!)}:${intToStr(p.minute!)}';
} else { } else {
state.endDate.value = '${intToStr(p.hour!)}:${intToStr(p.minute!)}'; state.endDate.value = DateTool().getYMDHNDateString(p, 3);
} }
}); });
}, },

9
star_lock/lib/main/lockDetail/lockSet/catEyeSet/videoSlot/videoSlot_state.dart
View File

@ -1,5 +1,6 @@
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart'; import 'package:star_lock/main/lockDetail/lockSet/lockSet/lockSetInfo_entity.dart';
import 'package:star_lock/tools/dateTool.dart';
class VideoSlotState { class VideoSlotState {
var lockSetInfoData = LockSetInfoData().obs; var lockSetInfoData = LockSetInfoData().obs;
@ -7,12 +8,8 @@ class VideoSlotState {
var isCustom = false.obs; //是否自定义 var isCustom = false.obs; //是否自定义
DateTime dateTime = DateTime.now(); DateTime dateTime = DateTime.now();
final startDateTime = DateTime.now().obs; //开始时间：当日 var startDate = DateTool().getNowDateWithType(6).obs; //默认为当前时间
final endDateTime = DateTime.now().obs; //结束时间：次日 var endDate = DateTool().getNowDateWithType(6).obs; //默认为当前时间
var startDate =
'${DateTime.now().hour}:${DateTime.now().minute}'.obs; //默认为当前时间
var endDate = '${DateTime.now().hour}:${DateTime.now().minute}'.obs; //默认为当前时间
var recordMode = 0.obs; //录像时段 0全天 1自定义时间 var recordMode = 0.obs; //录像时段 0全天 1自定义时间