From 0ef0217d0fdb33c3dfc3c56c0c9446f1fd94a499 Mon Sep 17 00:00:00 2001 From: payton Date: Mon, 27 Nov 2023 11:14:36 +0800 Subject: [PATCH] =?UTF-8?q?1.date=20time=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 11 ++++++++++- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) 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 bb1b3b7d3..ddff14480 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 @@ -1540,7 +1540,16 @@ void SysSetFixedFlagSysInit(void) void SysResetFlag(void) { #if HUNTING_CAMERA_MCU == ENABLE + CHAR dateAuto;/*Auto/Manual*/ UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if((SF_DATE_MANUAL == puiPara->DateAuto) && (!puiPara->OtaFlag)) + { + dateAuto = SF_DATE_MANUAL; + } + else + { + dateAuto = DEFAULT_DATE_AUTO; + } memset(puiPara, 0, sizeof(UIMenuStoreInfo)); #endif // Set system flag default value here @@ -1747,7 +1756,7 @@ void SysResetFlag(void) puiPara->TimeSend2.Hour = 0; puiPara->TimeSend2.Min = 0; - puiPara->DateAuto = DEFAULT_DATE_AUTO; + puiPara->DateAuto = dateAuto; //NTPZoneS, //NTPZoneH, //NTPZoneM, 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 83be31694..13a3f0818 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 @@ -952,7 +952,16 @@ void SysSetFixedFlagSysInit(void) void SysResetFlag(void) { #if HUNTING_CAMERA_MCU == ENABLE + CHAR dateAuto;/*Auto/Manual*/ UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if((SF_DATE_MANUAL == puiPara->DateAuto) && (!puiPara->OtaFlag)) + { + dateAuto = SF_DATE_MANUAL; + } + else + { + dateAuto = DEFAULT_DATE_AUTO; + } memset(puiPara, 0, sizeof(UIMenuStoreInfo)); #endif // Set system flag default value here @@ -1159,7 +1168,7 @@ void SysResetFlag(void) puiPara->TimeSend2.Hour = 0; puiPara->TimeSend2.Min = 0; - puiPara->DateAuto = DEFAULT_DATE_AUTO; + puiPara->DateAuto = dateAuto; //NTPZoneS, //NTPZoneH, //NTPZoneM,