完成General页面的Delay功能,修改二级菜单按钮逻辑
This commit is contained in:
parent
a632b57a78
commit
2b19ea7fcf
|
@ -150,119 +150,122 @@ int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
|
||||||
return TMF_PROCESSED;
|
return TMF_PROCESSED;
|
||||||
}
|
}
|
||||||
|
|
||||||
// static lv_style_t gMatrixStylebg;
|
// --------------------------------------------------------------------------
|
||||||
// static lv_style_t gMatrixStylebtn;
|
// Common Function
|
||||||
// static void _init_Matrix_style()
|
// --------------------------------------------------------------------------
|
||||||
// {
|
static lv_style_t gMatrixStylebg;
|
||||||
// static int isinitialized = 0;
|
static lv_style_t gMatrixStylebtn;
|
||||||
// if(initialized)
|
static void init_Matrix_style(void)
|
||||||
// break;
|
{
|
||||||
|
static int isinitialized = 0;
|
||||||
|
if(isinitialized)
|
||||||
|
return;
|
||||||
|
|
||||||
// lv_color_t color = {0};
|
lv_color_t color = {0};
|
||||||
// lv_style_init(&gMatrixStylebg);
|
lv_style_init(&gMatrixStylebg);
|
||||||
// lv_style_set_pad_top(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
lv_style_set_pad_top(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
||||||
// lv_style_set_pad_bottom(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
lv_style_set_pad_bottom(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
||||||
// lv_style_set_pad_left(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
lv_style_set_pad_left(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
||||||
// lv_style_set_pad_right(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
lv_style_set_pad_right(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
||||||
// lv_style_set_pad_inner(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
lv_style_set_pad_inner(&gMatrixStylebg,LV_STATE_DEFAULT,0);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_DISABLED, color);
|
||||||
|
|
||||||
// lv_style_init(&gMatrixStylebtn);
|
lv_style_init(&gMatrixStylebtn);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// lv_style_set_value_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_8bpp);
|
lv_style_set_value_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_8bpp);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_8bpp);
|
lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_8bpp);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0xc8, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_EDITED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_HOVERED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_PRESSED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
// STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_DISABLED, color);
|
||||||
|
|
||||||
// isinitialized = 1;
|
isinitialized = 1;
|
||||||
// }
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
// Sensitivity
|
// Sensitivity
|
||||||
|
@ -362,29 +365,157 @@ void Option_Sensitivity_Key(lv_obj_t* obj, uint32_t key)
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
// Delay
|
// Delay
|
||||||
// --------------------------------------------------------------------------
|
// --------------------------------------------------------------------------
|
||||||
|
static int DelayIndex = 0;
|
||||||
|
static lv_obj_t* DelayMatrixObj = NULL;
|
||||||
|
static char DelayHHBuf[3] = "00";
|
||||||
|
static char DelayMMBuf[3] = "00";
|
||||||
|
static char DelaySSBuf[3] = "00";
|
||||||
|
static const char* DelayMap[6] =
|
||||||
|
{
|
||||||
|
DelayHHBuf,
|
||||||
|
":",
|
||||||
|
DelayMMBuf,
|
||||||
|
":",
|
||||||
|
DelaySSBuf,
|
||||||
|
""
|
||||||
|
};
|
||||||
|
|
||||||
|
static void update_Delay_msg(lv_obj_t* obj)
|
||||||
|
{
|
||||||
|
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||||
|
|
||||||
|
snprintf(DelayHHBuf, 3, "%02d", puiPara->PirDelayTime.Hour);
|
||||||
|
snprintf(DelayMMBuf, 3, "%02d", puiPara->PirDelayTime.Min);
|
||||||
|
snprintf(DelaySSBuf, 3, "%02d", puiPara->PirDelayTime.Sec);
|
||||||
|
|
||||||
|
lv_btnmatrix_set_focused_btn(DelayMatrixObj, DelayIndex);
|
||||||
|
}
|
||||||
|
|
||||||
void show_Delay_page(lv_obj_t* obj)
|
void show_Delay_page(lv_obj_t* obj)
|
||||||
{
|
{
|
||||||
// lv_obj_t *button_matrix_1 = lv_btnmatrix_create(parent, NULL);
|
DelayIndex = 0;
|
||||||
// lv_obj_set_hidden(button_matrix_1, false);
|
|
||||||
// lv_obj_set_click(button_matrix_1, true);
|
init_Matrix_style();
|
||||||
// lv_obj_set_drag(button_matrix_1, false);
|
|
||||||
// lv_obj_set_pos(button_matrix_1, 21, 58);
|
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||||
// lv_obj_set_size(button_matrix_1, 272, 140);
|
if(!puiPara->PirDelaySwitch)
|
||||||
// static const char* button_matrix_1_LVGLPropertyBtnmatrixButtonsText[] = {"Btn1","Btn2","Btn3",""," "," "," ","1",""};
|
{
|
||||||
// lv_btnmatrix_set_map(button_matrix_1, button_matrix_1_LVGLPropertyBtnmatrixButtonsText);
|
puiPara->PirDelayTime.Hour = 0;
|
||||||
// lv_btnmatrix_set_one_check(button_matrix_1, false);
|
puiPara->PirDelayTime.Min = 0;
|
||||||
// lv_btnmatrix_set_focused_btn(button_matrix_1,1);
|
puiPara->PirDelayTime.Sec = 30;
|
||||||
// lv_btnmatrix_set_one_check(button_matrix_1, false);
|
}
|
||||||
// lv_obj_add_style(button_matrix_1, 0, &button_matrix_1_s0);
|
snprintf(DelayHHBuf, 3, "%02d", puiPara->PirDelayTime.Hour);
|
||||||
// lv_obj_add_style(button_matrix_1, 1, &button_matrix_1_s1);
|
snprintf(DelayMMBuf, 3, "%02d", puiPara->PirDelayTime.Min);
|
||||||
|
snprintf(DelaySSBuf, 3, "%02d", puiPara->PirDelayTime.Sec);
|
||||||
|
|
||||||
|
DelayMatrixObj = lv_btnmatrix_create(obj, NULL);
|
||||||
|
lv_obj_set_hidden(DelayMatrixObj, false);
|
||||||
|
lv_obj_set_click(DelayMatrixObj, true);
|
||||||
|
lv_obj_set_drag(DelayMatrixObj, false);
|
||||||
|
lv_obj_set_pos(DelayMatrixObj, 92, 58);
|
||||||
|
lv_obj_set_size(DelayMatrixObj, 136, 140);
|
||||||
|
lv_btnmatrix_set_map(DelayMatrixObj, DelayMap);
|
||||||
|
lv_btnmatrix_set_one_check(DelayMatrixObj, true);
|
||||||
|
lv_btnmatrix_set_align(DelayMatrixObj, LV_LABEL_ALIGN_CENTER);
|
||||||
|
lv_btnmatrix_set_focused_btn(DelayMatrixObj,0);
|
||||||
|
lv_btnmatrix_set_one_check(DelayMatrixObj, false);
|
||||||
|
lv_obj_add_style(DelayMatrixObj, 0, &gMatrixStylebg);
|
||||||
|
lv_obj_add_style(DelayMatrixObj, 1, &gMatrixStylebtn);
|
||||||
}
|
}
|
||||||
|
|
||||||
void hidde_Delay_page(void)
|
void hidde_Delay_page(void)
|
||||||
{
|
{
|
||||||
|
if(DelayMatrixObj)
|
||||||
|
{
|
||||||
|
lv_obj_del(DelayMatrixObj);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Option_Delay_Key(lv_obj_t* obj, uint32_t key)
|
void Option_Delay_Key(lv_obj_t* obj, uint32_t key)
|
||||||
{
|
{
|
||||||
|
if(DelayMatrixObj == NULL)
|
||||||
|
{
|
||||||
|
printf("DelayMatrixObj is NULL");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// char result[2];
|
||||||
|
UIMenuStoreInfo *puiPara = sf_ui_para_get();
|
||||||
|
printf("key:%d\n",key);
|
||||||
|
|
||||||
|
switch(key)
|
||||||
|
{
|
||||||
|
case LV_USER_KEY_NEXT:
|
||||||
|
printf("\033[33m[Option_Sensitivity_Key]s\033[0m\n");
|
||||||
|
if(DelayIndex == 0)
|
||||||
|
{
|
||||||
|
if(puiPara->PirDelayTime.Hour > 0 && puiPara->PirDelayTime.Hour <= 23)
|
||||||
|
puiPara->PirDelayTime.Hour--;
|
||||||
|
else
|
||||||
|
puiPara->PirDelayTime.Hour = 23;
|
||||||
|
}
|
||||||
|
else if(DelayIndex == 2)
|
||||||
|
{
|
||||||
|
if(puiPara->PirDelayTime.Min > 0 && puiPara->PirDelayTime.Min <= 59)
|
||||||
|
puiPara->PirDelayTime.Min--;
|
||||||
|
else
|
||||||
|
puiPara->PirDelayTime.Min = 59;
|
||||||
|
}
|
||||||
|
else if(DelayIndex == 4)
|
||||||
|
{
|
||||||
|
if(puiPara->PirDelayTime.Sec > 0 && puiPara->PirDelayTime.Sec <= 59)
|
||||||
|
puiPara->PirDelayTime.Sec--;
|
||||||
|
else
|
||||||
|
puiPara->PirDelayTime.Sec = 59;
|
||||||
|
}
|
||||||
|
if(puiPara->PirDelayTime.Min == 0 && (puiPara->PirDelayTime.Sec >= 0 && puiPara->PirDelayTime.Sec < 5))
|
||||||
|
puiPara->PirDelayTime.Sec = 59;
|
||||||
|
update_Delay_msg(obj);
|
||||||
|
break;
|
||||||
|
case LV_USER_KEY_PREV:
|
||||||
|
printf("\033[33m[Option_Sensitivity_Key]w\033[0m\n");
|
||||||
|
if(DelayIndex == 0)
|
||||||
|
{
|
||||||
|
if(puiPara->PirDelayTime.Hour >= 23)
|
||||||
|
puiPara->PirDelayTime.Hour = 0;
|
||||||
|
else
|
||||||
|
puiPara->PirDelayTime.Hour++;
|
||||||
|
}
|
||||||
|
else if(DelayIndex == 2)
|
||||||
|
{
|
||||||
|
if(puiPara->PirDelayTime.Min >= 59)
|
||||||
|
puiPara->PirDelayTime.Min = 0;
|
||||||
|
else
|
||||||
|
puiPara->PirDelayTime.Min++;
|
||||||
|
}
|
||||||
|
else if(DelayIndex == 4)
|
||||||
|
{
|
||||||
|
if(puiPara->PirDelayTime.Sec == 59)
|
||||||
|
puiPara->PirDelayTime.Sec = 0;
|
||||||
|
else
|
||||||
|
puiPara->PirDelayTime.Sec++;
|
||||||
|
}
|
||||||
|
if(puiPara->PirDelayTime.Min == 0 && (puiPara->PirDelayTime.Sec >= 0 && puiPara->PirDelayTime.Sec < 5))
|
||||||
|
puiPara->PirDelayTime.Sec = 5;
|
||||||
|
update_Delay_msg(obj);
|
||||||
|
break;
|
||||||
|
case LV_USER_KEY_LEFT:
|
||||||
|
printf("\033[33m[Option_Sensitivity_Key]a\033[0m\n");
|
||||||
|
DelayIndex = (DelayIndex - 2 + 6) % 6;
|
||||||
|
update_Delay_msg(obj);
|
||||||
|
break;
|
||||||
|
case LV_USER_KEY_RIGHT:
|
||||||
|
printf("\033[33m[Option_Sensitivity_Key]d\033[0m\n");
|
||||||
|
DelayIndex = (DelayIndex + 2) % 6;
|
||||||
|
update_Delay_msg(obj);
|
||||||
|
break;
|
||||||
|
case LV_KEY_ENTER:
|
||||||
|
printf("\033[33m[Option_Sensitivity_Key]SELECT\033[0m\n");
|
||||||
|
puiPara->PirDelaySwitch = 1;
|
||||||
|
lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0));
|
||||||
|
hidde_Delay_page();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -495,10 +495,10 @@ static void LV_MenuOption_OnNext(lv_obj_t* obj)
|
||||||
// DBG_DUMP("%s SelOption=%d\r\n", __func__,SelOption);
|
// DBG_DUMP("%s SelOption=%d\r\n", __func__,SelOption);
|
||||||
SelOption++;
|
SelOption++;
|
||||||
if (SelOption == pItem->Count){
|
if (SelOption == pItem->Count){
|
||||||
// Close current UI Window now
|
// // Close current UI Window now
|
||||||
SysSetFlag(pItem->SysFlag, PrevOption);
|
// SysSetFlag(pItem->SysFlag, PrevOption);
|
||||||
lv_plugin_scr_close(obj, NULL);
|
// lv_plugin_scr_close(obj, NULL);
|
||||||
// UIFlowMenuCommonOption_CloseScr(obj);
|
// // UIFlowMenuCommonOption_CloseScr(obj);
|
||||||
}else{
|
}else{
|
||||||
SysSetFlag(pItem->SysFlag, SelOption);
|
SysSetFlag(pItem->SysFlag, SelOption);
|
||||||
lv_plugin_menu_select_next_item(menu_item);
|
lv_plugin_menu_select_next_item(menu_item);
|
||||||
|
@ -518,10 +518,10 @@ static void LV_MenuOption_OnPrev(lv_obj_t* obj)
|
||||||
pItem = &pPage->pItems[pPage->SelItem];
|
pItem = &pPage->pItems[pPage->SelItem];
|
||||||
SelOption = SysGetFlag(pItem->SysFlag);
|
SelOption = SysGetFlag(pItem->SysFlag);
|
||||||
if (SelOption == 0) {
|
if (SelOption == 0) {
|
||||||
// Close current UI Window now
|
// // Close current UI Window now
|
||||||
SysSetFlag(pItem->SysFlag, PrevOption);
|
// SysSetFlag(pItem->SysFlag, PrevOption);
|
||||||
lv_plugin_scr_close(obj, NULL);
|
// lv_plugin_scr_close(obj, NULL);
|
||||||
// UIFlowMenuCommonOption_CloseScr(obj);
|
// // UIFlowMenuCommonOption_CloseScr(obj);
|
||||||
} else {
|
} else {
|
||||||
SelOption--;
|
SelOption--;
|
||||||
SysSetFlag(pItem->SysFlag, SelOption);
|
SysSetFlag(pItem->SysFlag, SelOption);
|
||||||
|
@ -588,7 +588,8 @@ static void LV_MenuOption_OnSelected(lv_obj_t* obj)
|
||||||
|
|
||||||
}
|
}
|
||||||
if((pItem->ItemId == IDM_PASSWORD ||
|
if((pItem->ItemId == IDM_PASSWORD ||
|
||||||
pItem->ItemId == IDM_CAMERA_NAME)
|
pItem->ItemId == IDM_CAMERA_NAME ||
|
||||||
|
pItem->ItemId == IDM_DELAY)
|
||||||
&& pOption->TextId == IDS_CAMERA_NAME_ON)
|
&& pOption->TextId == IDS_CAMERA_NAME_ON)
|
||||||
{
|
{
|
||||||
lv_obj_set_hidden(container_main_menu_scr_uiflowmenucommonoption, true);
|
lv_obj_set_hidden(container_main_menu_scr_uiflowmenucommonoption, true);
|
||||||
|
@ -601,6 +602,9 @@ static void LV_MenuOption_OnSelected(lv_obj_t* obj)
|
||||||
case IDM_CAMERA_NAME:
|
case IDM_CAMERA_NAME:
|
||||||
show_Camera_Name_page(obj);
|
show_Camera_Name_page(obj);
|
||||||
break;
|
break;
|
||||||
|
case IDM_DELAY:
|
||||||
|
show_Delay_page(obj);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -709,18 +713,18 @@ static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key)
|
||||||
LV_MenuOption_OnPrev(obj);
|
LV_MenuOption_OnPrev(obj);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case LV_KEY_RIGHT:
|
// case LV_KEY_RIGHT:
|
||||||
{
|
// {
|
||||||
LV_MenuOption_OnSelected(obj);
|
// LV_MenuOption_OnSelected(obj);
|
||||||
break;
|
// break;
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
// case LV_USER_KEY_SELECT:
|
||||||
|
// {
|
||||||
|
// LV_MenuOption_OnSelected(obj);
|
||||||
|
// break;
|
||||||
|
// }
|
||||||
|
|
||||||
case LV_USER_KEY_SELECT:
|
|
||||||
{
|
|
||||||
LV_MenuOption_OnSelected(obj);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
//
|
|
||||||
case LV_KEY_ENTER:
|
case LV_KEY_ENTER:
|
||||||
{
|
{
|
||||||
LV_MenuOption_OnSelected(obj);
|
LV_MenuOption_OnSelected(obj);
|
||||||
|
@ -783,10 +787,10 @@ void UIFlowMenuCommonOptionEventCallback(lv_obj_t* obj, lv_event_t event)
|
||||||
lv_plugin_menu_set_selected_item_released(menu_item);
|
lv_plugin_menu_set_selected_item_released(menu_item);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LV_EVENT_CLICKED:
|
// case LV_EVENT_CLICKED:
|
||||||
printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_EVENT_CLICKED\033[0m\n");
|
// printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_EVENT_CLICKED\033[0m\n");
|
||||||
// LV_MenuOption_OnSelected(obj);
|
// LV_MenuOption_OnSelected(obj);
|
||||||
break;
|
// break;
|
||||||
|
|
||||||
case LV_EVENT_KEY:
|
case LV_EVENT_KEY:
|
||||||
{
|
{
|
||||||
|
@ -835,6 +839,15 @@ void UIFlowMenuCommonOptionEventCallback(lv_obj_t* obj, lv_event_t event)
|
||||||
Option_Sensitivity_Key(obj, *key);
|
Option_Sensitivity_Key(obj, *key);
|
||||||
break;
|
break;
|
||||||
case IDM_DELAY:
|
case IDM_DELAY:
|
||||||
|
if(isSetting)
|
||||||
|
{
|
||||||
|
Option_Delay_Key(obj, *key);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
UIFlowMenuCommonOption_Key(obj, *key);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case IDM_OPERATING_TIME:
|
case IDM_OPERATING_TIME:
|
||||||
case IDM_FORMAT_SD:
|
case IDM_FORMAT_SD:
|
||||||
case IDM_DATE_AND_TIME:
|
case IDM_DATE_AND_TIME:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user