From 9e9c365487c5049eaf749890241958aa54d7fc28 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Tue, 5 Dec 2023 16:42:29 +0800 Subject: [PATCH] Fixed bug number 9537. --- .../cardv/SrcCode/UIApp/AppDisp_PBView.c | 2 +- .../UIFlowMenuCommonConfirmEventCallback.c | 4 ++- .../UIFlowPlay/UIFlowPlayEventCallback.c | 28 ++++++++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIApp/AppDisp_PBView.c b/code/application/source/cardv/SrcCode/UIApp/AppDisp_PBView.c index 778640c77..24a0c03f4 100755 --- a/code/application/source/cardv/SrcCode/UIApp/AppDisp_PBView.c +++ b/code/application/source/cardv/SrcCode/UIApp/AppDisp_PBView.c @@ -1800,7 +1800,7 @@ void PBView_OnDrawCB(PB_VIEW_STATE view_state, HD_VIDEO_FRAME *pHdDecVdoFrame) PB_GetParam(PBPRMID_PLAYBACK_STATUS, &u32CurrPbStatus); if ((uiFileNum == 0) || (u32CurrPbStatus != PB_STA_DONE)){ - PBView_DrawErrorView(); + // PBView_DrawErrorView(); PB_SetPBFlag(PB_SET_FLG_DRAW_END); return; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c index d2c811464..7c5d01aad 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c @@ -294,6 +294,7 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID) case IDM_DELETE_THIS: strID = LV_PLUGIN_STRING_ID_STRING_CONFIRM_DELETE; lv_label_set_text(Confirm_label, "Comfirm Delete"); + gBKGEvt = NVTEVT_BKW_DELALL; break; case IDM_FORMAT_SD: strID = LV_PLUGIN_STRING_ID_STRING_FORMAT_SD; @@ -613,7 +614,8 @@ void message_box_confirm_msg_event_callback(lv_obj_t* obj, lv_event_t event) } /* parent is UIFlowMenuCommonConfirm */ - lv_plugin_scr_close(lv_obj_get_parent(obj), NULL); + // lv_plugin_scr_close(lv_obj_get_parent(obj), NULL); + lv_plugin_scr_close(lv_obj_get_parent(obj), gen_nvtmsg_data(NVTRET_CONFIRM, 1, gItemID)); break; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c index 7f0dc1c33..cf6febd27 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c @@ -115,6 +115,7 @@ static void UIFlowPlay_IconImageSize(BOOL bShow) if (bShow == FALSE) { // UxCtrl_SetShow(&UIFlowWndPlay_StaticTXT_SizeCtrl, FALSE); lv_obj_set_hidden(label_file_size_scr_uiflowplay, true); + lv_obj_set_hidden(container_play_scr_uiflowplay, true); return; } //show icon @@ -1031,7 +1032,6 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data) case NVTRET_DELETE: case NVTRET_DELETEALL: uiStatus = PB_WaitCommandFinish(PB_WAIT_INFINITE); - if (uiStatus & PB_STA_NOIMAGE) { g_PlbData.State = PLB_ST_IDLE; @@ -1077,6 +1077,32 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data) DBG_DUMP("NVTRET_WARNING"); // Ux_PostEvent(paramArray[1], 0); break; + case NVTRET_CONFIRM: + { + UIPlay_PlaySingle(PB_SINGLE_CURR); + uiStatus = PB_WaitCommandFinish(PB_WAIT_INFINITE); + if (uiStatus & PB_STA_NOIMAGE) + { + if (!g_bUIFlowWndPlayNoImgWndOpened) { + g_PlbData.State = PLB_ST_IDLE; + //#NT#2023/11/14#Eric - begin + //#NT#Support IVOT_N12144_CO-148_A + PBView_DrawNoFile(); + //#NT#2023/11/14#Eric - end + UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_NO_IMAGE, warn_msgbox_auto_close_ms); + g_bUIFlowWndPlayNoImgWndOpened = TRUE; + } else { + g_PlbData.State = PLB_ST_MENU; + SysSetFlag(FL_PROTECT, PROTECT_ONE); + lv_plugin_scr_open(UIFlowMenuCommonItem, NULL); + } + } else { + g_PlbData.State = PLB_ST_FULL; + } + break; + } + default: + break; } } else { UIPlay_PlaySingle(PB_SINGLE_CURR);