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 12e91e2ac..293ab019d 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 @@ -906,7 +906,7 @@ static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj) gMenuLuck = MENU_UNLUCK; #if HUNTING_CAMERA_MCU == ENABLE - // sf_set_menu_open(TRUE); + sf_set_menu_open(TRUE); #endif } @@ -1017,7 +1017,9 @@ static void UIFlowMenuCommonItem_ChildScrClose(lv_obj_t* obj,const LV_USER_EVENT } gMenuLuck = MENU_UNLUCK; - // sf_set_menu_open(FALSE); + #if HUNTING_CAMERA_MCU == ENABLE + sf_set_menu_open(FALSE); + #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 963c56bb2..a56526b4d 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 @@ -683,13 +683,13 @@ static void update_wifi(void) int index = status; lv_obj_set_hidden(image_wifi_connected_scr_uiflowphoto, false); lv_plugin_img_set_src(image_wifi_connected_scr_uiflowphoto, res[index]); - lv_obj_t *scr = lv_plugin_scr_act(); - #define MENU_UNLUCK 0 - if (scr != UIFlowPhoto && SF_WIFI_CON == status && MENU_UNLUCK == is_menu_screen_luck()) - { - printf("Back to photo screen.\n"); - Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PHOTO); - } + // lv_obj_t *scr = lv_plugin_scr_act(); + // #define MENU_UNLUCK 0 + // if (scr != UIFlowPhoto && SF_WIFI_CON == status && MENU_UNLUCK == is_menu_screen_luck()) + // { + // printf("Back to photo screen.\n"); + // Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PHOTO); + // } } static void update_bluetooth(void) @@ -1758,8 +1758,11 @@ static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key) case LV_USER_KEY_PREV: case LV_USER_KEY_ZOOMOUT: { - // UIFlowPhoto_OnExeZoomOutStart(obj); - UIFlowPhoto_OnExeOpenPlayScreen(obj); + if (SF_WIFI_CON != sf_get_wifi_status()) + { + // UIFlowPhoto_OnExeZoomOutStart(obj); + UIFlowPhoto_OnExeOpenPlayScreen(obj); + } break; }