diff --git a/code/application/source/cardv/SrcCode/System/SysMain_Exe.c b/code/application/source/cardv/SrcCode/System/SysMain_Exe.c index 91a812607..83e372585 100755 --- a/code/application/source/cardv/SrcCode/System/SysMain_Exe.c +++ b/code/application/source/cardv/SrcCode/System/SysMain_Exe.c @@ -233,9 +233,6 @@ INT32 System_OnBoot(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) Load_MenuInfo(); #else Load_MenuInfo(); //reset value cause the FL_FSStatus as '0', we do so before NVTEVT_STRG_ATTACH finish - #if HUNTING_CAMERA_MCU == ENABLE - sf_cardv_para_check_start(); - #endif #endif #endif #endif @@ -244,6 +241,10 @@ INT32 System_OnBoot(VControl *pCtrl, UINT32 paramNum, UINT32 *paramArray) Init_MenuInfo(); #endif + #if HUNTING_CAMERA_MCU == ENABLE + sf_cardv_para_check_start(); + #endif + #if (UCTRL_FUNC) UctrlMain_Init(); #endif 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 29b19538c..29d704bc4 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 @@ -511,8 +511,10 @@ void Load_MenuInfo(void) } #endif #if HUNTING_CAMERA_MCU == ENABLE - origInfo = currentInfo; - origInfo_check = currentInfo; + //origInfo = currentInfo; + //origInfo_check = currentInfo; + memcpy(&origInfo, ¤tInfo, sizeof(currentInfo)); + memcpy(&origInfo_check, ¤tInfo, sizeof(currentInfo)); sf_share_mem_customer_down(0); #endif return; @@ -729,8 +731,10 @@ EXIT: #if HUNTING_CAMERA_MCU == ENABLE sf_power_on_para_check_init(); #endif - origInfo = currentInfo; - origInfo_check = currentInfo; + //origInfo = currentInfo; + //origInfo_check = currentInfo; + memcpy(&origInfo, ¤tInfo, sizeof(currentInfo)); + memcpy(&origInfo_check, ¤tInfo, sizeof(currentInfo)); #if HUNTING_CAMERA_MCU == ENABLE sf_share_mem_customer_down(0); #endif @@ -1095,7 +1099,9 @@ EXIT: sum); #if HUNTING_CAMERA_MCU == ENABLE - //sf_share_mem_customer_down(0); + //origInfo = currentInfo; + //origInfo_check = currentInfo; + //sf_share_mem_customer_down(0); #endif } else{ @@ -2266,10 +2272,11 @@ UIMenuStoreInfo* sf_ui_para_get(void) *************************************************/ BOOL sf_get_cardv_para_check_flag(void) { - if(memcmp(¤tInfo, &origInfo_check, sizeof(UIMenuStoreInfo)) == 0){ + if(memcmp(¤tInfo, &origInfo_check, sizeof(currentInfo)) == 0){ return FALSE; } - origInfo_check = currentInfo; + memcpy(&origInfo_check, ¤tInfo, sizeof(currentInfo)); + //origInfo_check = currentInfo; return TRUE; } 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 d687a5cf3..40aad9f30 100644 --- 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 @@ -319,9 +319,10 @@ EXIT: currentInfo.uhInfoSize = sizeof(UIMenuStoreInfo); } //SysCheckFlag(); - origInfo = currentInfo; - origInfo_check = currentInfo; - + //origInfo = currentInfo; + //origInfo_check = currentInfo; + memcpy(&origInfo, ¤tInfo, sizeof(currentInfo)); + memcpy(&origInfo_check, ¤tInfo, sizeof(currentInfo)); if(sys_mtd_fp){ fclose(sys_mtd_fp); sys_mtd_fp = NULL; @@ -362,8 +363,8 @@ BOOL sf_get_para_check_flag(void) //MLOGI("menu info is changed\n"); return FALSE; } - origInfo_check = currentInfo; - + //origInfo_check = currentInfo; + memcpy(&origInfo_check, ¤tInfo, sizeof(currentInfo)); return TRUE; } @@ -937,7 +938,8 @@ void sf_customer_param_set(UIMenuStoreInfo *pSfCustomerPara) { //currentInfo = *pSfCustomerPara; memcpy(¤tInfo,pSfCustomerPara,sizeof(UIMenuStoreInfo)); - origInfo_check = currentInfo; + //origInfo_check = currentInfo; + memcpy(&origInfo_check, ¤tInfo, sizeof(UIMenuStoreInfo)); } void sf_customer_param_set_down(UIMenuStoreInfo *pSfCustomerPara)