diff --git a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c index cef4936a1..3e402f9fa 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c @@ -1910,14 +1910,6 @@ INT32 MovieExe_OnOpen(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) Movie_CommPoolInit(); gMovie_InitCommonMemFinish=1; - #if SF_IQ_TEST == ENABLE - if((0 == access("/mnt/sd/FW98565A.bin", F_OK))){ - system("rm -rf /mnt/sd/LD96565A.bin"); - system("rm -rf /mnt/sd/FW98565A.bin"); - system("sync"); - usleep(100*1000); - } - #endif MovieExe_SetRecInfoByUISetting(); gMovie_Disp_Info.vout_ctrl = GxVideo_GetDeviceCtrl(DOUT1,DISPLAY_DEVCTRL_CTRLPATH); diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c index d5ebc0ff1..524d5921e 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIAppPhoto_Exe.c @@ -2603,14 +2603,6 @@ INT32 PhotoExe_OnOpen(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) GOIO_Turn_Onoff_IRCUT(1); //sf_ir_led_set(((2 == puiPara->NightMode) ? 2 : 1),puiPara->FlashLed, puiPara->NightMode,0); - #if SF_IQ_TEST == ENABLE - if((0 == access("/mnt/sd/FW98565A.bin", F_OK))){ - system("rm -rf /mnt/sd/LD96565A.bin"); - system("rm -rf /mnt/sd/FW98565A.bin"); - system("sync"); - usleep(100*1000); - } - #endif PhotoExe_CommPoolInit(); dualCam =PhotoExe_InitSensorCount(); @@ -2877,6 +2869,12 @@ INT32 PhotoExe_OnEV(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) uhSelect = paramArray[0]; } + if(uhSelect != SF_DEFAULT_EV) + { + DBG_ERR("FL_EV Error,uiSelect=%d\r\n", uhSelect); + } + uhSelect = SF_DEFAULT_EV; + UI_SetData(FL_EV, uhSelect); Photo_SetUserIndex(PHOTO_USR_EV, uhSelect); PhotoExe_AE_SetUIInfo(AET_ITEM_EV, Get_EVValue(uhSelect)); @@ -3903,6 +3901,12 @@ INT32 PhotoExe_OnSharpness(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) uhSelect = paramArray[0]; } + if(uhSelect != SF_DEFAULT_SHARPNESS) + { + DBG_ERR("FL_SHARPNESS Error,uiSelect=%d\r\n", uhSelect); + } + uhSelect = SF_DEFAULT_SHARPNESS; + DBG_IND("%d \r\n", uhSelect); UI_SetData(FL_SHARPNESS, uhSelect); PhotoExe_IQ_SetUIInfo(IQT_ITEM_SHARPNESS_LV, Get_SharpnessValue(uhSelect)); diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c index 43cad12b1..729e352f0 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c @@ -303,7 +303,7 @@ void UiDateImprint_InitBuff(void) #if defined(_UI_STYLE_LVGL_) pInfo->MemSize = UIDateImprint_GetStampMemSize_LVGL((const lv_font_t *)pFont, UiDateImprint_InitStrBuf()); - pInfo->MemSize = pInfo->MemSize/4*5; + //pInfo->MemSize = pInfo->MemSize/4*5; //add alloc buff. #else GxGfx_SetTextStroke((const FONT *)pFont, FONTSTYLE_NORMAL, SCALE_1X); GxGfx_Text(0, 0, 0, UiDateImprint_InitStrBuf()); //not really draw @@ -344,7 +344,7 @@ void UiDateImprint_InitBuff(void) #if defined(_UI_STYLE_LVGL_) pInfo->MemSize = UIDateImprint_GetStampMemSize_LVGL((const lv_font_t *)pFont, UiDateImprint_InitStrBuf()); - pInfo->MemSize = pInfo->MemSize/4*5; + //pInfo->MemSize = pInfo->MemSize/4*5; //add alloc buff. #else GxGfx_SetTextStroke((const FONT *)pFont, FONTSTYLE_NORMAL, SCALE_1X); GxGfx_Text(0, 0, 0, UiDateImprint_InitStrBuf()); //not really draw @@ -381,7 +381,7 @@ void UiDateImprint_InitBuff(void) #if defined(_UI_STYLE_LVGL_) pInfo->MemSize = UIDateImprint_GetStampMemSize_LVGL((const lv_font_t *)pFont, UiDateImprint_InitStrBuf()); - pInfo->MemSize = pInfo->MemSize/4*5; + //pInfo->MemSize = pInfo->MemSize/4*5; //add alloc buff. #else GxGfx_SetTextStroke((const FONT *)pFont, FONTSTYLE_NORMAL, SCALE_1X); GxGfx_Text(0, 0, 0, UiDateImprint_InitStrBuf()); //not really draw @@ -911,7 +911,14 @@ void UiDateImprint_DrawBG(DS_STAMP_INFOR *stampInfo, HD_VIDEO_FRAME* Img) param.color = LV_USER_CFG_STAMP_COLOR_BACKGROUND; /* ARGB format */ param.thickness = 10; param.rect.w = Img->dim.w; - param.rect.h = (stampInfo->Img.dim.h/10)*12; + if((Img->dim.w == 1920) || (Img->dim.w == 2560)) //bigger or 5M + { + param.rect.h = stampInfo->Img.dim.h; + } + else + { + param.rect.h = stampInfo->Img.dim.h*11/10; /*add heigt*/ + } param.rect.x = 0; //param.rect.y = stampInfo->PosY; param.rect.y = Img->dim.h - param.rect.h; diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.h b/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.h index 76dcab935..5aaa64b75 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.h +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.h @@ -10,4 +10,5 @@ extern void UiDateImprint_SetEnable(BOOL bEnable); extern BOOL UiDateImprint_GenData(IMG_CAP_DATASTAMP_INFO *pInfo); extern void UiDateImprint_InitBuff(void); extern void UiDateImprint_DestroyBuff(void); +UINT8 sf_solar_to_Lunar(UINT16 Year,UINT8 Month, UINT8 Day); #endif diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index 005cd2522..177d8aef6 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -51,7 +51,8 @@ UISysInfo; //PStore #define VER_STR_MAX 32 - +#define SF_DEFAULT_EV 6 +#define SF_DEFAULT_SHARPNESS 1 typedef enum { // << system setting flags region (should be stored in PStore and read back while system initial) >> diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c b/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c index c04fc799e..0e0cf632b 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/Movie/UIAppMovie_Exe.c @@ -4176,6 +4176,12 @@ INT32 MovieExe_OnEV(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) uiSelect = paramArray[0]; } + if(uiSelect != SF_DEFAULT_EV) + { + DBG_ERR("FL_EV Error,uiSelect=%d\r\n", uiSelect); + } + uiSelect = SF_DEFAULT_EV; + UI_SetData(FL_EV, uiSelect); //photo and movie use the same EV value,should syncronize photo EV setting Photo_SetUserIndex(PHOTO_USR_EV, uiSelect); diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h index b6fb306df..a7e74cf95 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h @@ -51,7 +51,8 @@ UISysInfo; //PStore #define VER_STR_MAX 32 - +#define SF_DEFAULT_EV 6 +#define SF_DEFAULT_SHARPNESS 1 typedef enum { // << system setting flags region (should be stored in PStore and read back while system initial) >>