From b43e32fb3d7e817baa472f83de7afb1d338e6cd1 Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Tue, 24 Oct 2023 20:06:37 +0800 Subject: [PATCH] Merge code of ding. --- .../UIFlowLVGL.UIFlowMenuCommonItem.lvglscr | 67 +++--- .../UIFlowLVGL.UIFlowMenuCommonOption.lvglscr | 26 ++- .../UIFlowMenuCommonItem/MenuMovie.c | 4 +- .../UIFlowMenuCommonItem.c | 196 +++++++++--------- .../UIFlowMenuCommonItemEventCallback.c | 104 ++++++---- .../UIFlowMenuCommonOption.c | 17 +- .../UIFlowMenuCommonOptionEventCallback.c | 128 +++++++----- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c | 6 +- 8 files changed, 306 insertions(+), 242 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonItem.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonItem.lvglscr index f91a2df36..77ca482fb 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonItem.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonItem.lvglscr @@ -1,7 +1,7 @@ { "event callback": "UIFlowMenuCommonItemEventCallback", "name": "UIFlowMenuCommonItem", - "screen color": "0x800000", + "screen color": "0x551f57", "widgets": [ { "auto size": true, @@ -634,7 +634,7 @@ "X": 0, "Y": 0 }, - "source": "sf_module_fw_upgrade", + "source": "sf_video_length", "styles": [ { "Image": { @@ -936,7 +936,9 @@ { "Text": { "text_color": "0x6c6c6c", - "text_font": "montserrat 16 4bpp" + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x00b495", + "text_sel_color": "0x3c3c3c" }, "part": 0, "state": 0 @@ -977,7 +979,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 27, + "width": 32, "x": 78, "y": 0 }, @@ -1105,7 +1107,9 @@ { "Text": { "text_color": "0x6c6c6c", - "text_font": "montserrat 16 4bpp" + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x00b495", + "text_sel_color": "0x3c3c3c" }, "part": 0, "state": 0 @@ -1146,7 +1150,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 27, + "width": 32, "x": 78, "y": 0 }, @@ -1274,7 +1278,9 @@ { "Text": { "text_color": "0x6c6c6c", - "text_font": "montserrat 16 4bpp" + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x00b495", + "text_sel_color": "0x3c3c3c" }, "part": 0, "state": 0 @@ -1315,7 +1321,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 27, + "width": 32, "x": 78, "y": 0 }, @@ -1443,7 +1449,9 @@ { "Text": { "text_color": "0x6c6c6c", - "text_font": "montserrat 16 4bpp" + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x00b495", + "text_sel_color": "0x3c3c3c" }, "part": 0, "state": 0 @@ -1484,7 +1492,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 27, + "width": 32, "x": 78, "y": 0 }, @@ -1612,7 +1620,9 @@ { "Text": { "text_color": "0x6c6c6c", - "text_font": "montserrat 16 4bpp" + "text_font": "montserrat 16 4bpp", + "text_sel_bg_color": "0x00b495", + "text_sel_color": "0x3c3c3c" }, "part": 0, "state": 0 @@ -1653,7 +1663,7 @@ "event callback": "", "geometry": { "height": 40, - "width": 27, + "width": 32, "x": 78, "y": 0 }, @@ -1721,6 +1731,7 @@ "bg_opa": 0 }, "Border": { + "border_color": "0xdddddd", "border_opa": 0 }, "Mix": { @@ -1779,7 +1790,7 @@ "styles": [ { "Image": { - "image_recolor": "0x3b3e42" + "image_recolor": "0x3c3c3c" }, "part": 0, "state": 0 @@ -2213,9 +2224,9 @@ "source checked disabled": "default", "source checked pressed": "default", "source checked released": "default", - "source disabled": "default", - "source pressed": "sf_tab_select", - "source released": "sf_tab_release", + "source disabled": "sf_tab_release", + "source pressed": "sf_tab_release", + "source released": "sf_tab_select", "state": "Released", "styles": [ { @@ -2263,8 +2274,8 @@ "event callback": "", "font type": "Font_Type2", "geometry": { - "height": 24, - "width": 77, + "height": 26, + "width": 85, "x": 2, "y": 8 }, @@ -2337,9 +2348,9 @@ "source checked disabled": "default", "source checked pressed": "default", "source checked released": "default", - "source disabled": "default", - "source pressed": "sf_tab_select", - "source released": "sf_tab_release", + "source disabled": "sf_tab_release", + "source pressed": "sf_tab_release", + "source released": "sf_tab_select", "state": "Released", "styles": [ { @@ -2461,9 +2472,9 @@ "source checked disabled": "default", "source checked pressed": "default", "source checked released": "default", - "source disabled": "default", - "source pressed": "sf_tab_select", - "source released": "sf_tab_release", + "source disabled": "sf_tab_release", + "source pressed": "sf_tab_release", + "source released": "sf_tab_select", "state": "Released", "styles": [ { @@ -2576,7 +2587,7 @@ "height": 40, "width": 80, "x": 240, - "y": -1 + "y": 0 }, "hidden": false, "layout": "Off", @@ -2585,9 +2596,9 @@ "source checked disabled": "default", "source checked pressed": "default", "source checked released": "default", - "source disabled": "default", - "source pressed": "sf_tab_select", - "source released": "sf_tab_release", + "source disabled": "sf_tab_release", + "source pressed": "sf_tab_release", + "source released": "sf_tab_select", "state": "Released", "styles": [ { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonOption.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonOption.lvglscr index bb7ffda8d..102e7b669 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonOption.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMenuCommonOption.lvglscr @@ -1,7 +1,7 @@ { "event callback": "UIFlowMenuCommonOptionEventCallback", "name": "UIFlowMenuCommonOption", - "screen color": "0x800000", + "screen color": "0x551f57", "widgets": [ { "auto size": true, @@ -150,7 +150,7 @@ "source checked released": "default", "source disabled": "sf_menu_release", "source pressed": "sf_menu_release", - "source released": "sf_menu_select", + "source released": "sf_menu_option_select", "state": "Released", "styles": [ { @@ -225,6 +225,9 @@ "state": 1 }, { + "Text": { + "text_color": "0x000000" + }, "part": 0, "state": 2 }, @@ -323,7 +326,7 @@ "source checked released": "default", "source disabled": "sf_menu_release", "source pressed": "sf_menu_release", - "source released": "sf_menu_select", + "source released": "sf_menu_option_select", "state": "Released", "styles": [ { @@ -398,6 +401,9 @@ "state": 1 }, { + "Text": { + "text_color": "0x000000" + }, "part": 0, "state": 2 }, @@ -496,7 +502,7 @@ "source checked released": "default", "source disabled": "sf_menu_release", "source pressed": "sf_menu_release", - "source released": "sf_menu_select", + "source released": "sf_menu_option_select", "state": "Released", "styles": [ { @@ -571,6 +577,9 @@ "state": 1 }, { + "Text": { + "text_color": "0x000000" + }, "part": 0, "state": 2 }, @@ -669,7 +678,7 @@ "source checked released": "default", "source disabled": "sf_menu_release", "source pressed": "sf_menu_release", - "source released": "sf_menu_select", + "source released": "sf_menu_option_select", "state": "Released", "styles": [ { @@ -744,6 +753,9 @@ "state": 1 }, { + "Text": { + "text_color": "0x000000" + }, "part": 0, "state": 2 }, @@ -842,7 +854,7 @@ "source checked released": "default", "source disabled": "sf_menu_release", "source pressed": "sf_menu_release", - "source released": "sf_menu_select", + "source released": "sf_menu_option_select", "state": "Released", "styles": [ { @@ -1097,7 +1109,7 @@ "geometry": { "height": 40, "width": 320, - "x": 5, + "x": 0, "y": 0 }, "hidden": false, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c index efcc86267..2319bda4b 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuMovie.c @@ -145,6 +145,7 @@ TMDEF_OPTION_TEXT_S(MOVIE_DATEIMPRINT_OFF, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(MOVIE_DATEIMPRINT_ON, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() +#if 0 TMDEF_BEGIN_OPTIONS(MOVIE_RSC) TMDEF_OPTION_TEXT_S(MOVIE_RSC_OFF, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(MOVIE_RSC_ON, TM_OPTION_ENABLE) @@ -156,6 +157,7 @@ TMDEF_OPTION_TEXT_S(MOVIE_RSC_MED, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(MOVIE_RSC_HIGH, TM_OPTION_ENABLE) TMDEF_OPTION_TEXT_S(MOVIE_RSC_SUPER_HIGH, TM_OPTION_ENABLE) TMDEF_END_OPTIONS() +#endif TMDEF_BEGIN_OPTIONS(MOVIE_GSENSOR) TMDEF_OPTION_TEXT_S(MOVIE_GSENSOR_OFF, TM_OPTION_ENABLE) @@ -260,7 +262,7 @@ TMDEF_ITEM_TEXTID(EV) TMDEF_ITEM_TEXTID(MOVIE_MOTION_DET) TMDEF_ITEM_TEXTID(MOVIE_AUDIO) TMDEF_ITEM_TEXTID(MOVIE_DATEIMPRINT) -#if (MOVIE_EIS == ENABLE) +#if 0//(MOVIE_EIS == ENABLE) TMDEF_ITEM_TEXTID(MOVIE_RSC) TMDEF_ITEM_TEXTID(MOVIE_RSC_EFFECT) #endif diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c index aba1013d5..df869bad2 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItem.c @@ -61,7 +61,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_event_cb(parent, UIFlowMenuCommonItemEventCallback); lv_color_t color = {0}; - STYLE_COLOR_PROP(0x0a, 0x80, 0x00, 0x00); + STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57); _lv_obj_set_style_local_color(parent,0,LV_STYLE_BG_COLOR, color); if(color.full== LV_COLOR_TRANSP.full){ @@ -831,7 +831,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_drag(image_item4, false); lv_obj_set_pos(image_item4, 0, 0); lv_obj_set_size(image_item4, 48, 40); - lv_img_set_src(image_item4, &sf_module_fw_upgrade); + lv_img_set_src(image_item4, &sf_video_length); lv_obj_add_style(image_item4, 0, &image_item4_s0); image_item4_scr_uiflowmenucommonitem = image_item4; @@ -1046,44 +1046,44 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_DEFAULT, color); lv_style_set_text_font(&label_option_1_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_1_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_1_s0, LV_STATE_DISABLED, color); lv_obj_t *label_option_1 = lv_label_create(container_option_1, NULL); lv_obj_set_hidden(label_option_1, false); lv_obj_set_click(label_option_1, false); @@ -1194,44 +1194,44 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_2_s0, LV_STATE_DEFAULT, color); lv_style_set_text_font(&label_option_2_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_2_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_2_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_2_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_2_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_2_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_2_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_2_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_2_s0, LV_STATE_DISABLED, color); lv_obj_t *label_option_2 = lv_label_create(container_option_2, NULL); lv_obj_set_hidden(label_option_2, false); lv_obj_set_click(label_option_2, false); @@ -1342,44 +1342,44 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_3_s0, LV_STATE_DEFAULT, color); lv_style_set_text_font(&label_option_3_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_3_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_3_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_3_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_3_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_3_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_3_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_3_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_3_s0, LV_STATE_DISABLED, color); lv_obj_t *label_option_3 = lv_label_create(container_option_3, NULL); lv_obj_set_hidden(label_option_3, false); lv_obj_set_click(label_option_3, false); @@ -1490,44 +1490,44 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_4_s0, LV_STATE_DEFAULT, color); lv_style_set_text_font(&label_option_4_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_4_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_4_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_4_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_4_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_4_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_4_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_4_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_4_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_4_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_4_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_4_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_4_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_4_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_4_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_4_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_4_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_4_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_4_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_4_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_4_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_4_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_4_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_4_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_4_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_4_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_4_s0, LV_STATE_DISABLED, color); lv_obj_t *label_option_4 = lv_label_create(container_option_4, NULL); lv_obj_set_hidden(label_option_4, false); lv_obj_set_click(label_option_4, false); @@ -1600,26 +1600,26 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&container_option_5_s0, LV_STATE_DEFAULT, color); lv_style_set_bg_opa(&container_option_5_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_option_5_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0xe9, 0xd6, 0xdd, 0xe3) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_DEFAULT, color); lv_style_set_border_opa(&container_option_5_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&container_option_5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_option_5_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xe9, 0xd6, 0xdd, 0xe3) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&container_option_5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_option_5_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&container_option_5_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_option_5_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x13, 0x44, 0xd1, 0xb6) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&container_option_5_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_option_5_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xe9, 0xd6, 0xdd, 0xe3) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&container_option_5_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_option_5_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xe9, 0xd6, 0xdd, 0xe3) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&container_option_5_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&container_option_5_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xe9, 0xd6, 0xdd, 0xe3) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xe9, 0xdd, 0xdd, 0xdd) ; lv_style_set_border_color(&container_option_5_s0, LV_STATE_DISABLED, color); lv_obj_t *container_option_5 = lv_cont_create(container_main_menu, NULL); lv_obj_set_hidden(container_option_5, false); lv_obj_set_click(container_option_5, true); @@ -1638,44 +1638,44 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_5_s0, LV_STATE_DEFAULT, color); lv_style_set_text_font(&label_option_5_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_5_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_5_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_5_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_5_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_5_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_5_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_5_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_5_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_5_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_5_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_5_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_5_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_5_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_5_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option_5_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option_5_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option_5_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x8e, 0x6c, 0x6c, 0x6c) ; lv_style_set_text_color(&label_option_5_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option_5_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option_5_s0, LV_STATE_DISABLED, color); lv_obj_t *label_option_5 = lv_label_create(container_option_5, NULL); lv_obj_set_hidden(label_option_5, false); lv_obj_set_click(label_option_5, false); @@ -1748,37 +1748,37 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&image_option_01_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&image_option_01_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&image_option_01_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&image_option_01_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_image_recolor(&image_option_01_s0, LV_STATE_DISABLED, color); lv_obj_t *image_option_01 = lv_img_create(container_main_menu, NULL); lv_obj_set_hidden(image_option_01, true); lv_obj_set_click(image_option_01, false); @@ -2069,8 +2069,9 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_size(image_button_tab1, 80, 40); lv_imgbtn_set_state(image_button_tab1, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab1, false); - lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_RELEASED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_PRESSED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_RELEASED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_PRESSED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab1, LV_BTN_STATE_DISABLED, &sf_tab_release); lv_btn_set_layout(image_button_tab1, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab1, 0, &image_button_tab1_s0); @@ -2184,8 +2185,9 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_size(image_button_tab2, 80, 40); lv_imgbtn_set_state(image_button_tab2, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab2, false); - lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_RELEASED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_PRESSED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_RELEASED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_PRESSED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab2, LV_BTN_STATE_DISABLED, &sf_tab_release); lv_btn_set_layout(image_button_tab2, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab2, 0, &image_button_tab2_s0); @@ -2248,7 +2250,7 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_label_set_align(label_tab_2, LV_LABEL_ALIGN_CENTER); lv_label_set_long_mode(label_tab_2, LV_LABEL_LONG_CROP); lv_obj_set_pos(label_tab_2, 2, 8); - lv_obj_set_size(label_tab_2, 77, 24); + lv_obj_set_size(label_tab_2, 85, 26); lv_obj_add_style(label_tab_2, 0, &label_tab_2_s0); label_tab_2_scr_uiflowmenucommonitem = label_tab_2; @@ -2299,8 +2301,9 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_size(image_button_tab3, 80, 40); lv_imgbtn_set_state(image_button_tab3, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab3, false); - lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_RELEASED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_PRESSED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_RELEASED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_PRESSED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab3, LV_BTN_STATE_DISABLED, &sf_tab_release); lv_btn_set_layout(image_button_tab3, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab3, 0, &image_button_tab3_s0); @@ -2409,12 +2412,13 @@ lv_obj_t* UIFlowMenuCommonItem_create(){ lv_obj_set_hidden(image_button_tab4, false); lv_obj_set_click(image_button_tab4, true); lv_obj_set_drag(image_button_tab4, false); - lv_obj_set_pos(image_button_tab4, 240, -1); + lv_obj_set_pos(image_button_tab4, 240, 0); lv_obj_set_size(image_button_tab4, 80, 40); lv_imgbtn_set_state(image_button_tab4, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_tab4, false); - lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_RELEASED, &sf_tab_release); - lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_PRESSED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_RELEASED, &sf_tab_select); + lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_PRESSED, &sf_tab_release); + lv_imgbtn_set_src(image_button_tab4, LV_BTN_STATE_DISABLED, &sf_tab_release); lv_btn_set_layout(image_button_tab4, LV_LAYOUT_OFF); lv_obj_add_style(image_button_tab4, 0, &image_button_tab4_s0); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c index 4d6029011..2df5e2520 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c @@ -58,7 +58,7 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj) { TM_MENU* pMenu = TM_GetMenu(); TM_PAGE *pPage; - TM_ITEM *pItem; +// TM_ITEM *pItem; pPage = &pMenu->pPages[pMenu->SelPage]; // DBG_DUMP("\r\n %s pMenu Status= %d\r\n", __func__, pMenu->Status); @@ -67,22 +67,19 @@ static void LV_MenuItem_OnPrev(lv_obj_t* obj) if(pPage->SelItem == 0){ // DBG_WRN("already foucs on tab !"); DBG_DUMP("^Galready foucs on tab !"); - return; - }else if(pPage->SelItem < pPage->Count){ - CHKPNT; + //return; + pPage->SelItem = (pPage->Count - 1); + //}else if(pPage->SelItem < pPage->Count){ + //CHKPNT; pMenu->Status = TMS_ON_ITEM; LV_MenuCommonItem_UpdateContent(pMenu); - lv_plugin_menu_select_item(menu_item, 0); + lv_plugin_menu_select_item(menu_item, pPage->SelItem); } }else{ //if item = 0; up key foucs to tab if(pPage->SelItem == 0){ pMenu->Status = TMS_ON_TAB; - pItem = &pPage->pItems[0]; - lv_plugin_menu_set_item_string_id(menu_item, 0, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->TextId); - lv_plugin_menu_set_item_img_id(menu_item, 0, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); - lv_plugin_menu_set_item_hidden(menu_item, 0, false); -// pPage->SelItem = 255; + lv_plugin_menu_clear_selected_item(menu_item); return; } pPage->SelItem--; @@ -107,7 +104,9 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj) pPage->SelItem++; // DBG_DUMP("\r\n %s pPage->SelItem= %d\r\n", __func__, pMenu->Status); if(pPage->SelItem >= pPage->Count){ - pPage->SelItem = (pPage->Count - 1); + pPage->SelItem = 0; + LV_MenuCommonItem_UpdateContent(pMenu); + lv_plugin_menu_select_item(menu_item, pPage->SelItem); return; } LV_MenuCommonItem_UpdateContent(pMenu); @@ -119,7 +118,9 @@ static void LV_MenuItem_OnNext(lv_obj_t* obj) static void LV_MenuItem_OnUp(lv_obj_t* obj) { TM_MENU* pMenu = TM_GetMenu(); - + TM_PAGE *pPage; + + pPage = &pMenu->pPages[pMenu->SelPage]; if (pMenu->Status == TMS_ON_TAB) { printf("handle on tab.\n"); @@ -127,8 +128,10 @@ static void LV_MenuItem_OnUp(lv_obj_t* obj) lv_plugin_menu_select_prev_item(menu_tab); LV_MenuCommonItem_UpdateContent(pMenu); }else{ - printf("handle on item.\n"); - lv_plugin_scr_close(obj, NULL); + pPage->SelItem = 0; + pMenu->Status = TMS_ON_TAB; + lv_plugin_menu_clear_selected_item(menu_item); + //lv_plugin_scr_close(obj, NULL); } } @@ -235,6 +238,18 @@ static void LV_MenuItem_OnSelected(lv_obj_t* obj) return; } #endif + if((pItem->ItemId == IDM_CHECK_IN_PHOTO) || (pItem->ItemId == IDM_SD_LOOP) \ + || (pItem->ItemId == IDM_SD_LOOP)){ + //pItem = &pPage->pItems[pPage->SelItem]; + //SelOption = SysGetFlag(pItem->SysFlag); + //static int flag = 0; + SysSetFlag(pItem->SysFlag, !SysGetFlag(pItem->SysFlag)); + //flag = !flag; + //SysSetFlag(pItem->SysFlag, flag); + LV_MenuCommonItem_UpdateContent(pMenu); + CHKPNT; + return; + } //#NT#2016/09/20#Bob Huang -end if (pItem->Count != 0 && pItem->SysFlag != 0) // standard process { @@ -262,11 +277,8 @@ static void LV_MenuItem_OnSelected(lv_obj_t* obj) } } }else if(pMenu->Status == TMS_ON_TAB){ - pItem = &pPage->pItems[pPage->SelItem]; - lv_plugin_menu_set_item_string_id(menu_item, 0, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->TextId); -// lv_plugin_menu_set_item_img_id(menu_item, 0, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); - lv_plugin_menu_set_item_img_id(menu_item, 0, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, LV_PLUGIN_IMG_ID_SF_MENU_RELEASE); - lv_plugin_menu_set_item_hidden(menu_item, 0, false); + CHKPNT; //lv_plugin_menu_clear_selected_item(menu_item); + lv_plugin_scr_close(obj, NULL); } @@ -367,7 +379,7 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) BOOL u_hiddenitem = false; BOOL u_ItemSel = false; lv_plugin_res_id img_id = LV_PLUGIN_IMG_ID_ICON_REC_TRANSPAENT; - UIMenuStoreInfo *puiPara = sf_ui_para_get(); + // UIMenuStoreInfo *puiPara = sf_ui_para_get(); // UINT32 uiIcon[TAB_PAGE]; // 2 pages per menu // UINT32 uiText[TAB_PAGE]; // 2 pages per menu // UINT16 SelOption = 0; @@ -437,15 +449,9 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) // DBG_DUMP("\r\n %s for page = %d\r\n", __func__, pItem->TextId); // u_Item[i] = pPage->pItems[i]; // Sel_page = pPage->SelItem; - - - - if ((itemIndex == pPage->Count) && (i < PER_PAGE_NUM)) { -// if ((pPage->SelItem >= pPage->Count) && (i < PER_PAGE_NUM)) { - - CHKPNT; - lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->TextId); - lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); + if ((itemIndex >= pPage->Count) && (i < PER_PAGE_NUM)) { + lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, LV_PLUGIN_STRING_ID_STRID_NULL_); + lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, LV_PLUGIN_IMG_ID_ICON_REC_TRANSPAENT); lv_plugin_menu_set_item_hidden(menu_item, i, true); u_ItemSel = true; } else { @@ -466,27 +472,30 @@ static void LV_MenuCommonItem_UpdateContent(TM_MENU *pMenu) pOption = &pItem->pOptions[SysGetFlag(pItem->SysFlag)]; // DBG_DUMP("\r\n %s pOption TextId= %d\r\n", __func__, pOption->TextId); - // if(IDM_PASSWORD == pItem->ItemId - // || IDM_CAMERA_NAME == pItem->ItemId){ - if(0){ + if((pItem->ItemId == IDM_CHECK_IN_PHOTO) || (pItem->ItemId == IDM_SD_LOOP) \ + || (pItem->ItemId == IDM_GPS)){ static lv_plugin_res_id res[] = { LV_PLUGIN_IMG_ID_SF_OFF, LV_PLUGIN_IMG_ID_SF_ON, }; switch(pItem->ItemId){ - case IDM_MOVIE_WDR: - img_id = res[SysGetFlag(FL_MOVIE_WDR)]; + case IDM_CHECK_IN_PHOTO: + img_id = res[SysGetFlag(FL_CHECK_IN_PHOTO)]; break; - case IDM_PASSWORD: - // char settingValue = puiPara->PwdSwitch == SF_CAMID_OFF ? SF_CAMID_ON:SF_CAMID_OFF; - img_id = puiPara->PwdSwitch == SF_CAMID_OFF ? LV_PLUGIN_IMG_ID_SF_OFF:LV_PLUGIN_IMG_ID_SF_ON; + case IDM_SD_LOOP: + img_id = res[SysGetFlag(FL_SD_LOOP)]; break; + case IDM_GPS: + img_id = res[SysGetFlag(FL_GPS)]; + break; + default: img_id = LV_PLUGIN_IMG_ID_SF_OFF; DBG_ERR("NO_match_ItemID, add please!"); break; } - if(img_id == LV_PLUGIN_IMG_ID_ICON_REC_TRANSPAENT){ + // if(img_id == LV_PLUGIN_IMG_ID_ICON_REC_TRANSPAENT){ + if(1){ lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->TextId); lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pItem->IconId); lv_plugin_menu_set_item_hidden(menu_item, i, false); @@ -724,10 +733,15 @@ static void UIFlowMenuCommonItem_ChildScrClose(lv_obj_t* obj,const LV_USER_EVENT if(msg){ if(msg->event == NVTRET_ENTER_MENU){ TM_MENU* pMenu = TM_GetMenu(); -// UINT32 uiItem,uiOption; - + TM_PAGE *pPage; +// TM_ITEM *pItem; + + pPage = &pMenu->pPages[pMenu->SelPage]; +// pItem = &pPage->pItems[pPage->SelItem]; pMenu->Status = TMS_ON_ITEM; LV_MenuCommonItem_UpdateContent(pMenu); + //DBG_DUMP("%s SelItem:%d \r\n", __func__, pPage->SelItem); + lv_plugin_menu_select_item(menu_item, pPage->SelItem); } } @@ -763,6 +777,7 @@ void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event) break; } +#if 0 case LV_EVENT_PRESSED: lv_plugin_menu_set_selected_item_pressed(menu_item); break; @@ -770,10 +785,13 @@ void UIFlowMenuCommonItemEventCallback(lv_obj_t* obj, lv_event_t event) case LV_EVENT_RELEASED: lv_plugin_menu_set_selected_item_released(menu_item); break; +#endif - // case LV_EVENT_CLICKED: - // LV_MenuItem_OnSelected(obj); - // break; + //case LV_EVENT_CLICKED: + case LV_KEY_ENTER: + CHKPNT; + LV_MenuItem_OnSelected(obj); + break; case LV_EVENT_KEY: { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOption.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOption.c index f78d36c5b..d1a9f556c 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOption.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOption.c @@ -35,7 +35,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ lv_obj_set_event_cb(parent, UIFlowMenuCommonOptionEventCallback); lv_color_t color = {0}; - STYLE_COLOR_PROP(0x0a, 0x80, 0x00, 0x00); + STYLE_COLOR_PROP(0x00, 0x55, 0x1f, 0x57); _lv_obj_set_style_local_color(parent,0,LV_STYLE_BG_COLOR, color); if(color.full== LV_COLOR_TRANSP.full){ @@ -197,7 +197,6 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ lv_obj_set_size(image_button_option_1, 320, 40); lv_imgbtn_set_state(image_button_option_1, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_option_1, false); - lv_imgbtn_set_src(image_button_option_1, LV_BTN_STATE_RELEASED, &sf_menu_select); lv_imgbtn_set_src(image_button_option_1, LV_BTN_STATE_PRESSED, &sf_menu_release); lv_imgbtn_set_src(image_button_option_1, LV_BTN_STATE_DISABLED, &sf_menu_release); lv_btn_set_layout(image_button_option_1, LV_LAYOUT_OFF); @@ -361,7 +360,6 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ lv_obj_set_size(image_button_option_2, 320, 40); lv_imgbtn_set_state(image_button_option_2, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_option_2, false); - lv_imgbtn_set_src(image_button_option_2, LV_BTN_STATE_RELEASED, &sf_menu_select); lv_imgbtn_set_src(image_button_option_2, LV_BTN_STATE_PRESSED, &sf_menu_release); lv_imgbtn_set_src(image_button_option_2, LV_BTN_STATE_DISABLED, &sf_menu_release); lv_btn_set_layout(image_button_option_2, LV_LAYOUT_OFF); @@ -388,7 +386,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option2_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_option2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&label_option2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option2_s0, LV_STATE_EDITED, color); @@ -525,7 +523,6 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ lv_obj_set_size(image_button_option_3, 320, 40); lv_imgbtn_set_state(image_button_option_3, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_option_3, false); - lv_imgbtn_set_src(image_button_option_3, LV_BTN_STATE_RELEASED, &sf_menu_select); lv_imgbtn_set_src(image_button_option_3, LV_BTN_STATE_PRESSED, &sf_menu_release); lv_imgbtn_set_src(image_button_option_3, LV_BTN_STATE_DISABLED, &sf_menu_release); lv_btn_set_layout(image_button_option_3, LV_LAYOUT_OFF); @@ -552,7 +549,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option3_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_option3_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&label_option3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option3_s0, LV_STATE_EDITED, color); @@ -689,7 +686,6 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ lv_obj_set_size(image_button_option_4, 320, 40); lv_imgbtn_set_state(image_button_option_4, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_option_4, false); - lv_imgbtn_set_src(image_button_option_4, LV_BTN_STATE_RELEASED, &sf_menu_select); lv_imgbtn_set_src(image_button_option_4, LV_BTN_STATE_PRESSED, &sf_menu_release); lv_imgbtn_set_src(image_button_option_4, LV_BTN_STATE_DISABLED, &sf_menu_release); lv_btn_set_layout(image_button_option_4, LV_LAYOUT_OFF); @@ -716,7 +712,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option4_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option4_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option4_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_option4_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&label_option4_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option4_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option4_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option4_s0, LV_STATE_EDITED, color); @@ -853,7 +849,6 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ lv_obj_set_size(image_button_option_5, 320, 40); lv_imgbtn_set_state(image_button_option_5, LV_BTN_STATE_RELEASED); lv_imgbtn_set_checkable(image_button_option_5, false); - lv_imgbtn_set_src(image_button_option_5, LV_BTN_STATE_RELEASED, &sf_menu_select); lv_imgbtn_set_src(image_button_option_5, LV_BTN_STATE_PRESSED, &sf_menu_release); lv_imgbtn_set_src(image_button_option_5, LV_BTN_STATE_DISABLED, &sf_menu_release); lv_btn_set_layout(image_button_option_5, LV_LAYOUT_OFF); @@ -880,7 +875,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_option5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_option5_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_option5_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_text_color(&label_option5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_option5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_option5_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_option5_s0, LV_STATE_EDITED, color); @@ -1004,7 +999,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ lv_obj_set_hidden(container_option_title, false); lv_obj_set_click(container_option_title, true); lv_obj_set_drag(container_option_title, false); - lv_obj_set_pos(container_option_title, 5, 0); + lv_obj_set_pos(container_option_title, 0, 0); lv_obj_set_size(container_option_title, 320, 40); lv_obj_add_style(container_option_title, 0, &container_option_title_s0); 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 758e36aea..9166bd2b0 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 @@ -10,7 +10,7 @@ #define OPTION_PAGE_NUM 5 static lv_group_t* gp = NULL; -static lv_obj_t* menu_item = NULL; +static lv_obj_t* menu_option = NULL; static lv_obj_t* label_menu_item = NULL; //static lv_obj_t* label_menu_option = NULL; @@ -243,17 +243,17 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) if((pOption->Status & TM_OPTION_STATUS_MASK) == TM_OPTION_ENABLE) { CHKPNT; - lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); + lv_plugin_menu_set_item_string_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); // if(PrevOption == pPage) //lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->IconId); - lv_plugin_menu_set_item_hidden(menu_item, i, false); + lv_plugin_menu_set_item_hidden(menu_option, i, false); } else { CHKPNT; - lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); + lv_plugin_menu_set_item_string_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); //lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->IconId); - lv_plugin_menu_set_item_hidden(menu_item, i, true); + lv_plugin_menu_set_item_hidden(menu_option, i, true); } itemIndex++; } @@ -325,27 +325,27 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) pOption = &pItem->pOptions[enableIndex[i + (Selindex * OPTION_PAGE_NUM)]]; if (((enableIndex[i + (Selindex * OPTION_PAGE_NUM)]) > (pItem->Count -1)) && (i < OPTION_PAGE_NUM)) { printf("\033[33m[LV_MenuCommonOption_UpdateContent] 1 \033[0m\n"); - lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); - lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED, pOption->IconId); - lv_plugin_menu_set_item_hidden(menu_item, i, true); + lv_plugin_menu_set_item_string_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); + lv_plugin_menu_set_item_img_id(menu_option, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED, pOption->IconId); + lv_plugin_menu_set_item_hidden(menu_option, i, true); ui_hidden = true; }else if((i + (Selindex * OPTION_PAGE_NUM)) > OptionEN_Num){ printf("\033[33m[LV_MenuCommonOption_UpdateContent] 2 \033[0m\n"); - lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); - lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED, pOption->IconId); - lv_plugin_menu_set_item_hidden(menu_item, i, true); + lv_plugin_menu_set_item_string_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); + lv_plugin_menu_set_item_img_id(menu_option, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED, pOption->IconId); + lv_plugin_menu_set_item_hidden(menu_option, i, true); ui_hidden = true; }else{ printf("\033[33m[LV_MenuCommonOption_UpdateContent] 3 \033[0m\n"); - lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); - lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED, pOption->IconId); - lv_plugin_menu_set_item_hidden(menu_item, i, false); + lv_plugin_menu_set_item_string_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); + lv_plugin_menu_set_item_img_id(menu_option, i, LV_PLUGIN_MENU_ITEM_STATE_DISABLED, pOption->IconId); + lv_plugin_menu_set_item_hidden(menu_option, i, false); ui_hidden = true; if(enableIndex[i+(Selindex * OPTION_PAGE_NUM)] == SelOption){ printf("\033[33m[LV_MenuCommonOption_UpdateContent] 4 %d %d \033[0m\n", i, Selindex); s_SelOption = i + (Selindex * OPTION_PAGE_NUM); - lv_plugin_menu_select_item(menu_item, i); + lv_plugin_menu_select_item(menu_option, i); ui_hidden = false; } } @@ -379,15 +379,15 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu) if ((itemIndex > (pItem->Count -1)) && (i < PAGE)) { // if ((itemIndex == (pItem->Count)) && (i < PAGE)) { CHKPNT; - lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); -// lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->IconId); - lv_plugin_menu_set_item_hidden(menu_item, i, true); + lv_plugin_menu_set_item_string_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); +// lv_plugin_menu_set_item_img_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->IconId); + lv_plugin_menu_set_item_hidden(menu_option, i, true); } else { CHKPNT; - lv_plugin_menu_set_item_string_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); -// lv_plugin_menu_set_item_img_id(menu_item, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->IconId); - lv_plugin_menu_set_item_hidden(menu_item, i, false); + lv_plugin_menu_set_item_string_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->TextId); +// lv_plugin_menu_set_item_img_id(menu_option, i, LV_PLUGIN_MENU_ITEM_VISIBLE_STATE_NUM, pOption->IconId); + lv_plugin_menu_set_item_hidden(menu_option, i, false); itemIndex++; } @@ -431,9 +431,9 @@ static void LV_MenuOption_OnOpen(lv_obj_t* obj, TM_MENU *data) } /* check menu item is init */ - if(!lv_plugin_menu_item_cnt(menu_item)){ + if(!lv_plugin_menu_item_cnt(menu_option)){ /* allocate menu item */ - lv_plugin_menu_init_items(menu_item, OPTION_PAGE_NUM); + lv_plugin_menu_init_items(menu_option, OPTION_PAGE_NUM); } // if(MESSAGE_ITEM_FALSE == is_message_item(obj)) // { @@ -446,7 +446,7 @@ static void LV_MenuOption_OnOpen(lv_obj_t* obj, TM_MENU *data) // } LV_MenuCommonOption_UpdateContent(pMenu); - //lv_plugin_menu_select_item(menu_item, 0); + lv_plugin_menu_select_item(menu_option, SelOption); } @@ -465,17 +465,18 @@ static void LV_MenuOption_OnNext(lv_obj_t* obj) // DBG_DUMP("%s Count=%d\r\n", __func__,pItem->Count); // DBG_DUMP("%s SelOption=%d\r\n", __func__,SelOption); SelOption++; - if (SelOption == pItem->Count){ -// // Close current UI Window now -// SysSetFlag(pItem->SysFlag, PrevOption); -// lv_plugin_scr_close(obj, NULL); -// // UIFlowMenuCommonOption_CloseScr(obj); + if (SelOption >= pItem->Count){ + // Close current UI Window now + //SysSetFlag(pItem->SysFlag, PrevOption); + //lv_plugin_scr_close(obj, NULL); + SelOption = 0; + SysSetFlag(pItem->SysFlag, SelOption); + lv_plugin_menu_select_item(menu_option, SelOption); }else{ SysSetFlag(pItem->SysFlag, SelOption); - lv_plugin_menu_select_next_item(menu_item); - LV_MenuCommonOption_UpdateContent(pMenu); + lv_plugin_menu_select_next_item(menu_option); } - DBG_DUMP("%s flag=%d\r\n", __func__,SysGetFlag(pItem->SysFlag)); +// DBG_DUMP("%s flag=%d\r\n", __func__,SysGetFlag(pItem->SysFlag)); } static void LV_MenuOption_OnPrev(lv_obj_t* obj) @@ -489,18 +490,34 @@ static void LV_MenuOption_OnPrev(lv_obj_t* obj) pItem = &pPage->pItems[pPage->SelItem]; SelOption = SysGetFlag(pItem->SysFlag); if (SelOption == 0) { -// // Close current UI Window now -// SysSetFlag(pItem->SysFlag, PrevOption); -// lv_plugin_scr_close(obj, NULL); -// // UIFlowMenuCommonOption_CloseScr(obj); + // Close current UI Window now + //SysSetFlag(pItem->SysFlag, PrevOption); + //lv_plugin_scr_close(obj, NULL); + SelOption = (pItem->Count - 1); + SysSetFlag(pItem->SysFlag, SelOption); + lv_plugin_menu_select_item(menu_option, SelOption); } else { SelOption--; SysSetFlag(pItem->SysFlag, SelOption); - lv_plugin_menu_select_prev_item(menu_item); - LV_MenuCommonOption_UpdateContent(pMenu); +// LV_MenuCommonOption_UpdateContent(pMenu); + lv_plugin_menu_select_prev_item(menu_option); } - DBG_DUMP("%s flag=%d\r\n", __func__,SysGetFlag(pItem->SysFlag)); +// DBG_DUMP("%s flag=%d\r\n", __func__,SysGetFlag(pItem->SysFlag)); +} + +static void LV_MenuOption_OnLeft(lv_obj_t* obj) +{ + DBG_DUMP("%s\r\n", __func__); + TM_MENU* pMenu = TM_GetMenu(); + TM_PAGE *pPage; + TM_ITEM *pItem; + + pPage = &pMenu->pPages[pMenu->SelPage]; + pItem = &pPage->pItems[pPage->SelItem]; + + SysSetFlag(pItem->SysFlag, PrevOption); + lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0)); } static void LV_MenuOption_OnSelected(lv_obj_t* obj) @@ -544,6 +561,7 @@ static void LV_MenuOption_OnSelected(lv_obj_t* obj) SysSetFlag(pItem->SysFlag, SelOption); // notify upper layer the Option had been confirmed + TM_MENU_CALLBACK(pMenu, TMM_CONFIRM_OPTION, MAKE_LONG(pItem->ItemId, SelOption)); TM_MENU_CALLBACK(MenuList[pMenu->SelPage], TMM_CONFIRM_OPTION, MAKE_LONG(pItem->ItemId, SelOption)); pOption = &pItem->pOptions[SysGetFlag(pItem->SysFlag)]; @@ -660,9 +678,9 @@ static void UIFlowMenuCommonOption_ScrOpen(lv_obj_t* obj, const void *data) * btn's label or img is not mandatory * **********************************************************************************/ - if(menu_item == NULL){ - menu_item = lv_plugin_menu_create(obj, container_main_menu_scr_uiflowmenucommonoption); - lv_plugin_menu_set_wrap(menu_item, true); + if(menu_option == NULL){ + menu_option = lv_plugin_menu_create(obj, container_main_menu_scr_uiflowmenucommonoption); + lv_plugin_menu_set_wrap(menu_option, true); } if(label_menu_item == NULL) @@ -700,17 +718,19 @@ static void UIFlowMenuCommonOption_Key(lv_obj_t* obj, uint32_t key) LV_MenuOption_OnPrev(obj); break; } - // case LV_KEY_RIGHT: - // { - // LV_MenuOption_OnSelected(obj); - // break; - // } + + case LV_KEY_LEFT: + { + //back to menu item, and no choose anyone + LV_MenuOption_OnLeft(obj); + break; + } - // case LV_USER_KEY_SELECT: - // { - // LV_MenuOption_OnSelected(obj); - // break; - // } + case LV_KEY_RIGHT: + { + LV_MenuOption_OnSelected(obj); + break; + } case LV_KEY_ENTER: { @@ -766,12 +786,12 @@ void UIFlowMenuCommonOptionEventCallback(lv_obj_t* obj, lv_event_t event) case LV_EVENT_PRESSED: printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_EVENT_PRESSED\033[0m\n"); - lv_plugin_menu_set_selected_item_pressed(menu_item); + lv_plugin_menu_set_selected_item_pressed(menu_option); break; case LV_EVENT_RELEASED: printf("\033[33m[UIFlowMenuCommonOptionEventCallback]LV_EVENT_RELEASED\033[0m\n"); - lv_plugin_menu_set_selected_item_released(menu_item); + lv_plugin_menu_set_selected_item_released(menu_option); break; // case LV_EVENT_CLICKED: 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 7986082bb..64ff76259 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 @@ -1096,6 +1096,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_2_s0, LV_STATE_CHECKED, color); + lv_style_set_text_font(&label_2_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_FOCUSED, color); @@ -1116,19 +1117,20 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_HOVERED, color); + lv_style_set_text_font(&label_2_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_PRESSED, color); + lv_style_set_text_font(&label_2_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DISABLED, color); lv_obj_t *label_2 = lv_label_create(button_2, NULL); @@ -1223,7 +1225,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_CHECKED, color);