From f3a8ad0e40a4214968bb43fa823c1e0b9913b8df Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 28 Jul 2023 17:43:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8D=87=E7=BA=A7=E6=A0=87?= =?UTF-8?q?=E8=AF=86=E9=87=8D=E7=BD=AE=E5=8F=82=E6=95=B0;2.=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=97=B6=E6=A3=80=E6=9F=A5=E7=89=B9=E6=AE=8A=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E4=BB=A5=E5=85=8Dsf=20app=E5=92=8Ccardv?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=B7=AE=E5=BC=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c | 26 +++++++++++++++++++ .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 1 + .../sf_app/code/source/wifi/sf_wifi_svr.c | 4 +++ .../UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h | 1 + 4 files changed, 32 insertions(+) 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 29d704bc4..f490bbdd5 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 @@ -699,6 +699,13 @@ EXIT: if(((UIMenuStoreInfo*)tmpInfo)->uhInfoSize == sizeof(currentInfo)){ memcpy(¤tInfo, tmpInfo, sizeof(currentInfo)); + #if HUNTING_CAMERA_MCU == ENABLE + if(currentInfo.OtaFlag) + { + SysResetFlag(); + currentInfo.uhInfoSize = sizeof(currentInfo); + } + #endif } else{ DBG_WRN("menu info size loaded from flash seems incorrect(old:%lu new:%lu), reset menu info\n", @@ -2314,6 +2321,25 @@ void sf_power_on_para_check_init(void) { SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize); } + + if(puiPara->ImgSize != SysGetFlag(FL_MOVIE_SIZE)) + { + SysSetFlag(FL_PHOTO_SIZE, puiPara->ImgSize); + } + + if(puiPara->DateStyle != SysGetFlag(FL_DateFormatIndex)) + { + SysSetFlag(FL_DateFormatIndex, puiPara->DateStyle); + } + if(puiPara->Language != SysGetFlag(FL_LANGUAGE)) + { + SysSetFlag(FL_LANGUAGE, puiPara->Language); + } + if(puiPara->StampSwitch != SysGetFlag(FL_DATE_STAMP)) + { + SysSetFlag(FL_DATE_STAMP, puiPara->StampSwitch); + } + #if SF_HW_TEST != ENABLE sf_set_pir_sensitivity(puiPara->PirSensitivity); #endif 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 52b631aec..cc84e5bdd 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 @@ -352,6 +352,7 @@ typedef enum { for keep data in pstore;permanent storage */ typedef struct _UIMenuUIMenuStoreInfo { + UINT32 OtaFlag; //Common CHAR strMakerString[VER_STR_MAX]; CHAR strModelString[VER_STR_MAX]; diff --git a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c index 96fede90f..9e8ef91b8 100644 --- a/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c +++ b/code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c @@ -1448,6 +1448,10 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen) puiPara->SendMultishotIndex3 = 1; } } + if(puiPara->Multishot != SysGetFlag(FL_CONTINUE_SHOT)) + { + SysSetFlag(FL_CONTINUE_SHOT, puiPara->Multishot); + } respFlag = 2; paramSaveFlag = 1; break; 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 196cdd620..7137f58fe 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 @@ -352,6 +352,7 @@ typedef enum { for keep data in pstore;permanent storage */ typedef struct _UIMenuUIMenuStoreInfo { + UINT32 OtaFlag; //Common CHAR strMakerString[VER_STR_MAX]; CHAR strModelString[VER_STR_MAX];