From 54871795a2e5039c7cdadc0f86c00ecab1902491 Mon Sep 17 00:00:00 2001 From: xiaojiazhu Date: Thu, 23 Nov 2023 19:37:26 +0800 Subject: [PATCH] Fixed bug about confirm screen. --- .../LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr | 5 +---- .../UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c | 3 +-- .../UIFlowMenuCommonConfirmEventCallback.c | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr index 89ccff09e..ef0fa19a0 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonConfirm.lvglscr @@ -211,10 +211,7 @@ }, { "Background": { - "bg_color": "0xc7fbe7" - }, - "Outline": { - "outline_width": 2 + "bg_color": "0x95c93d" }, "Text": { "text_font": "SF-UI-Text-Medium 16 1bpp" diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c index f0273674d..e55dc2016 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c @@ -193,11 +193,10 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ lv_style_set_text_font(&message_box_1_s2,LV_STATE_HOVERED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s2, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s2, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xbd, 0xc7, 0xfb, 0xe7) ; lv_style_set_bg_color(&message_box_1_s2, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&message_box_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&message_box_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_border_color(&message_box_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x06, 0xff, 0xff, 0x00) ; lv_style_set_outline_color(&message_box_1_s2, LV_STATE_PRESSED, color); - lv_style_set_outline_width(&message_box_1_s2,LV_STATE_PRESSED,2); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&message_box_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&message_box_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&message_box_1_s2, LV_STATE_PRESSED, color); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c index ea85b89bc..c960761ca 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c @@ -112,11 +112,11 @@ static void init_style(void) lv_style_set_text_font(&gMsgBoxBtnStyle,LV_STATE_HOVERED,&sf_ui_text_bold_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&gMsgBoxBtnStyle, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&gMsgBoxBtnStyle, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xbd, 0xc7, 0xfb, 0xe7) ; lv_style_set_bg_color(&gMsgBoxBtnStyle, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x22, 0xc7, 0xfb, 0xe7) ; lv_style_set_bg_color(&gMsgBoxBtnStyle, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&gMsgBoxBtnStyle, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_border_color(&gMsgBoxBtnStyle, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x06, 0xff, 0xff, 0x00) ; lv_style_set_outline_color(&gMsgBoxBtnStyle, LV_STATE_PRESSED, color); - lv_style_set_outline_width(&gMsgBoxBtnStyle,LV_STATE_PRESSED,2); + // lv_style_set_outline_width(&gMsgBoxBtnStyle,LV_STATE_PRESSED,2); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&gMsgBoxBtnStyle, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&gMsgBoxBtnStyle, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&gMsgBoxBtnStyle, LV_STATE_PRESSED, color);