From d963512fe1e9d45971b8eea17dc6545fa83b81ea Mon Sep 17 00:00:00 2001 From: zyj Date: Thu, 9 Nov 2023 10:15:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=8C=E5=96=84Sensitivity=E7=9A=84UI?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowMenuCommonItem/MenuGeneral.c | 279 +++++++++++------- 1 file changed, 167 insertions(+), 112 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c index 933f6696c..90084e193 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c @@ -196,6 +196,7 @@ int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam) // -------------------------------------------------------------------------- static lv_style_t gMatrixStylebg; static lv_style_t gMatrixStylebtn; +static lv_style_t gStyleLabel0; static void init_Matrix_style(void) { static int isinitialized = 0; @@ -209,101 +210,147 @@ static void init_Matrix_style(void) lv_style_set_pad_left(&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); - 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(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(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_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(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(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_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(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(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_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(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebg, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebg, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebg, LV_STATE_DISABLED, color); lv_style_init(&gMatrixStylebtn); - 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(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_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_value_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); - 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); - 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_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(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_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_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(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_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(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_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_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(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_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(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_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_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(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_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(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_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_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(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_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(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_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_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(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_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(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_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_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(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_bg_color(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 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_1bpp); + STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); + lv_style_set_text_font(&gMatrixStylebtn,LV_STATE_DEFAULT,&sf_ui_text_bold_20_1bpp); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x22, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_bg_grad_color(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_value_color(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_color(&gMatrixStylebtn, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x23, 0x00, 0x00, 0x00) ; lv_style_set_text_sel_bg_color(&gMatrixStylebtn, 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; } @@ -313,6 +360,7 @@ static void init_Matrix_style(void) // -------------------------------------------------------------------------- static lv_obj_t *SensitivityTitleLabel = NULL; static lv_obj_t *SensitivityValueLabel = NULL; +static lv_obj_t *SensitivityContainer = NULL; #define DIG_PIR_LEVEL 10 static char gPirSensitivity = 0; UINT8 gDigPirLevel[DIG_PIR_LEVEL] = {200, 38, 30, 24, 18, 16, 10, 9, 8, 7}; @@ -347,30 +395,38 @@ void show_Sensitivity_page(lv_obj_t* obj) break; } } + + init_Matrix_style(); + lv_color_t color = {0}; - static lv_style_t style; - lv_style_init(&style); - lv_style_set_text_font(&style,LV_STATE_DEFAULT,&sf_ui_text_bold_20_8bpp); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&style, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x02, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&style, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&style, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x06, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&style, LV_STATE_FOCUSED, color); + static lv_style_t SensitivityContainerStyle; + lv_style_init(&SensitivityContainerStyle); + lv_style_set_radius(&SensitivityContainerStyle,LV_STATE_DEFAULT,0); + lv_style_set_border_width(&SensitivityContainerStyle, LV_STATE_DEFAULT, 3); + STYLE_COLOR_PROP(0x23, 0x0f, 0x0f, 0x10) ; lv_style_set_bg_color(&SensitivityContainerStyle, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x23, 0x0f, 0x0f, 0x10) ; lv_style_set_bg_grad_color(&SensitivityContainerStyle, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_border_color(&SensitivityContainerStyle, LV_STATE_DEFAULT, color); + SensitivityContainer = lv_cont_create(obj, NULL); + lv_obj_set_hidden(SensitivityContainer, false); + lv_obj_set_click(SensitivityContainer, true); + lv_obj_set_drag(SensitivityContainer, false); + lv_obj_set_pos(SensitivityContainer, 279, 45); + lv_obj_set_size(SensitivityContainer, 30, 30); + lv_obj_add_style(SensitivityContainer, 0, &SensitivityContainerStyle); + SensitivityTitleLabel = lv_label_create(obj, NULL); lv_obj_set_pos(SensitivityTitleLabel, 10, 50); lv_obj_set_size(SensitivityTitleLabel, 200, 24); - lv_obj_add_style(SensitivityTitleLabel, 0, &style); + lv_obj_add_style(SensitivityTitleLabel, 0, &gStyleLabel0); lv_obj_set_state(SensitivityTitleLabel, LV_STATE_DEFAULT); lv_label_set_text(SensitivityTitleLabel, "Sensitivity"); - STYLE_COLOR_PROP(0xd, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&style, LV_STATE_DEFAULT, color); - lv_style_set_border_width(&style, LV_STATE_DEFAULT, 3); - sprintf(result, "%d", gPirSensitivity); SensitivityValueLabel = lv_label_create(obj, NULL); - lv_obj_set_pos(SensitivityValueLabel, 279, 45); + lv_obj_set_pos(SensitivityValueLabel, 288, 49); lv_obj_set_size(SensitivityValueLabel, 30, 30); - lv_obj_add_style(SensitivityValueLabel, 0, &style); + lv_obj_add_style(SensitivityValueLabel, 0, &gStyleLabel0); lv_obj_set_state(SensitivityValueLabel, LV_STATE_DEFAULT); lv_label_set_text(SensitivityValueLabel, result); } @@ -385,6 +441,10 @@ void hidde_Sensitivity_page(void) { lv_obj_del(SensitivityValueLabel); } + if(SensitivityContainer) + { + lv_obj_del(SensitivityContainer); + } } void Option_Sensitivity_Key(lv_obj_t* obj, uint32_t key) @@ -397,32 +457,27 @@ void Option_Sensitivity_Key(lv_obj_t* obj, uint32_t key) char result[2]; UIMenuStoreInfo *puiPara = sf_ui_para_get(); - printf("key:%d\n",key); + printf("[%s]key:%d\n", __FUNCTION__, key); switch(key) { case LV_USER_KEY_NEXT: - printf("\033[33m[Option_Sensitivity_Key]s\033[0m\n"); gPirSensitivity = (gPirSensitivity + 9) % 10; puiPara->PirSwitch = gPirSensitivity ? 1 : 0; sprintf(result, "%d", gPirSensitivity); lv_label_set_text(SensitivityValueLabel, result); break; case LV_USER_KEY_PREV: - printf("\033[33m[Option_Sensitivity_Key]w\033[0m\n"); gPirSensitivity = (gPirSensitivity + 1) % 10; puiPara->PirSwitch = gPirSensitivity ? 1 : 0; sprintf(result, "%d", gPirSensitivity); lv_label_set_text(SensitivityValueLabel, result); break; case LV_USER_KEY_LEFT: - printf("\033[33m[Option_Sensitivity_Key]a\033[0m\n"); break; case LV_USER_KEY_RIGHT: - printf("\033[33m[Option_Sensitivity_Key]d\033[0m\n"); break; case LV_KEY_ENTER: - printf("\033[33m[Option_Sensitivity_Key]SELECT\033[0m\n"); sf_set_pir_sensitivity(gPirSensitivity); lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0)); hidde_Sensitivity_page(); From 3ca10087ad33c12c2360fbc6e6728431df9b5e2a Mon Sep 17 00:00:00 2001 From: zyj Date: Thu, 9 Nov 2023 12:39:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=8C=E5=96=84Operating=20Time=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=8F=8AUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowMenuCommonItem/MenuGeneral.c | 170 +++++++++++++++--- .../UIFlowMenuCommonItem/MenuGeneral.h | 1 + .../UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c | 1 - .../UIFlowMenuCommonOptionEventCallback.c | 11 +- 4 files changed, 155 insertions(+), 28 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c index 90084e193..597781679 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c @@ -7,6 +7,7 @@ #include "sf_systemMng.h" // #include "sf_commu_mcu_reg.h" #include "sf_common.h" +#include TMDEF_BEGIN_OPTIONS(CAMERA_MODE) TMDEF_OPTION_TEXT_S(CAMERA_MODE_PHOTO, TM_OPTION_ENABLE) @@ -168,7 +169,16 @@ int General_MenuCallback(UINT32 uiMessage, UINT32 uiParam) } case IDM_OPERATING_TIME: { - puiPara->WorkTime1Switch = uwOption == 0 ? SF_OFF : SF_ON; + SF_ON_OFF tmpSelected = (uwOption == 0) ? SF_OFF : SF_ON; + if(tmpSelected != puiPara->WorkTime1Switch) + { + puiPara->WorkTime[0].StartTime.Hour = 0; + puiPara->WorkTime[0].StartTime.Min = 0; + puiPara->WorkTime[0].StopTime.Hour = 0; + puiPara->WorkTime[0].StopTime.Min = 0; + puiPara->WorkTime1Switch = tmpSelected; + } + // puiPara->WorkTime1Switch = uwOption == 0 ? SF_OFF : SF_ON; break; } case IDM_FORMAT_SD: @@ -652,6 +662,8 @@ void Option_Delay_Key(lv_obj_t* obj, uint32_t key) // -------------------------------------------------------------------------- static int OperatingTimeIndex = 0; static lv_obj_t* OperatingTimeMatrixObj = NULL; +static lv_obj_t* OperatingTimeImage = NULL; +static lv_obj_t* OperatingTimeLabel = NULL; static char OperatingTimeHHBuf1[3] = "00"; static char OperatingTimeMMBuf1[3] = "00"; static char OperatingTimeHHBuf2[3] = "00"; @@ -670,31 +682,37 @@ static const char* OperatingTimeMap[8] = static void update_Operating_Time_msg(lv_obj_t* obj) { - UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if(OperatingTimeMatrixObj == NULL || OperatingTimeImage == NULL) + { + DBG_ERR("Password component is not initialized"); + return; + } + UIMenuStoreInfo *puiPara = sf_ui_para_get(); snprintf(OperatingTimeHHBuf1, 3, "%02d", puiPara->WorkTime[0].StartTime.Hour); snprintf(OperatingTimeMMBuf1, 3, "%02d", puiPara->WorkTime[0].StartTime.Min); snprintf(OperatingTimeHHBuf2, 3, "%02d", puiPara->WorkTime[0].StopTime.Hour); snprintf(OperatingTimeMMBuf2, 3, "%02d", puiPara->WorkTime[0].StopTime.Min); + lv_btnmatrix_set_map(OperatingTimeMatrixObj, OperatingTimeMap); lv_btnmatrix_set_focused_btn(OperatingTimeMatrixObj, OperatingTimeIndex); - lv_btnmatrix_set_map(OperatingTimeMatrixObj, OperatingTimeMap); + + lv_obj_set_x(OperatingTimeImage, (72 + ((32 + 16) / 2) * OperatingTimeIndex)); } void show_Operating_Time_page(lv_obj_t* obj) { + if(OperatingTimeMatrixObj != NULL || OperatingTimeImage != NULL || OperatingTimeLabel != NULL) + { + DBG_ERR("Password component is initialized"); + return; + } + OperatingTimeIndex = 0; init_Matrix_style(); UIMenuStoreInfo *puiPara = sf_ui_para_get(); - // if(!puiPara->WorkTime1Switch) - { - puiPara->WorkTime[0].StartTime.Hour = 0; - puiPara->WorkTime[0].StartTime.Min = 0; - puiPara->WorkTime[0].StopTime.Hour = 0; - puiPara->WorkTime[0].StopTime.Min = 0; - } snprintf(OperatingTimeHHBuf1, 3, "%02d", puiPara->WorkTime[0].StartTime.Hour); snprintf(OperatingTimeMMBuf1, 3, "%02d", puiPara->WorkTime[0].StartTime.Min); snprintf(OperatingTimeHHBuf2, 3, "%02d", puiPara->WorkTime[0].StopTime.Hour); @@ -704,41 +722,147 @@ void show_Operating_Time_page(lv_obj_t* obj) lv_obj_set_hidden(OperatingTimeMatrixObj, false); lv_obj_set_click(OperatingTimeMatrixObj, true); lv_obj_set_drag(OperatingTimeMatrixObj, false); - lv_obj_set_pos(OperatingTimeMatrixObj, 65, 58); - lv_obj_set_size(OperatingTimeMatrixObj, 190, 140); + lv_obj_set_pos(OperatingTimeMatrixObj, 72, 108); + lv_obj_set_size(OperatingTimeMatrixObj, 176, 24); lv_btnmatrix_set_map(OperatingTimeMatrixObj, OperatingTimeMap); lv_btnmatrix_set_one_check(OperatingTimeMatrixObj, true); lv_btnmatrix_set_align(OperatingTimeMatrixObj, LV_LABEL_ALIGN_CENTER); lv_btnmatrix_set_focused_btn(OperatingTimeMatrixObj,0); lv_btnmatrix_set_one_check(OperatingTimeMatrixObj, false); + lv_btnmatrix_set_btn_width(OperatingTimeMatrixObj, 0, 2); + lv_btnmatrix_set_btn_width(OperatingTimeMatrixObj, 2, 2); + lv_btnmatrix_set_btn_width(OperatingTimeMatrixObj, 4, 2); + lv_btnmatrix_set_btn_width(OperatingTimeMatrixObj, 6, 2); lv_obj_add_style(OperatingTimeMatrixObj, 0, &gMatrixStylebg); lv_obj_add_style(OperatingTimeMatrixObj, 1, &gMatrixStylebtn); + + OperatingTimeImage = lv_img_create(obj, NULL); + lv_obj_set_hidden(OperatingTimeImage, false); + lv_obj_set_click(OperatingTimeImage, false); + lv_obj_set_drag(OperatingTimeImage, false); + lv_obj_set_pos(OperatingTimeImage, 72, 78); + lv_obj_set_size(OperatingTimeImage, 32, 88); + lv_img_set_src(OperatingTimeImage, &sf_pwd_down_up); + + OperatingTimeLabel = lv_label_create(obj, NULL); + lv_label_set_text(OperatingTimeLabel, "HH : MM HH : MM"); + lv_label_set_align(OperatingTimeLabel, LV_LABEL_ALIGN_CENTER); + lv_obj_set_pos(OperatingTimeLabel, 76, 155); + lv_obj_set_size(OperatingTimeLabel, 176, 21); + lv_obj_add_style(OperatingTimeLabel, 0, &gStyleLabel0); } void hidde_Operating_Time_page(void) { + printf("[%s]\n", __FUNCTION__); + OperatingTimeIndex = 0; if(OperatingTimeMatrixObj) { lv_obj_del(OperatingTimeMatrixObj); + OperatingTimeMatrixObj = NULL; + } + if(OperatingTimeImage) + { + lv_obj_del(OperatingTimeImage); + OperatingTimeImage = NULL; + } + if(OperatingTimeLabel) + { + lv_obj_del(OperatingTimeLabel); + OperatingTimeLabel = NULL; } } -void Option_Operating_Time_Key(lv_obj_t* obj, uint32_t key) +void Option_Operating_Time_Key_Long_Press(lv_obj_t* obj, uint32_t key) { - if(OperatingTimeMatrixObj == NULL) - { - printf("OperatingTimeMatrixObj is NULL"); - return; - } + printf("[%s]key:%d\n", __FUNCTION__, key); + + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + + switch(key) + { + case LV_USER_KEY_NEXT: + if(OperatingTimeIndex == 0) + { + if(puiPara->WorkTime[0].StartTime.Hour > 0 && puiPara->WorkTime[0].StartTime.Hour <= 23) + puiPara->WorkTime[0].StartTime.Hour--; + else + puiPara->WorkTime[0].StartTime.Hour = 23; + } + else if(OperatingTimeIndex == 2) + { + if(puiPara->WorkTime[0].StartTime.Min > 0 && puiPara->WorkTime[0].StartTime.Min <= 59) + puiPara->WorkTime[0].StartTime.Min--; + else + puiPara->WorkTime[0].StartTime.Min = 59; + } + else if(OperatingTimeIndex == 4) + { + if(puiPara->WorkTime[0].StopTime.Hour > 0 && puiPara->WorkTime[0].StopTime.Hour <= 23) + puiPara->WorkTime[0].StopTime.Hour--; + else + puiPara->WorkTime[0].StopTime.Hour = 23; + } + else if(OperatingTimeIndex == 6) + { + if(puiPara->WorkTime[0].StopTime.Min > 0 && puiPara->WorkTime[0].StopTime.Min <= 59) + puiPara->WorkTime[0].StopTime.Min--; + else + puiPara->WorkTime[0].StopTime.Min = 59; + } + update_Operating_Time_msg(obj); + break; + case LV_USER_KEY_PREV: + if(OperatingTimeIndex == 0) + { + if(puiPara->WorkTime[0].StartTime.Hour >= 23) + puiPara->WorkTime[0].StartTime.Hour = 0; + else + puiPara->WorkTime[0].StartTime.Hour++; + } + else if(OperatingTimeIndex == 2) + { + if(puiPara->WorkTime[0].StartTime.Min >= 59) + puiPara->WorkTime[0].StartTime.Min = 0; + else + puiPara->WorkTime[0].StartTime.Min++; + } + else if(OperatingTimeIndex == 4) + { + if(puiPara->WorkTime[0].StopTime.Hour >= 23) + puiPara->WorkTime[0].StopTime.Hour = 0; + else + puiPara->WorkTime[0].StopTime.Hour++; + } + else if(OperatingTimeIndex == 6) + { + if(puiPara->WorkTime[0].StopTime.Min >= 59) + puiPara->WorkTime[0].StopTime.Min = 0; + else + puiPara->WorkTime[0].StopTime.Min++; + } + update_Operating_Time_msg(obj); + break; + case LV_USER_KEY_LEFT: + break; + case LV_USER_KEY_RIGHT: + break; + case LV_KEY_ENTER: + break; + default: + break; + } +} + +void Option_Operating_Time_Key(lv_obj_t* obj, uint32_t key) +{ + printf("[%s]key:%d\n", __FUNCTION__, key); - // 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_Operating_Time_Key]s\033[0m\n"); if(OperatingTimeIndex == 0) { if(puiPara->WorkTime[0].StartTime.Hour > 0 && puiPara->WorkTime[0].StartTime.Hour <= 23) @@ -770,7 +894,6 @@ void Option_Operating_Time_Key(lv_obj_t* obj, uint32_t key) update_Operating_Time_msg(obj); break; case LV_USER_KEY_PREV: - printf("\033[33m[Option_Operating_Time_Key]w\033[0m\n"); if(OperatingTimeIndex == 0) { if(puiPara->WorkTime[0].StartTime.Hour >= 23) @@ -802,17 +925,14 @@ void Option_Operating_Time_Key(lv_obj_t* obj, uint32_t key) update_Operating_Time_msg(obj); break; case LV_USER_KEY_LEFT: - printf("\033[33m[Option_Operating_Time_Key]a\033[0m\n"); OperatingTimeIndex = (OperatingTimeIndex - 2 + 8) % 8; update_Operating_Time_msg(obj); break; case LV_USER_KEY_RIGHT: - printf("\033[33m[Option_Operating_Time_Key]d\033[0m\n"); OperatingTimeIndex = (OperatingTimeIndex + 2) % 8; update_Operating_Time_msg(obj); break; case LV_KEY_ENTER: - printf("\033[33m[Option_Operating_Time_Key]SELECT\033[0m\n"); puiPara->WorkTime1Switch = 1; lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0)); hidde_Operating_Time_page(); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h index b5e9dddba..cb4e59d21 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h @@ -23,6 +23,7 @@ extern void hidde_DateTime_page(void); extern void Option_Sensitivity_Key(lv_obj_t* obj, uint32_t key); extern void Option_Delay_Key(lv_obj_t* obj, uint32_t key); extern void Option_Operating_Time_Key(lv_obj_t* obj, uint32_t key); +extern void Option_Operating_Time_Key_Long_Press(lv_obj_t* obj, uint32_t key); extern void Option_DateTime_Key(lv_obj_t* obj, uint32_t key); extern unsigned int get_dig_pir_level(void); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c index f9b280d77..cf3c24ac4 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c @@ -1034,7 +1034,6 @@ void show_Camera_Info_page(lv_obj_t* obj) static lv_style_t LabelStyle = {0}; lv_style_init(&LabelStyle); lv_style_copy(&LabelStyle, &gStyleLabel0); - lv_style_set_text_font(&LabelStyle,LV_STATE_DEFAULT,&sf_ui_text_medium_18_8bpp); lv_style_set_text_line_space(&LabelStyle, LV_STATE_DEFAULT, -2); CameraInfolabel = lv_label_create(obj, NULL); lv_label_set_text(CameraInfolabel, ""); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c index 00706bc9b..63ce519cd 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c @@ -847,7 +847,8 @@ void UIFlowMenuCommonOptionEventCallback(lv_obj_t* obj, lv_event_t event) { case IDM_PASSWORD: KeyPressingTimeMs += LONG_PRESS_INTERVAL; - Option_Password_Key_Long_Press(obj, *key); + if(KeyPressingTimeMs > 1 * 1000) + Option_Password_Key_Long_Press(obj, *key); break; case IDM_CAMERA_INFO: KeyPressingTimeMs += LONG_PRESS_INTERVAL; @@ -856,7 +857,13 @@ void UIFlowMenuCommonOptionEventCallback(lv_obj_t* obj, lv_event_t event) break; case IDM_CAMERA_NAME: KeyPressingTimeMs += LONG_PRESS_INTERVAL; - Option_Camera_Name_Key_Long_Press(obj, *key); + if(KeyPressingTimeMs > 1 * 1000) + Option_Camera_Name_Key_Long_Press(obj, *key); + break; + case IDM_OPERATING_TIME: + KeyPressingTimeMs += LONG_PRESS_INTERVAL; + if(KeyPressingTimeMs > 1 * 1000) + Option_Operating_Time_Key_Long_Press(obj, *key); break; default: break; From 5c14360b7a3c228537248b92a5aef292af0316b1 Mon Sep 17 00:00:00 2001 From: zyj Date: Thu, 9 Nov 2023 14:10:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=8C=E5=96=84Delay=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=8AUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowMenuCommonItem/MenuGeneral.c | 148 +++++++++++++++--- .../UIFlowMenuCommonItem/MenuGeneral.h | 1 + .../UIFlowMenuCommonOptionEventCallback.c | 5 + 3 files changed, 130 insertions(+), 24 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c index 597781679..3fb8e8d05 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.c @@ -503,6 +503,8 @@ void Option_Sensitivity_Key(lv_obj_t* obj, uint32_t key) // -------------------------------------------------------------------------- static int DelayIndex = 0; static lv_obj_t* DelayMatrixObj = NULL; +static lv_obj_t* DelayImage = NULL; +static lv_obj_t* DelayLabel = NULL; static char DelayHHBuf[3] = "00"; static char DelayMMBuf[3] = "00"; static char DelaySSBuf[3] = "00"; @@ -518,29 +520,36 @@ static const char* DelayMap[6] = static void update_Delay_msg(lv_obj_t* obj) { - UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if(DelayMatrixObj == NULL || DelayImage == NULL) + { + DBG_ERR("Delay component is not initialized"); + return; + } + 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_map(DelayMatrixObj, DelayMap); lv_btnmatrix_set_focused_btn(DelayMatrixObj, DelayIndex); - lv_btnmatrix_set_map(DelayMatrixObj, DelayMap); + + lv_obj_set_x(DelayImage, (96 + ((32 + 16) / 2) * DelayIndex)); } void show_Delay_page(lv_obj_t* obj) { + if(DelayMatrixObj != NULL || DelayImage != NULL || DelayLabel != NULL) + { + DBG_ERR("Operating Time component is initialized"); + return; + } + DelayIndex = 0; init_Matrix_style(); UIMenuStoreInfo *puiPara = sf_ui_para_get(); - // if(!puiPara->PirDelaySwitch) - // { - // puiPara->PirDelayTime.Hour = 0; - // puiPara->PirDelayTime.Min = 0; - // puiPara->PirDelayTime.Sec = 30; - // } snprintf(DelayHHBuf, 3, "%02d", puiPara->PirDelayTime.Hour); snprintf(DelayMMBuf, 3, "%02d", puiPara->PirDelayTime.Min); snprintf(DelaySSBuf, 3, "%02d", puiPara->PirDelayTime.Sec); @@ -549,41 +558,65 @@ void show_Delay_page(lv_obj_t* obj) 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_obj_set_pos(DelayMatrixObj, 96, 108); + lv_obj_set_size(DelayMatrixObj, 128, 24); 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_btnmatrix_set_btn_width(DelayMatrixObj, 0, 2); + lv_btnmatrix_set_btn_width(DelayMatrixObj, 2, 2); + lv_btnmatrix_set_btn_width(DelayMatrixObj, 4, 2); lv_obj_add_style(DelayMatrixObj, 0, &gMatrixStylebg); lv_obj_add_style(DelayMatrixObj, 1, &gMatrixStylebtn); + + DelayImage = lv_img_create(obj, NULL); + lv_obj_set_hidden(DelayImage, false); + lv_obj_set_click(DelayImage, false); + lv_obj_set_drag(DelayImage, false); + lv_obj_set_pos(DelayImage, 96, 78); + lv_obj_set_size(DelayImage, 32, 88); + lv_img_set_src(DelayImage, &sf_pwd_down_up); + + DelayLabel = lv_label_create(obj, NULL); + lv_label_set_text(DelayLabel, "HH : MM : SS"); + lv_label_set_align(DelayLabel, LV_LABEL_ALIGN_CENTER); + lv_obj_set_pos(DelayLabel, 100, 155); + lv_obj_set_size(DelayLabel, 128, 21); + lv_obj_add_style(DelayLabel, 0, &gStyleLabel0); } void hidde_Delay_page(void) { + printf("[%s]\n", __FUNCTION__); + DelayIndex = 0; if(DelayMatrixObj) { lv_obj_del(DelayMatrixObj); + DelayMatrixObj = NULL; + } + if(DelayImage) + { + lv_obj_del(DelayImage); + DelayImage = NULL; + } + if(DelayLabel) + { + lv_obj_del(DelayLabel); + DelayLabel = NULL; } } void Option_Delay_Key(lv_obj_t* obj, uint32_t key) { - if(DelayMatrixObj == NULL) - { - printf("DelayMatrixObj is NULL"); - return; - } + printf("[%s]key:%d\n", __FUNCTION__, key); - // 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) @@ -610,7 +643,6 @@ void Option_Delay_Key(lv_obj_t* obj, uint32_t key) 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) @@ -637,17 +669,14 @@ void Option_Delay_Key(lv_obj_t* obj, uint32_t key) 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(); @@ -657,6 +686,77 @@ void Option_Delay_Key(lv_obj_t* obj, uint32_t key) } } +void Option_Delay_Key_Long_Press(lv_obj_t* obj, uint32_t key) +{ + printf("[%s]key:%d\n", __FUNCTION__, key); + + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + + switch(key) + { + case LV_USER_KEY_NEXT: + 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: + 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: + break; + case LV_USER_KEY_RIGHT: + break; + case LV_KEY_ENTER: + break; + default: + break; + } +} + // -------------------------------------------------------------------------- // Operating Time // -------------------------------------------------------------------------- @@ -684,7 +784,7 @@ static void update_Operating_Time_msg(lv_obj_t* obj) { if(OperatingTimeMatrixObj == NULL || OperatingTimeImage == NULL) { - DBG_ERR("Password component is not initialized"); + DBG_ERR("Operating Time component is not initialized"); return; } @@ -704,7 +804,7 @@ void show_Operating_Time_page(lv_obj_t* obj) { if(OperatingTimeMatrixObj != NULL || OperatingTimeImage != NULL || OperatingTimeLabel != NULL) { - DBG_ERR("Password component is initialized"); + DBG_ERR("Operating Time component is initialized"); return; } diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h index cb4e59d21..a68e147b4 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuGeneral.h @@ -22,6 +22,7 @@ extern void hidde_DateTime_page(void); extern void Option_Sensitivity_Key(lv_obj_t* obj, uint32_t key); extern void Option_Delay_Key(lv_obj_t* obj, uint32_t key); +extern void Option_Delay_Key_Long_Press(lv_obj_t* obj, uint32_t key); extern void Option_Operating_Time_Key(lv_obj_t* obj, uint32_t key); extern void Option_Operating_Time_Key_Long_Press(lv_obj_t* obj, uint32_t key); extern void Option_DateTime_Key(lv_obj_t* obj, uint32_t key); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c index 63ce519cd..3b503c6f7 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c @@ -860,6 +860,11 @@ void UIFlowMenuCommonOptionEventCallback(lv_obj_t* obj, lv_event_t event) if(KeyPressingTimeMs > 1 * 1000) Option_Camera_Name_Key_Long_Press(obj, *key); break; + case IDM_DELAY: + KeyPressingTimeMs += LONG_PRESS_INTERVAL; + if(KeyPressingTimeMs > 1 * 1000) + Option_Delay_Key_Long_Press(obj, *key); + break; case IDM_OPERATING_TIME: KeyPressingTimeMs += LONG_PRESS_INTERVAL; if(KeyPressingTimeMs > 1 * 1000)