diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c index 0c5aa5dbd..f12718f2a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c @@ -30,6 +30,10 @@ static BOOL g_BgInitFileSys = FALSE; uint16_t warn_msgbox_auto_close_ms = 1000 * 3; uint32_t warn_msgbox_auto_infinite_ms = 0xffffffff; +UINT32 dcf_handle = -1; +static void UIFlowMovie_REC_FINISH(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg); +extern DCF_HANDLE System_Get_DCF_Handle(void); + //MOVIE_SIZE_TAG static CHAR *resolution_Buf[MOVIE_SIZE_ID_MAX] = { @@ -705,6 +709,7 @@ static void set_indev_keypad_group(lv_obj_t* obj) static void UIFlowMovie_ScrOpen(lv_obj_t* obj) { + dcf_handle = (UINT32)System_Get_DCF_Handle();/* 0 emmc 1 sd*/ DBG_DUMP("%s\r\n", __func__); // #if HUNTING_CAMERA_MCU == ENABLE @@ -904,13 +909,10 @@ static void UIFlowMovie_ScrClose(lv_obj_t* obj) static void UIFlowMovie_OnExeRecord(lv_obj_t* obj) { if (System_GetState(SYS_STATE_POWERON) == SYSTEM_POWERON_SAFE) { - - // if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { - - // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms); - // return; - // } - + if (1 == dcf_handle && System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { + //UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms); + printf("[%s:%d] card removed\n", __FUNCTION__, __LINE__); + } } else if (System_GetState(SYS_STATE_POWERON) == SYSTEM_POWERON_NORMAL) { if (GxStrg_GetDeviceCtrl(0, CARD_READONLY)) { // card lock @@ -920,11 +922,10 @@ static void UIFlowMovie_OnExeRecord(lv_obj_t* obj) } - // if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { - - // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms); - // return; - // } + if (1 == dcf_handle && System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { + //UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms); + printf("[%s:%d] card removed\n", __FUNCTION__, __LINE__); + } } @@ -1178,10 +1179,17 @@ static void UIFlowMovie_WR_ERROR(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* set_rec_status(false); update_max_rec_time(); lv_obj_set_hidden(image_rec_ellipse_scr_uiflowmovie, true); + if (1 == dcf_handle && System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { + //UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms); + printf("[%s:%d] card removed\n", __FUNCTION__, __LINE__); + lv_group_send_data(gp, LV_KEY_ENTER); + return; + } if (System_GetState(SYS_STATE_CARD) == CARD_LOCKED) { gMovData.State = MOV_ST_WARNING_MENU; UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_IMG_ID_ICON_SD_LOCK, warn_msgbox_auto_close_ms); } else { + gMovData.State = MOV_ST_WARNING_MENU; UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_MEMORYERROR, warn_msgbox_auto_close_ms); }