From cb10217e93789599fed9324380184aa0327f0859 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 17 Nov 2023 18:45:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=94=B9=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c | 4 ++-- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h | 2 +- .../source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 1 + .../source/sf_app/code/source/paramMng/sf_param_common.c | 1 + .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c | 4 ++-- .../source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 1 + 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c index 028b08c23..abae6b8df 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c @@ -30,7 +30,7 @@ INT32 gUITimeHour = 0; INT32 gUITimeMinute = 0; INT32 gUITimeSecond = 0; -INT32 gUIDateSetFmt = DATEFMT_YMD; +INT32 gUIDateSetFmt = DATEFMT_MDY; INT32 gUITimeSetFmt = TIMEFMT_24HR; void Validate_Date(INT32 *pYear, INT32 *pMonth, INT32 *pDay, @@ -44,7 +44,7 @@ void DateTime_Init(void) gUIDateMonth = DEF_MONTH; gUIDateDay = DEF_DAY; gUITimeHour = gUITimeMinute = gUITimeSecond = 0; - gUIDateSetFmt = DATEFMT_YMD; + gUIDateSetFmt = DATEFMT_MDY; gUITimeSetFmt = TIMEFMT_24HR; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h index 597bd6db5..25cfe42cf 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h @@ -142,7 +142,7 @@ #define DEFAULT_HDMI_MODE VIDEOOUT2_AUTO #define DEFAULT_DUALDISP DUALDISP_OFF #define DEFAULT_SENSOR_ROTATE SEN_ROTATE_OFF -#define DEFAULT_DATE_FORMAT DATE_FORMAT_YMD +#define DEFAULT_DATE_FORMAT DATE_FORMAT_MDY #define DEFAULT_OPENING_LOGO OPENING_LOGO_ON #define DEFAULT_LCD_DISPLAY DISPOUT_NORMAL #define DEFAULT_LCD_BRIGHTNESS LCDBRT_LVL_05 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 44b1511b7..bb1b3b7d3 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 @@ -2368,6 +2368,7 @@ void sf_power_on_para_check_init(void) if(puiPara->DateStyle != SysGetFlag(FL_DateFormatIndex)) { SysSetFlag(FL_DateFormatIndex, puiPara->DateStyle); + SysSetFlag(FL_DATE_FORMAT, puiPara->DateStyle); } if(puiPara->Language != SysGetFlag(FL_LANGUAGE)) { diff --git a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c index 4b4171e50..a10a9797f 100755 --- a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c +++ b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c @@ -329,6 +329,7 @@ void sf_app_power_on_para_check_init(void) if(puiPara->DateStyle != sf_sys_get_flag(FL_DateFormatIndex)) { sf_sys_set_flag(FL_DateFormatIndex, puiPara->DateStyle); + sf_sys_set_flag(FL_DATE_FORMAT, puiPara->DateStyle); } if(puiPara->Language != sf_sys_get_flag(FL_LANGUAGE)) { 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 21bf95fa6..a997ba960 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 @@ -30,7 +30,7 @@ INT32 gUITimeHour = 0; INT32 gUITimeMinute = 0; INT32 gUITimeSecond = 0; -INT32 gUIDateSetFmt = DATEFMT_YMD; +INT32 gUIDateSetFmt = DATEFMT_MDY; INT32 gUITimeSetFmt = TIMEFMT_24HR; void Validate_Date(INT32 *pYear, INT32 *pMonth, INT32 *pDay, @@ -44,7 +44,7 @@ void DateTime_Init(void) gUIDateMonth = DEF_MONTH; gUIDateDay = DEF_DAY; gUITimeHour = gUITimeMinute = gUITimeSecond = 0; - gUIDateSetFmt = DATEFMT_YMD; + gUIDateSetFmt = DATEFMT_MDY; gUITimeSetFmt = TIMEFMT_24HR; } 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 aac3609ac..8a6c206cc 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 @@ -1761,6 +1761,7 @@ void sf_power_on_para_check_init(void) if(puiPara->DateStyle != SysGetFlag(FL_DateFormatIndex)) { SysSetFlag(FL_DateFormatIndex, puiPara->DateStyle); + SysSetFlag(FL_DATE_FORMAT, puiPara->DateStyle); } if(puiPara->Language != SysGetFlag(FL_LANGUAGE)) {