Improve:Photo emmc incon update.

This commit is contained in:
xiaojiazhu 2024-01-05 11:00:10 +08:00
parent eda5bf1933
commit 16a81773d0

View File

@ -688,9 +688,21 @@ int get_storage_type(void)
} }
static void update_storage_sd_card(void) static void update_storage_sd_card(void)
{ {
const int storageType = get_storage_type();
if (MMC_DEV_NO == storageType)
{
printf("storage update:no device.\n");
return;
}
// 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); const UINT32 cardStatus = System_GetState(SYS_STATE_CARD);
if (MMC_DEV_SD == storageType && cardStatus == CARD_REMOVED)
{
set_warning_label_text(label_6_scr_uiflowphoto);
lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card");
return;
}
// if (cardStatus != CARD_REMOVED) // if (cardStatus != CARD_REMOVED)
{ {
if (g_SysStrg_Chg) if (g_SysStrg_Chg)
@ -705,7 +717,7 @@ static void update_storage_sd_card(void)
} else if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) } else if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE)
{ {
if(UIStorageCheck_DCIMWritable() == FALSE){ if(UIStorageCheck_DCIMWritable() == FALSE){
lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card"); // lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card");
} }
} else if (UIStorageCheck(STORAGE_CHECK_FULL, NULL) == TRUE) } else if (UIStorageCheck(STORAGE_CHECK_FULL, NULL) == TRUE)
{ {
@ -714,9 +726,9 @@ static void update_storage_sd_card(void)
} }
else else
{ {
set_normal_label_text(label_6_scr_uiflowphoto);
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum));
set_normal_label_text(label_6_scr_uiflowphoto);
} }
} }
// else // else