Load sf data to sync when open setting screen.

This commit is contained in:
xiaojiazhu 2023-10-30 17:50:12 +08:00
parent 386cd1eded
commit 1d79b833e7
4 changed files with 39 additions and 8 deletions

View File

@ -125,7 +125,7 @@ int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
} }
case IDM_FLASH_POWER: case IDM_FLASH_POWER:
{ {
puiPara->VideoLenth = uwOption; puiPara->FlashLed = uwOption;
break; break;
} }
case IDM_SENSITIVITY: case IDM_SENSITIVITY:

View File

@ -29,6 +29,31 @@ static lv_obj_t* container_option3 = NULL;
UINT16 I_en_Index[PAGE] = {}; UINT16 I_en_Index[PAGE] = {};
UINT16 ItemEN_Num = 0; UINT16 ItemEN_Num = 0;
static void load_info_from_sf(void)
{
#define OPTION_0 0
#define OPTION_1 1
UIMenuStoreInfo *puiPara = sf_ui_para_get();
SysSetFlag(IDF_PASSWORD, puiPara->PwdSwitch);
SysSetFlag(IDF_CAMERA_NAME, puiPara->CamNameSwitch == SF_CAMID_OFF ? OPTION_0 : OPTION_1);
SysSetFlag(IDF_CAMERA_MODE, puiPara->CamMode == 2 ? OPTION_1 : OPTION_0);
SysSetFlag(IDF_IMAGE_SIZE, puiPara->ImgSize);
SysSetFlag(IDF_VIDEO_SIZE, puiPara->VideoSize);
SysSetFlag(IDF_VIDEA_LENGTH, puiPara->VideoLenth == 10 ? OPTION_0 : OPTION_1);
SysSetFlag(IDF_FLASH_POWER, puiPara->FlashLed);
SysSetFlag(IDF_SENSITIVITY, puiPara->DigitPirSensitivity);
SysSetFlag(IDF_DELAY, puiPara->PirDelaySwitch == SF_OFF ? OPTION_0 : OPTION_1);
SysSetFlag(IDF_OPERATING_TIME, puiPara->WorkTime1Switch == SF_OFF ? OPTION_0 : OPTION_1);
SysSetFlag(IDF_DATE_AND_TIME, puiPara->DateAuto == SF_DATE_AUTO ? OPTION_0 : OPTION_1);
SysSetFlag(IDF_MAX_NUM_DAY, puiPara->SendMaxNum == 0 ? OPTION_0 : OPTION_1);
SysSetFlag(IDF_SETTINGS_CHECK, puiPara->GprsMode);
SysSetFlag(IDF_SEND_TYPE, puiPara->SendType);
SysSetFlag(IDF_CHECK_IN_PHOTO, puiPara->PicUpDailyReport);
SysSetFlag(IDF_GPS, puiPara->GpsSendFlag);
SysSetFlag(IDF_BATTERY_TYPE, puiPara->BatteryType);
SysSetFlag(IDF_SD_LOOP, puiPara->SdLoopSwitch);
}
static void set_indev_keypad_group(lv_obj_t* obj) static void set_indev_keypad_group(lv_obj_t* obj)
{ {
if(gp == NULL){ if(gp == NULL){
@ -765,6 +790,7 @@ void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event)
{ {
case LV_PLUGIN_EVENT_SCR_OPEN: case LV_PLUGIN_EVENT_SCR_OPEN:
{ {
load_info_from_sf();
UIFlowMenuCommonItem_ScrOpen(obj); UIFlowMenuCommonItem_ScrOpen(obj);
break; break;
} }

View File

@ -4,6 +4,7 @@
#include "UIApp/Network/UIAppNetwork.h" #include "UIApp/Network/UIAppNetwork.h"
#include <kwrap/debug.h> #include <kwrap/debug.h>
#include "UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmAPI.h" #include "UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmAPI.h"
#include "UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h"
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
#include <sf_inc.h> #include <sf_inc.h>
#endif #endif

View File

@ -1455,6 +1455,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
case LV_USER_KEY_NEXT: case LV_USER_KEY_NEXT:
case LV_USER_KEY_ZOOMIN: case LV_USER_KEY_ZOOMIN:
{ {
break;
CHKPNT; CHKPNT;
UIFlowPhoto_OnExeZoomInStart(obj); UIFlowPhoto_OnExeZoomInStart(obj);
break; break;
@ -1489,7 +1490,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key)
} }
} }
static void UIFlowPhoto_KeyRelease(lv_obj_t* obj, uint32_t key) void UIFlowPhoto_KeyRelease(lv_obj_t* obj, uint32_t key)
{ {
switch(key) switch(key)
{ {
@ -1560,8 +1561,10 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
break; break;
case LV_EVENT_KEY: case LV_EVENT_KEY:
// case LV_USER_EVENT_KEY_RELEASE:
{ {
uint32_t* key = (uint32_t*)lv_event_get_data(); uint32_t* key = (uint32_t*)lv_event_get_data();
printf(" ===================================== 2222 release key = %d\n", *key);
/* handle key event */ /* handle key event */
UIFlowPhoto_Key(obj, *key); UIFlowPhoto_Key(obj, *key);
@ -1579,13 +1582,14 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event)
break; break;
} }
case LV_USER_EVENT_KEY_RELEASE: // case LV_USER_EVENT_KEY_RELEASE:
{ // {
uint32_t* key = (uint32_t*)lv_event_get_data(); // uint32_t* key = (uint32_t*)lv_event_get_data();
UIFlowPhoto_KeyRelease(obj, *key); // break;
// UIFlowPhoto_KeyRelease(obj, *key);
break; // break;
} // }
// case LV_USER_EVENT_KEY_LONG_PRESS: // case LV_USER_EVENT_KEY_LONG_PRESS:
// { // {
// uint32_t* key = (uint32_t*)lv_event_get_data(); // uint32_t* key = (uint32_t*)lv_event_get_data();