Improve send type setting.
This commit is contained in:
xiaojiazhu
parent
00a0d25ff9
commit
ea09cd8860
|
|
@ -289,51 +289,6 @@ 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_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;
|
||||
}
|
||||
|
||||
|
|
@ -475,7 +430,8 @@ static const char* SendTimeMap_1[BUTTON_NUM_4] =
|
|||
};
|
||||
// static int CameraInfoIndex = 0;
|
||||
// static lv_obj_t *CameraInfolabel = NULL;
|
||||
static lv_obj_t *CameraInfoImage = NULL;
|
||||
static lv_obj_t *SendTypeImage = NULL;
|
||||
static lv_obj_t* CameraNameImage = NULL;
|
||||
static lv_obj_t * btnm = NULL;
|
||||
static const char * map[] = {"1", "2", ""};
|
||||
|
||||
|
|
@ -484,6 +440,7 @@ static void update_send_time_msg(lv_obj_t* obj)
|
|||
// UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||
printf(" page now is %d\n", gPageNum);
|
||||
unsigned short settingIndex = gPageNum * 2;
|
||||
int offset = 0;
|
||||
|
||||
snprintf(SendTimeHHBuf1, TIME_BUF_LENGTH, "%02d", gSendTime[settingIndex + 0].Hour);
|
||||
snprintf(SendTimeMMBuf1, TIME_BUF_LENGTH, "%02d", gSendTime[settingIndex + 0].Min);
|
||||
|
|
@ -494,11 +451,14 @@ static void update_send_time_msg(lv_obj_t* obj)
|
|||
{
|
||||
lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_0, gMatrixIndex);
|
||||
lv_btnmatrix_set_map(SendTimeMatrixObj_0, SendTimeMap_0);
|
||||
offset = gMatrixIndex > 3 ? 32 : 0;
|
||||
lv_obj_set_x(CameraNameImage, (32 + 32 * gMatrixIndex + offset));
|
||||
}
|
||||
if(NULL != SendTimeMatrixObj_1)
|
||||
{
|
||||
lv_btnmatrix_set_focused_btn(SendTimeMatrixObj_1, gMatrixIndex);
|
||||
lv_btnmatrix_set_map(SendTimeMatrixObj_1, SendTimeMap_1);
|
||||
lv_obj_set_x(CameraNameImage, (112 + 32 * gMatrixIndex));
|
||||
}
|
||||
if(NULL != btnm)
|
||||
{
|
||||
|
|
@ -526,6 +486,7 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
|
|||
SendTimeMatrixObj_1 = NULL;
|
||||
SendTimeMatrixObj_0 = NULL;
|
||||
btnm = NULL;
|
||||
CameraNameImage = NULL;
|
||||
|
||||
init_Matrix_style();
|
||||
|
||||
|
|
@ -546,15 +507,15 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
|
|||
snprintf(SendTimeMMBuf1, TIME_BUF_LENGTH, "%02d", gSendTime[settingIndex + 0].Min);
|
||||
snprintf(SendTimeHHBuf2, TIME_BUF_LENGTH, "%02d", gSendTime[settingIndex + 1].Hour);
|
||||
snprintf(SendTimeMMBuf2, TIME_BUF_LENGTH, "%02d", gSendTime[settingIndex + 1].Min);
|
||||
|
||||
// int i = 0;
|
||||
if(ONCE_DAY != gSendType)
|
||||
{
|
||||
SendTimeMatrixObj_0 = lv_btnmatrix_create(obj, NULL);
|
||||
lv_obj_set_hidden(SendTimeMatrixObj_0, false);
|
||||
lv_obj_set_click(SendTimeMatrixObj_0, true);
|
||||
lv_obj_set_drag(SendTimeMatrixObj_0, false);
|
||||
lv_obj_set_pos(SendTimeMatrixObj_0, 20, 81);
|
||||
lv_obj_set_size(SendTimeMatrixObj_0, 280, 80);
|
||||
lv_obj_set_pos(SendTimeMatrixObj_0, 32, 81);
|
||||
lv_obj_set_size(SendTimeMatrixObj_0, 256, 80);
|
||||
lv_btnmatrix_set_map(SendTimeMatrixObj_0, SendTimeMap_0);
|
||||
lv_btnmatrix_set_one_check(SendTimeMatrixObj_0, true);
|
||||
lv_btnmatrix_set_align(SendTimeMatrixObj_0, LV_LABEL_ALIGN_CENTER);
|
||||
|
|
@ -562,6 +523,11 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
|
|||
lv_btnmatrix_set_one_check(SendTimeMatrixObj_0, false);
|
||||
lv_obj_add_style(SendTimeMatrixObj_0, 0, &gMatrixStylebg);
|
||||
lv_obj_add_style(SendTimeMatrixObj_0, 1, &gMatrixStylebtn);
|
||||
lv_btnmatrix_set_btn_width(SendTimeMatrixObj_0, 3, 2);
|
||||
// for (i = 0; i < 8; i++)
|
||||
// {
|
||||
// lv_btnmatrix_set_btn_width(SendTimeMatrixObj_0, i, 1);
|
||||
// }
|
||||
|
||||
lv_obj_set_hidden(container_send_time_1_scr_uiflowmenucommonoption, false);
|
||||
}
|
||||
|
|
@ -571,8 +537,8 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
|
|||
lv_obj_set_hidden(SendTimeMatrixObj_1, false);
|
||||
lv_obj_set_click(SendTimeMatrixObj_1, true);
|
||||
lv_obj_set_drag(SendTimeMatrixObj_1, false);
|
||||
lv_obj_set_pos(SendTimeMatrixObj_1, 110, 81);
|
||||
lv_obj_set_size(SendTimeMatrixObj_1, 100, 80);
|
||||
lv_obj_set_pos(SendTimeMatrixObj_1, 112, 81);
|
||||
lv_obj_set_size(SendTimeMatrixObj_1, 96, 80);
|
||||
lv_btnmatrix_set_map(SendTimeMatrixObj_1, SendTimeMap_1);
|
||||
lv_btnmatrix_set_one_check(SendTimeMatrixObj_1, true);
|
||||
lv_btnmatrix_set_align(SendTimeMatrixObj_1, LV_LABEL_ALIGN_CENTER);
|
||||
|
|
@ -580,9 +546,27 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
|
|||
lv_btnmatrix_set_one_check(SendTimeMatrixObj_1, false);
|
||||
lv_obj_add_style(SendTimeMatrixObj_1, 0, &gMatrixStylebg);
|
||||
lv_obj_add_style(SendTimeMatrixObj_1, 1, &gMatrixStylebtn);
|
||||
// for (i = 0; i < 4; i++)
|
||||
// {
|
||||
// lv_btnmatrix_set_btn_width(SendTimeMatrixObj_1, i, 1);
|
||||
// }
|
||||
|
||||
lv_obj_set_hidden(container_send_time_0_scr_uiflowmenucommonoption, false);
|
||||
}
|
||||
CameraNameImage = lv_img_create(obj, NULL);
|
||||
lv_obj_set_hidden(CameraNameImage, false);
|
||||
lv_obj_set_click(CameraNameImage, false);
|
||||
lv_obj_set_drag(CameraNameImage, false);
|
||||
lv_obj_set_size(CameraNameImage, 32, 88);
|
||||
lv_img_set_src(CameraNameImage, &sf_pwd_down_up);
|
||||
if(ONCE_DAY != gSendType)
|
||||
{
|
||||
lv_obj_set_pos(CameraNameImage, 32, 78);
|
||||
}
|
||||
else
|
||||
{
|
||||
lv_obj_set_pos(CameraNameImage, 112, 78);
|
||||
}
|
||||
|
||||
if(FOUR_TIME_DAY == gSendType)
|
||||
{
|
||||
|
|
@ -595,13 +579,13 @@ void show_send_time_page(lv_obj_t* obj, const int sendType)
|
|||
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);
|
||||
SendTypeImage = lv_img_create(lv_scr_act(), NULL);
|
||||
lv_obj_set_hidden(SendTypeImage, false);
|
||||
lv_obj_set_click(SendTypeImage, false);
|
||||
lv_obj_set_drag(SendTypeImage, false);
|
||||
lv_obj_set_pos(SendTypeImage, 103, 200);
|
||||
lv_obj_set_size(SendTypeImage, 113, 40);
|
||||
lv_img_set_src(SendTypeImage, &sf_next4);
|
||||
}
|
||||
}
|
||||
void hidde_send_time_page(void)
|
||||
|
|
@ -620,6 +604,11 @@ void hidde_send_time_page(void)
|
|||
{
|
||||
lv_obj_del(btnm);
|
||||
btnm = NULL;
|
||||
}
|
||||
if(CameraNameImage)
|
||||
{
|
||||
lv_obj_del(CameraNameImage);
|
||||
CameraNameImage = NULL;
|
||||
}
|
||||
lv_obj_set_hidden(container_send_time_0_scr_uiflowmenucommonoption, true);
|
||||
lv_obj_set_hidden(container_send_time_1_scr_uiflowmenucommonoption, true);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user