From 1d79b833e74953986f50ec602da43797a9cb7b4c Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Mon, 30 Oct 2023 17:50:12 +0800 Subject: [PATCH] Load sf data to sync when open setting screen. --- .../UIFlowMenuCommonItem/MenuGeneral.c | 2 +- .../UIFlowMenuCommonItemEventCallback.c | 26 +++++++++++++++++++ .../UIFlowMenuCommonOptionEventCallback.c | 1 + .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 18 ++++++++----- 4 files changed, 39 insertions(+), 8 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c index 85e645c05..02752ec67 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c @@ -125,7 +125,7 @@ int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam) } case IDM_FLASH_POWER: { - puiPara->VideoLenth = uwOption; + puiPara->FlashLed = uwOption; break; } case IDM_SENSITIVITY: diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c index 52d4f1a67..5ee5c42a8 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c @@ -29,6 +29,31 @@ static lv_obj_t* container_option3 = NULL; UINT16 I_en_Index[PAGE] = {}; 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) { if(gp == NULL){ @@ -765,6 +790,7 @@ void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event) { case LV_PLUGIN_EVENT_SCR_OPEN: { + load_info_from_sf(); UIFlowMenuCommonItem_ScrOpen(obj); break; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c index 124b7b77e..c96e130cb 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c @@ -4,6 +4,7 @@ #include "UIApp/Network/UIAppNetwork.h" #include #include "UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmAPI.h" +#include "UIFlowLVGL/UIFlowMenuCommonItem/MenuId.h" #if HUNTING_CAMERA_MCU == ENABLE #include #endif diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c index 40b1d2212..1d54cc6b0 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c @@ -1455,6 +1455,7 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_NEXT: case LV_USER_KEY_ZOOMIN: { + break; CHKPNT; UIFlowPhoto_OnExeZoomInStart(obj); 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) { @@ -1560,8 +1561,10 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event) break; case LV_EVENT_KEY: + // case LV_USER_EVENT_KEY_RELEASE: { uint32_t* key = (uint32_t*)lv_event_get_data(); + printf(" ===================================== 2222 release key = %d\n", *key); /* handle key event */ UIFlowPhoto_Key(obj, *key); @@ -1579,13 +1582,14 @@ void UIFlowPhotoEventCallback(lv_obj_t* obj, lv_event_t event) break; } - case LV_USER_EVENT_KEY_RELEASE: - { - uint32_t* key = (uint32_t*)lv_event_get_data(); - UIFlowPhoto_KeyRelease(obj, *key); + // case LV_USER_EVENT_KEY_RELEASE: + // { + // uint32_t* key = (uint32_t*)lv_event_get_data(); + // break; + // UIFlowPhoto_KeyRelease(obj, *key); - break; - } + // break; + // } // case LV_USER_EVENT_KEY_LONG_PRESS: // { // uint32_t* key = (uint32_t*)lv_event_get_data();