payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.WiFi链接后不进入回放

Browse Source
This commit is contained in:
payton 2023-11-27 16:51:28 +08:00
parent 43ed123735
commit af9263c995
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c
View File

@ -906,7 +906,7 @@ static void UIFlowMenuCommonItem_ScrOpen(lv_obj_t* obj)
gMenuLuck = MENU_UNLUCK; gMenuLuck = MENU_UNLUCK;
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
// sf_set_menu_open(TRUE); sf_set_menu_open(TRUE);
#endif #endif
} }
@ -1017,7 +1017,9 @@ static void UIFlowMenuCommonItem_ChildScrClose(lv_obj_t* obj,const LV_USER_EVENT
} }
gMenuLuck = MENU_UNLUCK; gMenuLuck = MENU_UNLUCK;
// sf_set_menu_open(FALSE); #if HUNTING_CAMERA_MCU == ENABLE
sf_set_menu_open(FALSE);
#endif
} }

21
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -683,13 +683,13 @@ static void update_wifi(void)
int index = status; int index = status;
lv_obj_set_hidden(image_wifi_connected_scr_uiflowphoto, false); lv_obj_set_hidden(image_wifi_connected_scr_uiflowphoto, false);
lv_plugin_img_set_src(image_wifi_connected_scr_uiflowphoto, res[index]); lv_plugin_img_set_src(image_wifi_connected_scr_uiflowphoto, res[index]);
lv_obj_t *scr = lv_plugin_scr_act(); // lv_obj_t *scr = lv_plugin_scr_act();
#define MENU_UNLUCK 0 // #define MENU_UNLUCK 0
if (scr != UIFlowPhoto && SF_WIFI_CON == status && MENU_UNLUCK == is_menu_screen_luck()) // if (scr != UIFlowPhoto && SF_WIFI_CON == status && MENU_UNLUCK == is_menu_screen_luck())
{ // {
printf("Back to photo screen.\n"); // printf("Back to photo screen.\n");
Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PHOTO); // Ux_PostEvent(NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PHOTO);
} // }
} }
static void update_bluetooth(void) 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_PREV:
case LV_USER_KEY_ZOOMOUT: case LV_USER_KEY_ZOOMOUT:
{ {
// UIFlowPhoto_OnExeZoomOutStart(obj); if (SF_WIFI_CON != sf_get_wifi_status())
UIFlowPhoto_OnExeOpenPlayScreen(obj); {
// UIFlowPhoto_OnExeZoomOutStart(obj);
UIFlowPhoto_OnExeOpenPlayScreen(obj);
}
break; break;
} }