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 5038ad4f8..627b5c3fa 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 @@ -750,6 +750,7 @@ static void update_sd_emmc_status(void) UINT16 idRight; BOOL setWarning = false; BOOL showError = true; + textLabel = " "; if(sf_in_emmc_exist()) { @@ -779,16 +780,23 @@ static void update_sd_emmc_status(void) {/*no sd card*/ if (diskSizeEmmc > 0 && diskFreeEmmc >= (FREE_SIZE_MB*1024*1024)) {/*emmc normal*/ + //printf("[%s:%d] NO SD CARD EMMC NORMAL", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_EMMC; idRight = LV_PLUGIN_IMG_ID_SF_SD_NO; UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); textLabel = Get_FreePicNumString(g_uiFreePicNum); - textLabelError = ""; + if (NULL == textLabel) + { + printf("[%s:%d] wait loading num : %s\n", __FUNCTION__, __LINE__, textLabel); + textLabel = " "; + } + textLabelError = " "; setWarning = false; showError = true; } else if (0 == diskSizeEmmc) {/*emmc error*/ + //printf("[%s:%d] NO SD CARD EMMC ERROR", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_NO; idRight = LV_PLUGIN_IMG_ID_SF_SD_EMMC_DIS; textLabel = "No SD Card"; @@ -799,10 +807,11 @@ static void update_sd_emmc_status(void) } else if (diskFreeEmmc < (FREE_SIZE_MB*1024*1024)) {/*emmc full*/ + //printf("[%s:%d] NO SD CARD EMMC FULL", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_NO; idRight = LV_PLUGIN_IMG_ID_SF_EMMC_FULL; textLabel = "No SD Card"; - textLabelError = ""; + textLabelError = " "; setWarning = true; showError = true; } @@ -823,20 +832,32 @@ static void update_sd_emmc_status(void) if (diskSizeEmmc > 0 && diskFreeEmmc >= (FREE_SIZE_MB*1024*1024) && diskSizeSd > 0 && diskFreeSd >= (FREE_SIZE_MB*1024*1024)) {/*emmc normal sd normal*/ + //printf("[%s:%d] SD CARD NORMAL EMMC NORMAL\n", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_EMMC; idRight = res[check_sd_size(diskSizeSd)]; UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); textLabel = Get_FreePicNumString(g_uiFreePicNum); - textLabelError = ""; + if (NULL == textLabel) + { + printf("[%s:%d] wait loading num : %s\n", __FUNCTION__, __LINE__, textLabel); + textLabel = " "; + } + textLabelError = " "; setWarning = false; showError = true; } else if (diskSizeEmmc > 0 && diskFreeEmmc >= (FREE_SIZE_MB*1024*1024) && 0 == diskSizeSd) {/*emmc normal sd error*/ + //printf("[%s:%d] SD CARD ERROR EMMC NORMAL\n", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_EMMC; idRight = LV_PLUGIN_IMG_ID_SF_SD_DIS; UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); textLabel = Get_FreePicNumString(g_uiFreePicNum); + if (NULL == textLabel) + { + printf("[%s:%d] wait loading num : %s\n", __FUNCTION__, __LINE__, textLabel); + textLabel = " "; + } textLabelError = "SD Card Error, Please format it"; lv_obj_set_x(label_7_scr_uiflowphoto, 56); setWarning = false; @@ -844,20 +865,32 @@ static void update_sd_emmc_status(void) } else if (diskSizeEmmc > 0 && diskFreeEmmc >= (FREE_SIZE_MB*1024*1024) && diskFreeSd < (FREE_SIZE_MB*1024*1024)) {/*emmc normal sd full*/ + //printf("[%s:%d] SD CARD FULL EMMC NORMAL\n", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_EMMC; idRight = LV_PLUGIN_IMG_ID_SF_SD_FULL; UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); textLabel = Get_FreePicNumString(g_uiFreePicNum); - textLabelError = ""; + if (NULL == textLabel) + { + printf("[%s:%d] wait loading num : %s\n", __FUNCTION__, __LINE__, textLabel); + textLabel = " "; + } + textLabelError = " "; setWarning = false; showError = true; } else if (0 == diskSizeEmmc && diskSizeSd > 0 && diskFreeSd >= (FREE_SIZE_MB*1024*1024)) {/*emmc error sd normal*/ + //printf("[%s:%d] SD CARD NORMAL EMMC ERROR\n", __FUNCTION__, __LINE__); idLeft = res[check_sd_size(diskSizeSd)]; idRight = LV_PLUGIN_IMG_ID_SF_SD_EMMC_DIS; UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); textLabel = Get_FreePicNumString(g_uiFreePicNum); + if (NULL == textLabel) + { + printf("[%s:%d] wait loading num : %s\n", __FUNCTION__, __LINE__, textLabel); + textLabel = " "; + } textLabelError = "EMMC Error, Please format it"; lv_obj_set_x(label_7_scr_uiflowphoto, 62); setWarning = false; @@ -865,6 +898,7 @@ static void update_sd_emmc_status(void) } else if (0 == diskSizeEmmc && 0 == diskSizeSd) {/*emmc error sd error*/ + //printf("[%s:%d] SD CARD ERROR EMMC ERROR\n", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_DIS; idRight = LV_PLUGIN_IMG_ID_SF_SD_EMMC_DIS; textLabel = "SD CARD Error"; @@ -876,6 +910,7 @@ static void update_sd_emmc_status(void) } else if (0 == diskSizeEmmc && 0 != diskSizeSd && diskFreeSd <= (FREE_SIZE_MB*1024*1024)) {/*emmc error sd full*/ + //printf("[%s:%d] SD CARD FULL EMMC ERROR\n", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_FULL; idRight = LV_PLUGIN_IMG_ID_SF_SD_EMMC_DIS; textLabel = "SD CARD Full"; @@ -887,16 +922,23 @@ static void update_sd_emmc_status(void) else if (diskFreeEmmc < (FREE_SIZE_MB*1024*1024) && diskSizeSd > 0 && diskFreeSd >= (FREE_SIZE_MB*1024*1024)) {/*emmc full sd normal*/ + printf("[%s:%d] SD CARD NORMAL EMMC FULL\n", __FUNCTION__, __LINE__); idLeft = res[check_sd_size(diskSizeSd)]; idRight = LV_PLUGIN_IMG_ID_SF_EMMC_FULL; UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); textLabel = Get_FreePicNumString(g_uiFreePicNum); - textLabelError = ""; + if (NULL == textLabel) + { + printf("[%s:%d] wait loading num : %s\n", __FUNCTION__, __LINE__, textLabel); + textLabel = " "; + } + textLabelError = " "; setWarning = false; showError = true; } else if (diskFreeEmmc < (FREE_SIZE_MB*1024*1024) && 0 == diskSizeSd) {/*emmc full sd error*/ + //printf("[%s:%d] SD CARD ERROR EMMC FULL\n", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_DIS; idRight = LV_PLUGIN_IMG_ID_SF_EMMC_FULL; textLabel = "SD CARD Error"; @@ -907,10 +949,11 @@ static void update_sd_emmc_status(void) } else if (diskFreeEmmc < (FREE_SIZE_MB*1024*1024) && diskFreeSd < (FREE_SIZE_MB*1024*1024)) {/*emmc full sd full*/ + //printf("[%s:%d] SD CARD FULL EMMC FULL\n", __FUNCTION__, __LINE__); idLeft = LV_PLUGIN_IMG_ID_SF_SD_FULL; idRight = LV_PLUGIN_IMG_ID_SF_EMMC_FULL; textLabel = "SD CARD Full"; - textLabelError = ""; + textLabelError = " "; setWarning = true; showError = true; }