payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed:Emmc status ok in photo screen.

Browse Source
This commit is contained in:
xiaojiazhu 2024-01-02 15:34:07 +08:00
parent 6dee93317a
commit 95e36546cd
2 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
View File

@ -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_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); // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms);
return; // return;
} // }
} else if (System_GetState(SYS_STATE_POWERON) == SYSTEM_POWERON_NORMAL) { } 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); // UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms);
return; // return;
} // }
} }

31
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -672,7 +672,6 @@ static void update_gps_status(void)
} }
int get_storage_type(void) int get_storage_type(void)
{ {
return MMC_DEV_SD;
SF_ST_MMC_DEV *mmc_dev = SF_GetMMCDev(); SF_ST_MMC_DEV *mmc_dev = SF_GetMMCDev();
if (NULL == mmc_dev) if (NULL == mmc_dev)
{ {
@ -688,16 +687,16 @@ int get_storage_type(void)
} }
static void update_storage_sd_card(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); // UINT32 cardStatus = System_GetState(SYS_STATE_CARD);
if (cardStatus != CARD_REMOVED) // if (cardStatus != CARD_REMOVED)
{ {
if (g_SysStrg_Chg) if (g_SysStrg_Chg)
{ {
static int cnt = 0; static int cnt = 0;
if(cnt++<1){ if(cnt++<1){
lv_label_set_text(label_6_scr_uiflowphoto, "Loarding..."); // lv_label_set_text(label_6_scr_uiflowphoto, "Loarding...");
}else{ }else{
g_SysStrg_Chg = false; g_SysStrg_Chg = false;
cnt = 0; cnt = 0;
@ -705,7 +704,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, "SD CARD ERROR"); 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)
{ {
@ -719,17 +718,17 @@ static void update_storage_sd_card(void)
lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum));
} }
} }
else // else
{ // {
set_warning_label_text(label_6_scr_uiflowphoto); // set_warning_label_text(label_6_scr_uiflowphoto);
lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card"); // 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) unsigned int check_sd_size(UINT64 diskSize)
{ {