From 27fedf18e878a3f4acfadf1fcdc75aea9ef90ac2 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 5 Jan 2024 15:29:30 +0800 Subject: [PATCH] =?UTF-8?q?1.ui=E5=8F=82=E6=95=B0=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 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 681aa79b4..b989bdc86 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 @@ -502,28 +502,25 @@ void Load_MenuInfo(void) if(Check_OTA() == TRUE){ DBG_DUMP("OTA success, reset system param\n"); - #if HUNTING_CAMERA_MCU == ENABLE - if(sf_get_ui_para_flag()) - { - if(!sf_is_usb_flag()) - { - sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0); - } - memcpy(&origInfo, ¤tInfo, sizeof(currentInfo)); - memcpy(&origInfo_check, ¤tInfo, sizeof(currentInfo)); - return; - } - #endif + // #if HUNTING_CAMERA_MCU == ENABLE + // if(sf_get_ui_para_flag()) + // { + // if(!sf_is_usb_flag()) + // { + // sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0); + // } + // memcpy(&origInfo, ¤tInfo, sizeof(currentInfo)); + // memcpy(&origInfo_check, ¤tInfo, sizeof(currentInfo)); + // return; + // } + // #endif SysResetFlag(); #if HUNTING_CAMERA_MCU == ENABLE sf_power_on_para_check_init(); - if(sf_is_usb_flag()) - { - Save_MenuInfo(); - } - else + Save_MenuInfo(); + if(!sf_is_usb_flag()) { sf_mcu_reg_set(SF_MCU_SOFT_UPDATE, 0); } @@ -1132,9 +1129,9 @@ EXIT: sum); #if HUNTING_CAMERA_MCU == ENABLE - //origInfo = currentInfo; - //origInfo_check = currentInfo; - //sf_share_mem_customer_down(0); + memcpy(&origInfo, ¤tInfo, sizeof(currentInfo)); + memcpy(&origInfo_check, ¤tInfo, sizeof(currentInfo)); + sf_share_mem_customer_down(0); #endif } else{