diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c index 2d5beab48..6becb00d9 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c @@ -1908,7 +1908,7 @@ THREAD_RETTYPE MovieFast_InitMovieModeThread(void *arg) tmp_buf += yuv_size; hd_videoproc_release_out_buf(alg_path, &frame_capture); - + sf_set_date_time_make_ymdhms(); if(++cnt >= max_cnt) break; diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c index 88a841c9c..a7205d24e 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c @@ -38,7 +38,7 @@ static char* PhotoFast_InitStrBuf(void) INT16 fTemper = 0; UINT8 temperStr[16] = {0}; - //UIMenuStoreInfo *puiPara = sf_ui_para_get(); + UIMenuStoreInfo *puiPara = sf_ui_para_get(); DateTime_Load(); @@ -50,7 +50,12 @@ static char* PhotoFast_InitStrBuf(void) case DATEIMPRINT_DATE_TIME: default: - dateStr = DateTime_MakeYMDHMS(); + if(SF_CAM_MODE_VIDEO2 == puiPara->CamMode){ + dateStr = sf_get_date_time_make_ymdhms(); + } + else { + dateStr = DateTime_MakeYMDHMS(); + } break; } diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c index 05ec07152..7821c5b16 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastSliceEncode.c @@ -2245,6 +2245,7 @@ INT32 PhotoFast_SliceEncode_CB2(void* user_data) } param->cnt++; + sf_set_cont_shot(param->cnt); if(param->cnt >= param->max_cnt) break; #if SF_NO_SD_SEND == ENABLE diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c index a997ba960..3560de205 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c @@ -33,6 +33,8 @@ INT32 gUITimeSecond = 0; INT32 gUIDateSetFmt = DATEFMT_MDY; INT32 gUITimeSetFmt = TIMEFMT_24HR; +int ContShot = 0; + void Validate_Date(INT32 *pYear, INT32 *pMonth, INT32 *pDay, BOOL bClampY, BOOL bClampM, BOOL bClampD); void Validate_Time(INT32 *pHour, INT32 *pMinute, @@ -241,6 +243,8 @@ void DateTime_Edit(int element, int bias) char gUIDateTime_StrBuf[60]; +char gsfUIDateTime_StrBuf[5][60]; + char TimeFmtNameTable[2][5] = { "24HR", "12HR", @@ -358,7 +362,62 @@ char *DateTime_MakeYMDHMS(void) return gUIDateTime_StrBuf; } +void sf_set_cont_shot(int cnt) +{ + ContShot = cnt; +} +//using by date-stamp, show time.second +char *sf_get_date_time_make_ymdhms(void) +{ + if(ContShot >= 5) + { + ContShot = 0; + } + snprintf((char *)gUIDateTime_StrBuf, sizeof(gUIDateTime_StrBuf) - 1, "%s", gsfUIDateTime_StrBuf[ContShot]); + printf("[%s:%d]gUIDateTime_StrBuf=%s\n", __FUNCTION__, __LINE__, gUIDateTime_StrBuf); + return gUIDateTime_StrBuf; +} +//using by date-stamp, show time.second +void sf_set_date_time_make_ymdhms(void) +{ + static int cnt = 0; + INT32 hr, ti; + DateTime_Load(); + hr = gUITimeHour; + ti = 0; + if (gUITimeSetFmt == TIMEFMT_12HR) { //apply Time Format + if (gUITimeHour < 12) { + ti = 1; + } + if (gUITimeHour >= 12) { + ti = 2; + } + hr = hr % 12; + if (hr == 0) { + hr = 12; + } + } + + if (gUIDateSetFmt == DATEFMT_YMD) { //YMD + snprintf((char *)gUIDateTime_StrBuf, sizeof(gUIDateTime_StrBuf) - 1, "%04ld/%02ld/%02ld %02ld:%02ld:%02ld%s", + gUIDateYear, gUIDateMonth, gUIDateDay, hr, gUITimeMinute, gUITimeSecond, Time12HRNameTable[ti]); + } else if (gUIDateSetFmt == DATEFMT_MDY) { //MDY + snprintf((char *)gUIDateTime_StrBuf, sizeof(gUIDateTime_StrBuf) - 1, "%02ld/%02ld/%04ld %02ld:%02ld:%02ld%s", + gUIDateMonth, gUIDateDay, gUIDateYear, hr, gUITimeMinute, gUITimeSecond, Time12HRNameTable[ti]); + } else { //if(gUIDateSetFmt == DATEFMT_DMY) //DMY + snprintf((char *)gUIDateTime_StrBuf, sizeof(gUIDateTime_StrBuf) - 1, "%02ld/%02ld/%04ld %02ld:%02ld:%02ld%s", + gUIDateDay, gUIDateMonth, gUIDateYear, hr, gUITimeMinute, gUITimeSecond, Time12HRNameTable[ti]); + } + snprintf((char *)gsfUIDateTime_StrBuf[cnt], sizeof(gsfUIDateTime_StrBuf[cnt]) - 1, "%s", gUIDateTime_StrBuf); + printf("[%s:%d]gsfUIDateTime_StrBuf[%d]=%s\n", __FUNCTION__, __LINE__, cnt, gsfUIDateTime_StrBuf[cnt]); + cnt++; + if(cnt >= 5) + { + cnt = 0; + } + +} //using by playback, using short year char *User_MakeYMDHM(UINT32 Year, UINT32 Month, UINT32 Day, UINT32 Hour, UINT32 Minute) diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.h b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.h index 1567e0ab7..9b38cf3c8 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.h +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.h @@ -37,7 +37,9 @@ extern char *DateTime_MakeYMDHM_Edit(void); extern char *DateTime_MakeYMDHMS(void); extern char *User_MakeYMDHM(UINT32 Year, UINT32 Month, UINT32 Day, UINT32 Hour, UINT32 Minute); extern char *User_MakeYMDHM_short(UINT32 Year, UINT32 Month, UINT32 Day, UINT32 Hour, UINT32 Minute); - +extern char *sf_get_date_time_make_ymdhms(void); +extern void sf_set_date_time_make_ymdhms(void); +extern void sf_set_cont_shot(int cnt); //----------------------------------------------------------------------------- // World Time Zone //-----------------------------------------------------------------------------