1.sd卡和UI显示的代码优化
This commit is contained in:
parent
3791d1bf87
commit
89892c2012
|
@ -285,45 +285,70 @@ static void update_camera_message(void)
|
|||
// if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO))
|
||||
switch (puiPara->ImgSize)
|
||||
{
|
||||
case PHOTO_SIZE_16M:
|
||||
lv_label_set_text(label_5_scr_uiflowmovie, "16M");
|
||||
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;
|
||||
|
||||
default:
|
||||
break;
|
||||
case PHOTO_SIZE_40M:
|
||||
lv_label_set_text(label_5_scr_uiflowmovie, "40M");
|
||||
break;
|
||||
case PHOTO_SIZE_32M:
|
||||
lv_label_set_text(label_5_scr_uiflowmovie, "32M");
|
||||
break;
|
||||
case PHOTO_SIZE_24M:
|
||||
lv_label_set_text(label_5_scr_uiflowmovie, "24M");
|
||||
break;
|
||||
case PHOTO_SIZE_16M:
|
||||
lv_label_set_text(label_5_scr_uiflowmovie, "16M");
|
||||
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)
|
||||
{
|
||||
case 1:
|
||||
lv_label_set_text(label_4_scr_uiflowmovie, "1P");
|
||||
break;
|
||||
case 2:
|
||||
lv_label_set_text(label_4_scr_uiflowmovie, "2P");
|
||||
break;
|
||||
case 3:
|
||||
lv_label_set_text(label_4_scr_uiflowmovie, "3P");
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
case CONTINUE_SHOT_OFF:
|
||||
lv_label_set_text(label_4_scr_uiflowmovie, "1P");
|
||||
break;
|
||||
case CONTINUE_SHOT_BURST_2:
|
||||
lv_label_set_text(label_4_scr_uiflowmovie, "2P");
|
||||
break;
|
||||
case CONTINUE_SHOT_BURST_3:
|
||||
lv_label_set_text(label_4_scr_uiflowmovie, "3P");
|
||||
break;
|
||||
case CONTINUE_SHOT_BURST_4:
|
||||
lv_label_set_text(label_4_scr_uiflowmovie, "4P");
|
||||
break;
|
||||
case CONTINUE_SHOT_BURST_5:
|
||||
lv_label_set_text(label_4_scr_uiflowmovie, "5P");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
UINT32 freePicNum = 0;
|
||||
// PhotoExe_GetTotalPicNum();
|
||||
if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE)
|
||||
{
|
||||
lv_label_set_text(label_6_scr_uiflowmovie, "NO SD CARD");
|
||||
}
|
||||
else
|
||||
{
|
||||
UIStorageCheck(STORAGE_CHECK_FULL, &freePicNum);
|
||||
lv_label_set_text(label_6_scr_uiflowmovie, Get_FreePicNumString(freePicNum));
|
||||
}
|
||||
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_uiflowmovie, "SD CARD ERROR");
|
||||
}
|
||||
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)
|
||||
|
|
|
@ -142,14 +142,19 @@ static void update_quality(void)
|
|||
|
||||
static void update_free_pic_number(void)
|
||||
{
|
||||
if(g_PhotoBgInitFileSys == TRUE){
|
||||
#if (FS_FUNC == ENABLE)
|
||||
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 ...");
|
||||
}
|
||||
UINT32 cardStatus = System_GetState(SYS_STATE_CARD);
|
||||
|
||||
if (cardStatus != CARD_REMOVED)
|
||||
{
|
||||
if(g_PhotoBgInitFileSys == TRUE){
|
||||
#if (FS_FUNC == ENABLE)
|
||||
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)
|
||||
|
@ -406,45 +411,71 @@ static void update_camera_message(void)
|
|||
{
|
||||
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||
// if((puiPara->CamMode == SF_CAM_MODE_PHOTO) || (puiPara->CamMode == SF_CAM_MODE_PHOTO_VIDEO))
|
||||
switch (puiPara->ImgSize)
|
||||
{
|
||||
case PHOTO_SIZE_16M:
|
||||
lv_label_set_text(label_5_scr_uiflowphoto, "16M");
|
||||
break;
|
||||
case PHOTO_SIZE_12M:
|
||||
lv_label_set_text(label_5_scr_uiflowphoto, "12M");
|
||||
break;
|
||||
case PHOTO_SIZE_8M:
|
||||
lv_label_set_text(label_5_scr_uiflowphoto, "8M");
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
|
||||
switch (puiPara->ImgSize)
|
||||
{
|
||||
case PHOTO_SIZE_40M:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "40M");
|
||||
break;
|
||||
case PHOTO_SIZE_32M:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "32M");
|
||||
break;
|
||||
case PHOTO_SIZE_24M:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "24M");
|
||||
break;
|
||||
case PHOTO_SIZE_16M:
|
||||
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)
|
||||
{
|
||||
case 1:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "1P");
|
||||
break;
|
||||
case 2:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "2P");
|
||||
break;
|
||||
case 3:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "3P");
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE)
|
||||
{
|
||||
lv_label_set_text(label_6_scr_uiflowphoto, "NO SD CARD");
|
||||
}
|
||||
else
|
||||
{
|
||||
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
|
||||
lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum));
|
||||
case CONTINUE_SHOT_OFF:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "1P");
|
||||
break;
|
||||
case CONTINUE_SHOT_BURST_2:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "2P");
|
||||
break;
|
||||
case CONTINUE_SHOT_BURST_3:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "3P");
|
||||
break;
|
||||
case CONTINUE_SHOT_BURST_4:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "4P");
|
||||
break;
|
||||
case CONTINUE_SHOT_BURST_5:
|
||||
lv_label_set_text(label_4_scr_uiflowphoto, "5P");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
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)
|
||||
|
|
Loading…
Reference in New Issue
Block a user