From a3015a5e1a032de7453258ce695b2457af78bb60 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Tue, 5 Dec 2023 11:21:22 +0800 Subject: [PATCH] Fixed bug number 10204. --- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 10 +++++----- .../UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c | 12 +++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) 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 8d46353ad..11460a364 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 @@ -1149,11 +1149,11 @@ static void UIFlowPhoto_OnExeZoomInStop(lv_obj_t* obj) static void UIFlowPhoto_OnExeOpenPlayScreen(lv_obj_t* obj) { - if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) { - gPhotoData.State = PHOTO_ST_WARNING_MENU; - UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, 1000); - return; - } + // if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) { + // gPhotoData.State = PHOTO_ST_WARNING_MENU; + // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, 1000); + // return; + // } Ux_SendEvent(&CustomPhotoObjCtrl, NVTEVT_FORCETO_PLAYBACK_MODE, 0); } // static void UIFlowPhoto_OnExeZoomOutStart(lv_obj_t* obj) 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 6d7d15398..7f0dc1c33 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 @@ -926,7 +926,7 @@ static void UIFlowPlay_OpenFile(lv_obj_t* obj) g_PlbData.State = PLB_ST_IDLE; update_playicons(g_PlbData.State); PBView_DrawNoFile(); - UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_NO_IMAGE, warn_msgbox_auto_close_ms); + UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, warn_msgbox_auto_close_ms); g_bUIFlowWndPlayNoImgWndOpened = TRUE; } else @@ -977,11 +977,13 @@ static void UIFlowPlay_ScrOpen(lv_obj_t* obj) set_indev_keypad_group(obj); if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) { + PBView_DrawNoFile(); + g_bUIFlowWndPlayNoImgWndOpened = TRUE; /* never closed */ g_PlbData.State = PLB_ST_IDLE; update_playicons(g_PlbData.State); - Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PHOTO); - UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, 0); + // Ux_SendEvent(0, NVTEVT_SYSTEM_MODE, 1, PRIMARY_MODE_PHOTO); + UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, 3000); return; } @@ -1038,7 +1040,7 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data) //#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); + UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, warn_msgbox_auto_close_ms); g_bUIFlowWndPlayNoImgWndOpened = TRUE; } } else { @@ -1061,7 +1063,7 @@ static void UIFlowPlay_ChildScrClose(lv_obj_t* obj, const void * data) //#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); + UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRING_NO_FILE, warn_msgbox_auto_close_ms); g_bUIFlowWndPlayNoImgWndOpened = TRUE; } }else{