From e883e059ef1f089102e2e668de6c827f0cbf3a39 Mon Sep 17 00:00:00 2001
From: payton <payton@willfine.com>
Date: Thu, 4 Jan 2024 10:09:14 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E7=94=B5=E6=B1=A0=E9=94=82?=
 =?UTF-8?q?=E7=94=B5=E5=88=87=E6=8D=A2=E5=92=8C=E6=81=A2=E5=A4=8D=E5=8E=9F?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c        |  1 +
 .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h        |  1 +
 .../sf_app/code/source/battery/sf_battery.c    | 18 ++++++++++--------
 .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h        |  1 +
 4 files changed, 13 insertions(+), 8 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 18694b5d1..681aa79b4 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
@@ -1748,6 +1748,7 @@ void SysResetFlag(void)
     /////////////
 	puiPara->StampSwitch = DEFAULT_DATE_STAMP;//DEFAULT_STAMP_SWITCH;
 	puiPara->BatteryType = DEFAULT_BATTERY_TYPE;
+	puiPara->LiBatteryType = DEFAULT_BATTERY_TYPE;
 	puiPara->SdLoopSwitch = DEFAULT_SD_LOOP_SWITCH;
 	puiPara->PwdSwitch = DEFAULT_PWD_SWITCH;
 	puiPara->SendPhotoSwitch = DEFAULT_SEND_PHOTO_SWITCH;
diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
index bbad5e1d6..3be399bc3 100755
--- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
+++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
@@ -580,6 +580,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
 	CHAR SimIccidV[21];
 	CHAR SimIccidA[21];
     UINT32 SdFailCount;
+	CHAR LiBatteryType;/*Alkaline/NI-MH/LI*/
 	UINT32 x1;
 	UINT32 x2;
 	UINT32 x3;
diff --git a/code/application/source/sf_app/code/source/battery/sf_battery.c b/code/application/source/sf_app/code/source/battery/sf_battery.c
index d22a8d23c..3dc99c816 100755
--- a/code/application/source/sf_app/code/source/battery/sf_battery.c
+++ b/code/application/source/sf_app/code/source/battery/sf_battery.c
@@ -411,6 +411,7 @@ UINT32 sf_battery_adc_value_get_once(void)
 			printf("[sf_battery_level_polling]is lith battery\n");
 			if(SF_BATT_LI_PACK != puiPara->BatteryType)
 			{
+                puiPara->LiBatteryType = puiPara->BatteryType;
 				puiPara->BatteryType = SF_BATT_LI_PACK;
 				
 			}
@@ -420,7 +421,7 @@ UINT32 sf_battery_adc_value_get_once(void)
 		{	first_init--;
 			if (puiPara->BatteryType == SF_BATT_LI_PACK)
 			{
-				puiPara->BatteryType = SF_BATT_ALKALINE;
+                puiPara->BatteryType = puiPara->LiBatteryType == SF_BATT_LI_PACK ?SF_BATT_ALKALINE:puiPara->LiBatteryType;
 			}
 			
 		}
@@ -969,16 +970,17 @@ void sf_battery_level_polling(void)
 		printf("[sf_battery_level_polling]is lith battery\n");
         if(SF_BATT_LI_PACK != puiPara->BatteryType)
         {
+            puiPara->LiBatteryType = puiPara->BatteryType;
             puiPara->BatteryType = SF_BATT_LI_PACK;
         }
     }
-	else{
-		if(puiPara->BatteryType == SF_BATT_LI_PACK)
-		{
-			puiPara->BatteryType = SF_BATT_ALKALINE;
-		}
-		
-	}
+    else{
+        if(puiPara->BatteryType == SF_BATT_LI_PACK)
+        {
+            puiPara->BatteryType = puiPara->LiBatteryType == SF_BATT_LI_PACK ?SF_BATT_ALKALINE:puiPara->LiBatteryType;
+        }
+        
+    }
 	
 	//ret = sf_check_low_battery();
 
diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
index 38df49ae5..dc0c157a8 100755
--- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
+++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
@@ -580,6 +580,7 @@ typedef struct _UIMenuUIMenuStoreInfo {
     CHAR SimIccidV[21];
 	CHAR SimIccidA[21];
     UINT32 SdFailCount;
+	CHAR LiBatteryType;/*Alkaline/NI-MH/LI*/
 
 	UINT32 x1;
 	UINT32 x2;