From e8c8e11222434df5f5d9c9eab387a823d077e79a Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 8 Dec 2023 15:42:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=A7=86=E9=A2=91=E6=B0=B4?= =?UTF-8?q?=E5=8D=B0=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c | 9 ++++++--- .../source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c b/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c index 06098bcc9..28dc0d4c4 100755 --- a/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c +++ b/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c @@ -1453,6 +1453,8 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color) void MovieStamp_UpdateData(void) { UINT32 i; + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + #if (MOVIE_ISP_LOG == 0) struct tm CurDateTime; @@ -1466,12 +1468,13 @@ void MovieStamp_UpdateData(void) // Prepare date-time string if ((g_uiMovieStampSetup[i] & STAMP_DATE_TIME_MASK) == STAMP_DATE_TIME) { - switch (g_uiMovieStampSetup[i] & STAMP_DATE_FORMAT_MASK) { - case STAMP_DD_MM_YY: + //printf("[%s:%d]DateStyle=%d", __FUNCTION__, __LINE__, puiPara->DateStyle); + switch (puiPara->DateStyle) { + case DATEFMT_DMY: //sprintf(&g_cMovieStampStr[i][0], "%02d/%02d/%04d %02d:%02d:%02d", CurDateTime.tm_mday, CurDateTime.tm_mon, CurDateTime.tm_year, CurDateTime.tm_hour, CurDateTime.tm_min, CurDateTime.tm_sec); snprintf(&g_cMovieStampStr[i][0], MOVIE_STAMP_MAX_LEN, "%02d/%02d/%04d %02d:%02d:%02d", CurDateTime.tm_mday, CurDateTime.tm_mon, CurDateTime.tm_year, CurDateTime.tm_hour, CurDateTime.tm_min, CurDateTime.tm_sec); break; - case STAMP_MM_DD_YY: + case DATEFMT_MDY: //sprintf(&g_cMovieStampStr[i][0], "%02d/%02d/%04d %02d:%02d:%02d", CurDateTime.tm_mon, CurDateTime.tm_mday, CurDateTime.tm_year, CurDateTime.tm_hour, CurDateTime.tm_min, CurDateTime.tm_sec); snprintf(&g_cMovieStampStr[i][0], MOVIE_STAMP_MAX_LEN, "%02d/%02d/%04d %02d:%02d:%02d", CurDateTime.tm_mon, CurDateTime.tm_mday, CurDateTime.tm_year, CurDateTime.tm_hour, CurDateTime.tm_min, CurDateTime.tm_sec); break; diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c index b0516c8ee..0a980b8c8 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieStamp/MovieStamp.c @@ -1443,6 +1443,8 @@ void MovieStamp_CombineStamp(UINT32 vid_in, UINT32 bg_color) void MovieStamp_UpdateData(void) { UINT32 i; + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + #if (MOVIE_ISP_LOG == 0) struct tm CurDateTime; @@ -1455,12 +1457,13 @@ void MovieStamp_UpdateData(void) // Prepare date-time string if ((g_uiMovieStampSetup[i] & STAMP_DATE_TIME_MASK) == STAMP_DATE_TIME) { - switch (g_uiMovieStampSetup[i] & STAMP_DATE_FORMAT_MASK) { - case STAMP_DD_MM_YY: + //printf("[%s:%d]DateStyle=%d", __FUNCTION__, __LINE__, puiPara->DateStyle); + switch (puiPara->DateStyle) { + case DATEFMT_DMY: //sprintf(&g_cMovieStampStr[i][0], "%02d/%02d/%04d %02d:%02d:%02d", CurDateTime.tm_mday, CurDateTime.tm_mon, CurDateTime.tm_year, CurDateTime.tm_hour, CurDateTime.tm_min, CurDateTime.tm_sec); snprintf(&g_cMovieStampStr[i][0], MOVIE_STAMP_MAX_LEN, "%02d/%02d/%04d %02d:%02d:%02d", CurDateTime.tm_mday, CurDateTime.tm_mon, CurDateTime.tm_year, CurDateTime.tm_hour, CurDateTime.tm_min, CurDateTime.tm_sec); break; - case STAMP_MM_DD_YY: + case DATEFMT_MDY: //sprintf(&g_cMovieStampStr[i][0], "%02d/%02d/%04d %02d:%02d:%02d", CurDateTime.tm_mon, CurDateTime.tm_mday, CurDateTime.tm_year, CurDateTime.tm_hour, CurDateTime.tm_min, CurDateTime.tm_sec); snprintf(&g_cMovieStampStr[i][0], MOVIE_STAMP_MAX_LEN, "%02d/%02d/%04d %02d:%02d:%02d", CurDateTime.tm_mon, CurDateTime.tm_mday, CurDateTime.tm_year, CurDateTime.tm_hour, CurDateTime.tm_min, CurDateTime.tm_sec); break;