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

Fixed bug number 9537.

Browse Source
This commit is contained in:
xiaojiazhu 2023-12-05 16:42:29 +08:00
parent a3015a5e1a
commit 9e9c365487
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/application/source/cardv/SrcCode/UIApp/AppDisp_PBView.c
View File

@ -1800,7 +1800,7 @@ void PBView_OnDrawCB(PB_VIEW_STATE view_state, HD_VIDEO_FRAME *pHdDecVdoFrame)
PB_GetParam(PBPRMID_PLAYBACK_STATUS, &u32CurrPbStatus); PB_GetParam(PBPRMID_PLAYBACK_STATUS, &u32CurrPbStatus);
if ((uiFileNum == 0) || (u32CurrPbStatus != PB_STA_DONE)){ if ((uiFileNum == 0) || (u32CurrPbStatus != PB_STA_DONE)){
PBView_DrawErrorView(); // PBView_DrawErrorView();
PB_SetPBFlag(PB_SET_FLG_DRAW_END); PB_SetPBFlag(PB_SET_FLG_DRAW_END);
return; return;
} }

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c
View File

@ -294,6 +294,7 @@ void UIFlowMenuCommonConfirmAPI_Open(uint32_t itemID)
case IDM_DELETE_THIS: case IDM_DELETE_THIS:
strID = LV_PLUGIN_STRING_ID_STRING_CONFIRM_DELETE; strID = LV_PLUGIN_STRING_ID_STRING_CONFIRM_DELETE;
lv_label_set_text(Confirm_label, "Comfirm Delete"); lv_label_set_text(Confirm_label, "Comfirm Delete");
gBKGEvt = NVTEVT_BKW_DELALL;
break; break;
case IDM_FORMAT_SD: case IDM_FORMAT_SD:
strID = LV_PLUGIN_STRING_ID_STRING_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 */ /* 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; break;
} }

28
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c
View File

@ -115,6 +115,7 @@ static void UIFlowPlay_IconImageSize(BOOL bShow)
if (bShow == FALSE) { if (bShow == FALSE) {
// UxCtrl_SetShow(&UIFlowWndPlay_StaticTXT_SizeCtrl, FALSE); // UxCtrl_SetShow(&UIFlowWndPlay_StaticTXT_SizeCtrl, FALSE);
lv_obj_set_hidden(label_file_size_scr_uiflowplay, true); lv_obj_set_hidden(label_file_size_scr_uiflowplay, true);
lv_obj_set_hidden(container_play_scr_uiflowplay, true);
return; return;
} }
//show icon //show icon
@ -1031,7 +1032,6 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data)
case NVTRET_DELETE: case NVTRET_DELETE:
case NVTRET_DELETEALL: case NVTRET_DELETEALL:
uiStatus = PB_WaitCommandFinish(PB_WAIT_INFINITE); uiStatus = PB_WaitCommandFinish(PB_WAIT_INFINITE);
if (uiStatus & PB_STA_NOIMAGE) if (uiStatus & PB_STA_NOIMAGE)
{ {
g_PlbData.State = PLB_ST_IDLE; 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"); DBG_DUMP("NVTRET_WARNING");
// Ux_PostEvent(paramArray[1], 0); // Ux_PostEvent(paramArray[1], 0);
break; 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 { } else {
UIPlay_PlaySingle(PB_SINGLE_CURR); UIPlay_PlaySingle(PB_SINGLE_CURR);