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

Fixed bug about send type.

Browse Source
This commit is contained in:
xiaojiazhu 2023-11-13 18:56:40 +08:00
parent fa22fbab45
commit 00c432d029
2 changed files with 122 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c
View File

@ -43,6 +43,9 @@ TMDEF_PAGE_TEXT_ICON(SEND)
TMDEF_END_PAGES() TMDEF_END_PAGES()
TMDEF_EMNU(gSendMenu, SEND, Send_MenuCallback) TMDEF_EMNU(gSendMenu, SEND, Send_MenuCallback)
static lv_style_t gStyleLabel0;
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// Menu Callback // Menu Callback
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@ -286,6 +289,51 @@ static void init_Matrix_style(void)
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel0, LV_STATE_DISABLED, color);
lv_style_init(&gStyleLabel0);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gStyleLabel0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gStyleLabel0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gStyleLabel0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gStyleLabel0, LV_STATE_DEFAULT, color);
lv_style_set_text_font(&gStyleLabel0,LV_STATE_DEFAULT,&sf_ui_text_medium_18_1bpp);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel0, LV_STATE_DEFAULT, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gStyleLabel0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gStyleLabel0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gStyleLabel0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gStyleLabel0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel0, LV_STATE_CHECKED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gStyleLabel0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gStyleLabel0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gStyleLabel0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gStyleLabel0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel0, LV_STATE_FOCUSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gStyleLabel0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gStyleLabel0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gStyleLabel0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gStyleLabel0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel0, LV_STATE_EDITED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gStyleLabel0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gStyleLabel0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gStyleLabel0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gStyleLabel0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel0, LV_STATE_HOVERED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gStyleLabel0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gStyleLabel0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gStyleLabel0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gStyleLabel0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel0, LV_STATE_PRESSED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gStyleLabel0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gStyleLabel0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gStyleLabel0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gStyleLabel0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gStyleLabel0, LV_STATE_DISABLED, color);
STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gStyleLabel0, LV_STATE_DISABLED, color);
isinitialized = 1; isinitialized = 1;
} }
@ -425,6 +473,11 @@ static const char* SendTimeMap_1[BUTTON_NUM_4] =
SendTimeMMBuf1, SendTimeMMBuf1,
"" ""
}; };
// static int CameraInfoIndex = 0;
// static lv_obj_t *CameraInfolabel = NULL;
static lv_obj_t *CameraInfoImage = NULL;
static lv_obj_t * btnm = NULL;
static const char * map[] = {"1", "2", ""};
static void update_send_time_msg(lv_obj_t* obj) static void update_send_time_msg(lv_obj_t* obj)
{ {
@ -447,6 +500,20 @@ static void update_send_time_msg(lv_obj_t* obj)
lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_1, gMatrixIndex); lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_1, gMatrixIndex);
lv_btnmatrix_set_map(SendTimeMatrixObj_1, SendTimeMap_1); lv_btnmatrix_set_map(SendTimeMatrixObj_1, SendTimeMap_1);
} }
if(NULL != btnm)
{
lv_btnmatrix_set_focused_btn(btnm, gPageNum == SECOND_PAGE ? 1 : 0);
}
if (gPageNum == SECOND_PAGE)
{
lv_label_set_text(label_time_1_scr_uiflowmenucommonoption,"Send Time 3");
lv_label_set_text(label_time_2_scr_uiflowmenucommonoption,"Send Time 4");
}
else
{
lv_label_set_text(label_time_1_scr_uiflowmenucommonoption,"Send Time 1");
lv_label_set_text(label_time_2_scr_uiflowmenucommonoption,"Send Time 2");
}
} }
void show_send_time_page(lv_obj_t* obj, const int sendType) void show_send_time_page(lv_obj_t* obj, const int sendType)
{ {
@ -456,6 +523,9 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
gSendType = sendType; gSendType = sendType;
gPageNum = FIRST_PAGE; gPageNum = FIRST_PAGE;
unsigned short settingIndex = gPageNum * 2; unsigned short settingIndex = gPageNum * 2;
SendTimeMatrixObj_1 = NULL;
SendTimeMatrixObj_0 = NULL;
btnm = NULL;
init_Matrix_style(); init_Matrix_style();
@ -513,16 +583,43 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
lv_obj_set_hidden(container_send_time_0_scr_uiflowmenucommonoption, false); lv_obj_set_hidden(container_send_time_0_scr_uiflowmenucommonoption, false);
} }
if(FOUR_TIME_DAY == gSendType)
{
btnm = lv_btnmatrix_create(lv_scr_act(), NULL);
lv_btnmatrix_set_map(btnm, map);
lv_obj_add_style(btnm, 0, &gMatrixStylebg);
lv_obj_add_style(btnm, 1, &gMatrixStylebtn);
lv_obj_set_pos(btnm, 130, 207);
lv_obj_set_size(btnm, 60, 25);
lv_btnmatrix_set_btn_ctrl_all(btnm, LV_BTNMATRIX_CTRL_CHECKABLE);
lv_btnmatrix_set_focused_btn(btnm, 0);
CameraInfoImage = lv_img_create(lv_scr_act(), NULL);
lv_obj_set_hidden(CameraInfoImage, false);
lv_obj_set_click(CameraInfoImage, false);
lv_obj_set_drag(CameraInfoImage, false);
lv_obj_set_pos(CameraInfoImage, 103, 200);
lv_obj_set_size(CameraInfoImage, 113, 40);
lv_img_set_src(CameraInfoImage, &sf_next4);
}
} }
void hidde_send_time_page(void) void hidde_send_time_page(void)
{ {
if(SendTimeMatrixObj_0) if(SendTimeMatrixObj_0)
{ {
lv_obj_del(SendTimeMatrixObj_0); lv_obj_del(SendTimeMatrixObj_0);
SendTimeMatrixObj_0 = NULL;
} }
if(SendTimeMatrixObj_1) if(SendTimeMatrixObj_1)
{ {
lv_obj_del(SendTimeMatrixObj_1); lv_obj_del(SendTimeMatrixObj_1);
SendTimeMatrixObj_1 = NULL;
}
if(btnm)
{
lv_obj_del(btnm);
btnm = NULL;
} }
lv_obj_set_hidden(container_send_time_0_scr_uiflowmenucommonoption, true); lv_obj_set_hidden(container_send_time_0_scr_uiflowmenucommonoption, true);
lv_obj_set_hidden(container_send_time_1_scr_uiflowmenucommonoption, true); lv_obj_set_hidden(container_send_time_1_scr_uiflowmenucommonoption, true);

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

@ -478,27 +478,33 @@ static void update_camera_message(void)
default: default:
break; break;
} }
UINT32 cardStatus = System_GetState(SYS_STATE_CARD); if (System_GetState(SYS_STATE_FS) == FS_INIT_OK)
{
if (cardStatus != CARD_REMOVED) 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");
} if (UIStorageCheck(STORAGE_CHECK_FULL, NULL) == TRUE)
{ {
lv_label_set_text(label_6_scr_uiflowphoto, "SD FULL"); if (UIStorageCheck(STORAGE_CHECK_ERROR, NULL) == TRUE)
{
// lv_label_set_text(label_6_scr_uiflowphoto, "SD CARD ERROR");
} if (UIStorageCheck(STORAGE_CHECK_FULL, NULL) == TRUE)
{
lv_label_set_text(label_6_scr_uiflowphoto, "SD FULL");
}
else
{
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum));
}
} }
else else
{ {
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum); lv_label_set_text(label_6_scr_uiflowphoto, "NO SD CARD");
lv_label_set_text(label_6_scr_uiflowphoto, Get_FreePicNumString(g_uiFreePicNum)); }
} }
} else
else {
{ lv_label_set_text(label_6_scr_uiflowphoto, "NO SD CARD");
lv_label_set_text(label_6_scr_uiflowphoto, "NO SD CARD"); }
}
} }
static void update_wifi(void) static void update_wifi(void)