From d5b15079dd5d98bbd7850c19db67e17e98d994dc Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 18 Aug 2023 16:53:26 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=82=E6=95=B0=E4=BC=98=E5=8C=96=202.?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=8D=E7=85=A7=E8=BF=9E=E7=BB=AD=E6=8C=89?= =?UTF-8?q?test=E9=94=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 4 ++-- .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 1 + .../sifar/code/source/common/sf_common.c | 21 ++++++++++++++++++- .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 1 + 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index 9eda12cf1..5ad118326 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -1192,14 +1192,14 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key) { case LV_USER_KEY_SHUTTER2: { - /*#if HUNTING_CAMERA_MCU == ENABLE + #if HUNTING_CAMERA_MCU == ENABLE sf_rtsp_stop(); if(TRUE == sf_get_send_statu()) { printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key); break; } - #endif*/ + #endif UIFlowPhoto_OnExeCaptureStart(obj); break; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index 28edc5be5..96c551c59 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -2323,6 +2323,7 @@ void sf_power_on_para_check_init(void) if(puiPara->VideoSize != SysGetFlag(FL_MOVIE_SIZE)) { SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize); + SysSetFlag(FL_MOVIE_SIZE_MENU, puiPara->VideoSize); } if(puiPara->ImgSize != SysGetFlag(FL_PHOTO_SIZE)) diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c index a985cd116..65ef1eced 100755 --- a/code/lib/source/sifar/code/source/common/sf_common.c +++ b/code/lib/source/sifar/code/source/common/sf_common.c @@ -428,8 +428,27 @@ BOOL sf_cmd_video_size(unsigned char argc, char **argv) if(value < MOVIE_SIZE_ID_MAX){ puiPara->VideoSize = value; SysSetFlag(FL_MOVIE_SIZE, value); - //SysSetFlag(FL_MOVIE_SIZE_MENU, value); + SysSetFlag(FL_MOVIE_SIZE_MENU, value); Save_MenuInfo(); + int iCurrMode = System_GetState(SYS_STATE_CURRMODE); + int iNextMode = PRIMARY_MODE_PHOTO; + + if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) + { + iNextMode = PRIMARY_MODE_PHOTO; + } + else if(puiPara->CamMode == SF_CAM_MODE_VIDEO) + { + iNextMode = PRIMARY_MODE_MOVIE; + } + else + { + iNextMode = PRIMARY_MODE_PHOTO; + } + + UI_SetData(FL_PreMode, iCurrMode); + UI_SetData(FL_NextMode, iNextMode); + Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, iNextMode); } printf("[%s:%d] FL_MOVIE_SIZE:%d\n", __FUNCTION__, __LINE__,SysGetFlag(FL_MOVIE_SIZE)); return TRUE; diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index 2ab69dca2..2639cbaa0 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -1705,6 +1705,7 @@ void sf_power_on_para_check_init(void) if(puiPara->VideoSize != SysGetFlag(FL_MOVIE_SIZE)) { SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize); + SysSetFlag(FL_MOVIE_SIZE_MENU, puiPara->VideoSize); } if(puiPara->ImgSize != SysGetFlag(FL_PHOTO_SIZE))