From 95e36546cd4a023f30160e25e975bf15fc4a86c0 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Tue, 2 Jan 2024 15:34:07 +0800 Subject: [PATCH] Fixed:Emmc status ok in photo screen. --- .../UIFlowMovie/UIFlowMovieEventCallback.c | 16 +++++----- .../UIFlowPhoto/UIFlowPhotoEventCallback.c | 31 +++++++++---------- 2 files changed, 23 insertions(+), 24 deletions(-) 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 71338921e..0c5aa5dbd 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 @@ -905,11 +905,11 @@ 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) { + // 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; - } + // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms); + // return; + // } } else if (System_GetState(SYS_STATE_POWERON) == SYSTEM_POWERON_NORMAL) { @@ -920,11 +920,11 @@ static void UIFlowMovie_OnExeRecord(lv_obj_t* obj) } - if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { + // 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; - } + // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms); + // return; + // } } 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 af2ebfe7e..4484a59c2 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 @@ -672,7 +672,6 @@ static void update_gps_status(void) } int get_storage_type(void) { - return MMC_DEV_SD; SF_ST_MMC_DEV *mmc_dev = SF_GetMMCDev(); if (NULL == mmc_dev) { @@ -688,16 +687,16 @@ int get_storage_type(void) } static void update_storage_sd_card(void) { - if (System_GetState(SYS_STATE_FS) == FS_INIT_OK) + // if (System_GetState(SYS_STATE_FS) == FS_INIT_OK) { - UINT32 cardStatus = System_GetState(SYS_STATE_CARD); - if (cardStatus != CARD_REMOVED) + // UINT32 cardStatus = System_GetState(SYS_STATE_CARD); + // if (cardStatus != CARD_REMOVED) { if (g_SysStrg_Chg) { static int cnt = 0; if(cnt++<1){ - lv_label_set_text(label_6_scr_uiflowphoto, "Loarding..."); + // lv_label_set_text(label_6_scr_uiflowphoto, "Loarding..."); }else{ g_SysStrg_Chg = false; cnt = 0; @@ -705,7 +704,7 @@ static void update_storage_sd_card(void) } else if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) { if(UIStorageCheck_DCIMWritable() == FALSE){ - lv_label_set_text(label_6_scr_uiflowphoto, "SD CARD ERROR"); + lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card"); } } else if (UIStorageCheck(STORAGE_CHECK_FULL, NULL) == TRUE) { @@ -719,17 +718,17 @@ static void update_storage_sd_card(void) lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); } } - else - { - set_warning_label_text(label_6_scr_uiflowphoto); - lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card"); - } - } - else - { - set_warning_label_text(label_6_scr_uiflowphoto); - lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card"); + // else + // { + // set_warning_label_text(label_6_scr_uiflowphoto); + // lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card"); + // } } + // else + // { + // set_warning_label_text(label_6_scr_uiflowphoto); + // lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card"); + // } } unsigned int check_sd_size(UINT64 diskSize) {