payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.参数优化

Browse Source 
2.修复拍照连续按test键问题
This commit is contained in:
payton 2023-08-18 16:53:26 +08:00
parent dc82bcc18e
commit d5b15079dd
4 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -1192,14 +1192,14 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
{ {
case LV_USER_KEY_SHUTTER2: case LV_USER_KEY_SHUTTER2:
{ {
/*#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_rtsp_stop(); sf_rtsp_stop();
if(TRUE == sf_get_send_statu()) if(TRUE == sf_get_send_statu())
{ {
printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key); printf("\r\n[%s] line:%d %d running\n", __FUNCTION__, __LINE__,key);
break; break;
} }
#endif*/ #endif
UIFlowPhoto_OnExeCaptureStart(obj); UIFlowPhoto_OnExeCaptureStart(obj);
break; break;
} }

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c
View File

@ -2323,6 +2323,7 @@ void sf_power_on_para_check_init(void)
if(puiPara->VideoSize != SysGetFlag(FL_MOVIE_SIZE)) if(puiPara->VideoSize != SysGetFlag(FL_MOVIE_SIZE))
{ {
SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize); SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize);
SysSetFlag(FL_MOVIE_SIZE_MENU, puiPara->VideoSize);
} }
if(puiPara->ImgSize != SysGetFlag(FL_PHOTO_SIZE)) if(puiPara->ImgSize != SysGetFlag(FL_PHOTO_SIZE))

21
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -428,8 +428,27 @@ BOOL sf_cmd_video_size(unsigned char argc, char **argv)
if(value < MOVIE_SIZE_ID_MAX){ if(value < MOVIE_SIZE_ID_MAX){
puiPara->VideoSize = value; puiPara->VideoSize = value;
SysSetFlag(FL_MOVIE_SIZE, value); SysSetFlag(FL_MOVIE_SIZE, value);
//SysSetFlag(FL_MOVIE_SIZE_MENU, value); SysSetFlag(FL_MOVIE_SIZE_MENU, value);
Save_MenuInfo(); 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)); printf("[%s:%d] FL_MOVIE_SIZE:%d\n", __FUNCTION__, __LINE__,SysGetFlag(FL_MOVIE_SIZE));
return TRUE; return TRUE;

1
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c
View File

@ -1705,6 +1705,7 @@ void sf_power_on_para_check_init(void)
if(puiPara->VideoSize != SysGetFlag(FL_MOVIE_SIZE)) if(puiPara->VideoSize != SysGetFlag(FL_MOVIE_SIZE))
{ {
SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize); SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize);
SysSetFlag(FL_MOVIE_SIZE_MENU, puiPara->VideoSize);
} }
if(puiPara->ImgSize != SysGetFlag(FL_PHOTO_SIZE)) if(puiPara->ImgSize != SysGetFlag(FL_PHOTO_SIZE))