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

1.sd卡和UI显示的代码优化

Browse Source
This commit is contained in:
payton 2023-10-31 16:10:00 +08:00
parent 3791d1bf87
commit 89892c2012
2 changed files with 132 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,45 +285,70 @@ static void update_camera_message(void)
// if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) // if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO))
switch (puiPara->ImgSize) switch (puiPara->ImgSize)
{ {
case PHOTO_SIZE_16M: case PHOTO_SIZE_40M:
lv_label_set_text(label_5_scr_uiflowmovie, "16M"); lv_label_set_text(label_5_scr_uiflowmovie, "40M");
break; break;
case PHOTO_SIZE_12M: case PHOTO_SIZE_32M:
lv_label_set_text(label_5_scr_uiflowmovie, "12M"); lv_label_set_text(label_5_scr_uiflowmovie, "32M");
break; break;
case PHOTO_SIZE_8M: case PHOTO_SIZE_24M:
lv_label_set_text(label_5_scr_uiflowmovie, "8M"); lv_label_set_text(label_5_scr_uiflowmovie, "24M");
break; break;
case PHOTO_SIZE_16M:
default: lv_label_set_text(label_5_scr_uiflowmovie, "16M");
break; break;
case PHOTO_SIZE_12M:
lv_label_set_text(label_5_scr_uiflowmovie, "12M");
break;
case PHOTO_SIZE_8M:
lv_label_set_text(label_5_scr_uiflowmovie, "8M");
break;
case PHOTO_SIZE_5M:
lv_label_set_text(label_5_scr_uiflowmovie, "5M");
break;
default:
break;
} }
switch (puiPara->Multishot) switch (puiPara->Multishot)
{ {
case 1: case CONTINUE_SHOT_OFF:
lv_label_set_text(label_4_scr_uiflowmovie, "1P"); lv_label_set_text(label_4_scr_uiflowmovie, "1P");
break; break;
case 2: case CONTINUE_SHOT_BURST_2:
lv_label_set_text(label_4_scr_uiflowmovie, "2P"); lv_label_set_text(label_4_scr_uiflowmovie, "2P");
break; break;
case 3: case CONTINUE_SHOT_BURST_3:
lv_label_set_text(label_4_scr_uiflowmovie, "3P"); lv_label_set_text(label_4_scr_uiflowmovie, "3P");
break; break;
case CONTINUE_SHOT_BURST_4:
default: lv_label_set_text(label_4_scr_uiflowmovie, "4P");
break; break;
case CONTINUE_SHOT_BURST_5:
lv_label_set_text(label_4_scr_uiflowmovie, "5P");
break;
default:
break;
} }
UINT32 freePicNum = 0; UINT32 freePicNum = 0;
// PhotoExe_GetTotalPicNum(); // PhotoExe_GetTotalPicNum();
if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) UINT32 cardStatus = System_GetState(SYS_STATE_CARD);
{
lv_label_set_text(label_6_scr_uiflowmovie, "NO SD CARD"); if (cardStatus != CARD_REMOVED)
} {
else if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE)
{ {
UIStorageCheck(STORAGE_CHECK_FULL, &freePicNum); lv_label_set_text(label_6_scr_uiflowmovie, "SD CARD ERROR");
lv_label_set_text(label_6_scr_uiflowmovie, Get_FreePicNumString(freePicNum)); }
} else
{
UIStorageCheck(STORAGE_CHECK_FULL, &freePicNum);
lv_label_set_text(label_6_scr_uiflowmovie, Get_FreePicNumString(freePicNum));
}
}
else
{
lv_label_set_text(label_6_scr_uiflowmovie, "NO SD CARD");
}
} }
static void update_rec_time(void) static void update_rec_time(void)

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

@ -142,14 +142,19 @@ static void update_quality(void)
static void update_free_pic_number(void) static void update_free_pic_number(void)
{ {
if(g_PhotoBgInitFileSys == TRUE){ UINT32 cardStatus = System_GetState(SYS_STATE_CARD);
#if (FS_FUNC == ENABLE)
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); if (cardStatus != CARD_REMOVED)
#endif {
lv_label_set_text(label_free_pic_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); if(g_PhotoBgInitFileSys == TRUE){
}else{ #if (FS_FUNC == ENABLE)
lv_label_set_text_fmt(label_free_pic_scr_uiflowphoto, "Check free space ..."); UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
} #endif
lv_label_set_text(label_free_pic_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum));
}else{
lv_label_set_text_fmt(label_free_pic_scr_uiflowphoto, "Check free space ...");
}
}
} }
static void update_card(void) static void update_card(void)
@ -406,45 +411,71 @@ static void update_camera_message(void)
{ {
UIMenuStoreInfo *puiPara = sf_ui_para_get(); UIMenuStoreInfo *puiPara = sf_ui_para_get();
// if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO)) // if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO))
switch (puiPara->ImgSize)
{ switch (puiPara->ImgSize)
case PHOTO_SIZE_16M: {
lv_label_set_text(label_5_scr_uiflowphoto, "16M"); case PHOTO_SIZE_40M:
break; lv_label_set_text(label_4_scr_uiflowphoto, "40M");
case PHOTO_SIZE_12M: break;
lv_label_set_text(label_5_scr_uiflowphoto, "12M"); case PHOTO_SIZE_32M:
break; lv_label_set_text(label_4_scr_uiflowphoto, "32M");
case PHOTO_SIZE_8M: break;
lv_label_set_text(label_5_scr_uiflowphoto, "8M"); case PHOTO_SIZE_24M:
break; lv_label_set_text(label_4_scr_uiflowphoto, "24M");
break;
default: case PHOTO_SIZE_16M:
break; lv_label_set_text(label_4_scr_uiflowphoto, "16M");
break;
case PHOTO_SIZE_12M:
lv_label_set_text(label_4_scr_uiflowphoto, "12M");
break;
case PHOTO_SIZE_8M:
lv_label_set_text(label_4_scr_uiflowphoto, "8M");
break;
case PHOTO_SIZE_5M:
lv_label_set_text(label_4_scr_uiflowphoto, "5M");
break;
default:
break;
} }
switch (puiPara->Multishot) switch (puiPara->Multishot)
{ {
case 1: case CONTINUE_SHOT_OFF:
lv_label_set_text(label_4_scr_uiflowphoto, "1P"); lv_label_set_text(label_4_scr_uiflowphoto, "1P");
break; break;
case 2: case CONTINUE_SHOT_BURST_2:
lv_label_set_text(label_4_scr_uiflowphoto, "2P"); lv_label_set_text(label_4_scr_uiflowphoto, "2P");
break; break;
case 3: case CONTINUE_SHOT_BURST_3:
lv_label_set_text(label_4_scr_uiflowphoto, "3P"); lv_label_set_text(label_4_scr_uiflowphoto, "3P");
break; break;
case CONTINUE_SHOT_BURST_4:
default: lv_label_set_text(label_4_scr_uiflowphoto, "4P");
break; break;
} case CONTINUE_SHOT_BURST_5:
if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE) lv_label_set_text(label_4_scr_uiflowphoto, "5P");
{ break;
lv_label_set_text(label_6_scr_uiflowphoto, "NO SD CARD"); default:
} break;
else
{
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum));
} }
UINT32 cardStatus = System_GetState(SYS_STATE_CARD);
if (cardStatus != CARD_REMOVED)
{
if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE)
{
lv_label_set_text(label_6_scr_uiflowphoto, "SD CARD ERROR");
}
else
{
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum));
}
}
else
{
lv_label_set_text(label_6_scr_uiflowphoto, "NO SD CARD");
}
} }
static void update_wifi(void) static void update_wifi(void)