From ca28b0882b36d0d85390eccb3ba1bab7e7fe81bb Mon Sep 17 00:00:00 2001 From: xiehongyan Date: Fri, 19 Jan 2024 18:54:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UIFlowLVGL.UIFlowPhoto.lvglscr | 2 +- .../UIFlowLVGL.UIFlowPlay.lvglscr | 17 ++++- .../UIFlowLVGL.UIFlowWrnMsg.lvglscr | 2 +- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c | 14 ++-- .../UIFlowLVGL/UIFlowPlay/UIFlowPlay.c | 73 ++++++++++--------- .../UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c | 2 +- 6 files changed, 63 insertions(+), 47 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr index 2970c3225..c0867462b 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPhoto.lvglscr @@ -83,7 +83,7 @@ "styles": [ { "Image": { - "image_recolor": "0x3b3e42" + "image_recolor": "0x3c3c3c" }, "part": 0, "state": 0 diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPlay.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPlay.lvglscr index 178f54023..c648de673 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPlay.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowPlay.lvglscr @@ -2047,10 +2047,11 @@ "styles": [ { "Background": { - "bg_color": "0xffffff" + "bg_color": "0xe7e7e7" }, "Outline": { - "outline_color": "0x31eea5" + "outline_color": "0x95c93d", + "outline_width": 0 }, "part": 0, "state": 0 @@ -2064,6 +2065,9 @@ "state": 2 }, { + "Outline": { + "outline_color": "0x44d1b6" + }, "part": 0, "state": 3 }, @@ -2080,6 +2084,11 @@ "state": 6 }, { + "Background": { + "bg_color": "0x95c93d", + "bg_grad_color": "0x95c93d", + "bg_grad_dir": 2 + }, "part": 1, "state": 0 }, @@ -2108,6 +2117,10 @@ "state": 6 }, { + "Background": { + "bg_color": "0x95c93d", + "bg_opa": 0 + }, "part": 2, "state": 0 }, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowWrnMsg.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowWrnMsg.lvglscr index b408713ed..0e9daa3dc 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowWrnMsg.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowWrnMsg.lvglscr @@ -195,7 +195,7 @@ "border_width": 0 }, "Mix": { - "radius": 6 + "radius": 12 }, "Outline": { "outline_color": "0x551f57" diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c index 3b73c441c..764c77df9 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c @@ -161,37 +161,37 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_battery_0_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_battery_0_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_battery_0_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_battery_0_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_battery_0_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_battery_0_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_battery_0_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_battery_0_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_battery_0_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_battery_0_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_battery_0_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_battery_0_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_battery_0_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_battery_0_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_battery_0_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_battery_0_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_battery_0_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_battery_0_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_battery_0_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_battery_0_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_battery_0_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_battery_0_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_battery_0_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_battery_0_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_battery_0_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_battery_0_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_battery_0_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_battery_0_s0, LV_STATE_DISABLED, color); lv_obj_t *image_battery_0 = lv_img_create(container_photo, NULL); lv_obj_set_hidden(image_battery_0, true); lv_obj_set_click(image_battery_0, false); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c index e939bf5d2..6bc72332d 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlay.c @@ -1828,72 +1828,75 @@ lv_obj_t* UIFlowPlay_create(){ static lv_style_t slider_1_s0; lv_style_init(&slider_1_s0); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xee, 0xe7, 0xe7, 0xe7) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0xb8, 0x31, 0xee, 0xa5) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_DEFAULT, color); + lv_style_set_outline_width(&slider_1_s0,LV_STATE_DEFAULT,0); + STYLE_COLOR_PROP(0xee, 0xe7, 0xe7, 0xe7) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xb8, 0x31, 0xee, 0xa5) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xee, 0xe7, 0xe7, 0xe7) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xb8, 0x31, 0xee, 0xa5) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xee, 0xe7, 0xe7, 0xe7) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xb8, 0x31, 0xee, 0xa5) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x13, 0x44, 0xd1, 0xb6) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xee, 0xe7, 0xe7, 0xe7) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xb8, 0x31, 0xee, 0xa5) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xee, 0xe7, 0xe7, 0xe7) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xb8, 0x31, 0xee, 0xa5) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xee, 0xe7, 0xe7, 0xe7) ; lv_style_set_bg_color(&slider_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xb8, 0x31, 0xee, 0xa5) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_outline_color(&slider_1_s0, LV_STATE_DISABLED, color); static lv_style_t slider_1_s1; lv_style_init(&slider_1_s1); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_DEFAULT, color); + lv_style_set_bg_grad_dir(&slider_1_s1,LV_STATE_DEFAULT,2); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s1, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s1, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s1, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s1, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s1, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s1, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s1, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_grad_color(&slider_1_s1, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&slider_1_s1, LV_STATE_DISABLED, color); static lv_style_t slider_1_s2; lv_style_init(&slider_1_s2); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_DEFAULT, color); + lv_style_set_bg_opa(&slider_1_s2,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s2, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s2, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s2, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s2, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s2, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s2, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x22, 0x95, 0xc9, 0x3d) ; lv_style_set_bg_color(&slider_1_s2, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&slider_1_s2, LV_STATE_DISABLED, color); lv_obj_t *slider_1 = lv_slider_create(container_play, NULL); lv_obj_set_hidden(slider_1, false); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c index fe4940d32..afd979142 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c @@ -116,7 +116,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ static lv_style_t button_msg_bg_s0; lv_style_init(&button_msg_bg_s0); - lv_style_set_radius(&button_msg_bg_s0,LV_STATE_DEFAULT,6); + lv_style_set_radius(&button_msg_bg_s0,LV_STATE_DEFAULT,12); STYLE_COLOR_PROP(0x24, 0x6c, 0x6c, 0x6c) ; lv_style_set_bg_color(&button_msg_bg_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_msg_bg_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57) ; lv_style_set_border_color(&button_msg_bg_s0, LV_STATE_DEFAULT, color);