From 2b70e194a7fe66a38b2403206ac488e7bb2aec51 Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 13 Oct 2023 17:32:45 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=BF=98=E5=8E=9F=E8=8F=9C=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=A0=87=E8=AF=86=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowMenuCommonItemEventCallback.c | 23 ++++++++++++++++++- .../UIFlowMenuCommonOptionEventCallback.c | 15 +++++++++++- 2 files changed, 36 insertions(+), 2 deletions(-) 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 7193ea240..b8dffd1d7 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 @@ -3,6 +3,9 @@ #include "UIFlowLVGL/UIFlowLVGL.h" #include "UIApp/Network/UIAppNetwork.h" #include +#if HUNTING_CAMERA_MCU == ENABLE +#include +#endif #define PAGE 6 @@ -472,10 +475,17 @@ static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj) MenuItem_OnOpen(obj); + #if HUNTING_CAMERA_MCU == ENABLE + sf_set_menu_open(TRUE); + #endif + } static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) { + #if HUNTING_CAMERA_MCU == ENABLE + sf_set_auto_off_time(0); + #endif switch(key) { @@ -503,7 +513,14 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key) lv_plugin_scr_close(obj, NULL); break; } - +#if HUNTING_CAMERA_MCU == ENABLE + case LV_USER_KEY_DATAREADY: + { + printf("[dataready] %s(%d)\n", __FUNCTION__, __LINE__); + sf_mcu_dataready_get(); + break; + } +#endif } } @@ -513,6 +530,10 @@ static void UIFlowMenuCommonItem_ScrClose(lv_obj_t* obj) DBG_DUMP("%s\r\n", __func__); MenuItem_OnClose(obj); + #if HUNTING_CAMERA_MCU == ENABLE + sf_set_menu_open(FALSE); + #endif + } 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 b1e5cc54a..c3f01f82d 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 @@ -3,6 +3,9 @@ #include "UIFlowLVGL/UIFlowLVGL.h" #include "UIApp/Network/UIAppNetwork.h" #include +#if HUNTING_CAMERA_MCU == ENABLE +#include +#endif #define PAGE 6 @@ -431,6 +434,9 @@ static void UIFlowMenuCommonOption_ScrOpen(lv_obj_t* obj, const void *data) static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key) { + #if HUNTING_CAMERA_MCU == ENABLE + sf_set_auto_off_time(0); + #endif switch(key) { @@ -458,7 +464,14 @@ static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key) UIFlowMenuCommonOption_CloseScr(obj); break; } - +#if HUNTING_CAMERA_MCU == ENABLE + case LV_USER_KEY_DATAREADY: + { + printf("[dataready] %s(%d)\n", __FUNCTION__, __LINE__); + sf_mcu_dataready_get(); + break; + } +#endif }