1.还原菜单状态标识设置

This commit is contained in:
payton 2023-10-13 17:32:45 +08:00
parent 068a8db64b
commit 2b70e194a7
2 changed files with 36 additions and 2 deletions

View File

@ -3,6 +3,9 @@
#include "UIFlowLVGL/UIFlowLVGL.h" #include "UIFlowLVGL/UIFlowLVGL.h"
#include "UIApp/Network/UIAppNetwork.h" #include "UIApp/Network/UIAppNetwork.h"
#include <kwrap/debug.h> #include <kwrap/debug.h>
#if HUNTING_CAMERA_MCU == ENABLE
#include <sf_inc.h>
#endif
#define PAGE 6 #define PAGE 6
@ -472,10 +475,17 @@ static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj)
MenuItem_OnOpen(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) 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) switch(key)
{ {
@ -503,7 +513,14 @@ static void UIFlowMenuCommonItem_Key(lv_obj_t* obj, uint32_t key)
lv_plugin_scr_close(obj, NULL); lv_plugin_scr_close(obj, NULL);
break; 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__); DBG_DUMP("%s\r\n", __func__);
MenuItem_OnClose(obj); MenuItem_OnClose(obj);
#if HUNTING_CAMERA_MCU == ENABLE
sf_set_menu_open(FALSE);
#endif
} }

View File

@ -3,6 +3,9 @@
#include "UIFlowLVGL/UIFlowLVGL.h" #include "UIFlowLVGL/UIFlowLVGL.h"
#include "UIApp/Network/UIAppNetwork.h" #include "UIApp/Network/UIAppNetwork.h"
#include <kwrap/debug.h> #include <kwrap/debug.h>
#if HUNTING_CAMERA_MCU == ENABLE
#include <sf_inc.h>
#endif
#define PAGE 6 #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) 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) switch(key)
{ {
@ -458,7 +464,14 @@ static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key)
UIFlowMenuCommonOption_CloseScr(obj); UIFlowMenuCommonOption_CloseScr(obj);
break; break;
} }
#if HUNTING_CAMERA_MCU == ENABLE
case LV_USER_KEY_DATAREADY:
{
printf("[dataready] %s(%d)\n", __FUNCTION__, __LINE__);
sf_mcu_dataready_get();
break;
}
#endif
} }