From fe93a2e48a20969de6166e3066307884a8761a0a Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 11 Aug 2023 23:16:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=9C=88=E7=9B=B8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c | 4 ++-- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c | 2 +- .../cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/DateTimeInfo.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c b/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c index f9cded41e..4c5403cea 100755 --- a/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c +++ b/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c @@ -1145,8 +1145,8 @@ unsigned long DayCode_Leap[12]= {0,31,60,91,121,152,182,213,244,274,305,335}; UINT8 sf_solar_to_Lunar(UINT16 Year,UINT8 Month, UINT8 Day) { float temp = 0,Tempnum = 0; - UINT8 tempn = 0,tempQ = 0,tempR = 0,LunarDay = 0; - UINT8 LunarDaytemp = 0; + UINT32 tempn = 0,tempQ = 0,tempR = 0,LunarDay = 0; + UINT32 LunarDaytemp = 0; if(Year>=2000) Year=Year-2000; 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 aae3cc28c..028b08c23 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 @@ -179,7 +179,7 @@ INT32 DateTime_Get(int element) rvalue = gUIDateYear; break; case DATETIME_MONTH: - rvalue = gUIDateYear; + rvalue = gUIDateMonth; break; case DATETIME_DAY: rvalue = gUIDateDay; 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 78dbc0019..21bf95fa6 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 @@ -180,7 +180,7 @@ INT32 DateTime_Get(int element) rvalue = gUIDateYear; break; case DATETIME_MONTH: - rvalue = gUIDateYear; + rvalue = gUIDateMonth; break; case DATETIME_DAY: rvalue = gUIDateDay;