From 5d9135431f24f5c4005aaa7abee6a70819764542 Mon Sep 17 00:00:00 2001 From: xiaojiazhu <258828110@qq.com> Date: Thu, 2 Nov 2023 13:59:35 +0800 Subject: [PATCH] Fixed font bug. --- .../UIFlowLVGL.UIFlowMovie.lvglscr | 8 +- .../UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang | 90 +++++++++---------- .../UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp | 24 ----- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c | 28 +++--- .../LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h | 38 ++++---- .../UIFlowMenuCommonConfirm.c | 18 +++- .../UIFlowMenuCommonOption.c | 12 +-- .../UIFlowLVGL/UIFlowMovie/UIFlowMovie.c | 20 ++--- .../UIFlowPassword/UIFlowPassword.c | 8 +- .../UIFlowLVGL/UIFlowPhoto/UIFlowPhoto.c | 60 ++++++------- .../UIFlowLVGL/UIFlowPlay/UIFlowPlay.c | 18 ++-- .../UIFlowPlayThumb/UIFlowPlayThumb.c | 4 +- .../UIFlowLVGL/UIFlowUSB/UIFlowUSB.c | 8 +- .../UIFlowLVGL/UIFlowUSBMenu/UIFlowUSBMenu.c | 20 ++--- .../UIFlowWaitMoment/UIFlowWaitMoment.c | 2 +- .../UIFlowWifiLink/UIFlowWifiLink.c | 36 ++++---- .../UIFlowWifiLinkOK/UIFlowWifiLinkOK.c | 22 ++--- .../UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsg.c | 12 ++- 18 files changed, 204 insertions(+), 224 deletions(-) diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr index e05d5a64e..60a98cd70 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.UIFlowMovie.lvglscr @@ -945,7 +945,7 @@ { "Text": { "text_color": "0xffffff", - "text_font": "montserrat 16 4bpp", + "text_font": "SF-UI-Text-Medium 16 1bpp", "text_sel_bg_color": "0x00b495", "text_sel_color": "0x3c3c3c" }, @@ -1057,7 +1057,7 @@ { "Text": { "text_color": "0xffffff", - "text_font": "montserrat 16 4bpp", + "text_font": "SF-UI-Text-Medium 16 1bpp", "text_sel_bg_color": "0x00b495", "text_sel_color": "0x3c3c3c" }, @@ -1169,7 +1169,7 @@ { "Text": { "text_color": "0xffffff", - "text_font": "montserrat 16 4bpp", + "text_font": "SF-UI-Text-Medium 16 1bpp", "text_sel_bg_color": "0x00b495", "text_sel_color": "0x3c3c3c" }, @@ -1330,7 +1330,7 @@ { "Text": { "text_color": "0xffffff", - "text_font": "montserrat 16 4bpp", + "text_font": "SF-UI-Text-Medium 16 8bpp", "text_sel_bg_color": "0x00b495", "text_sel_color": "0x3c3c3c" }, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang index dc18a8199..b4ebe566d 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvgllang @@ -195,46 +195,46 @@ ], "font names": [ [ - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp" + "SF-UI-Text-Medium 16 1bpp", + "SF-UI-Text-Medium 18 1bpp", + "SF-UI-Text-Bold 20 1bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp" ], [ - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp" + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp" ], [ - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp" + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp" ], [ - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp" + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp" ], [ - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp" + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp" ], [ - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp" + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp" ], [ "NotoSansCJKsc-Black 16 1bpp", @@ -244,25 +244,25 @@ "NotoSansCJKsc-Black 16 1bpp" ], [ - "NotoSansCJKjp-Black 16 1bpp", - "NotoSansCJKjp-Black 16 1bpp", - "NotoSansCJKjp-Black 16 1bpp", - "NotoSansCJKjp-Black 16 1bpp", - "NotoSansCJKjp-Black 16 1bpp" + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp" ], [ - "NotoSansCJKtc-Black 16 1bpp", - "NotoSansCJKtc-Black 16 1bpp", - "NotoSansCJKtc-Black 16 1bpp", - "NotoSansCJKtc-Black 16 1bpp", - "NotoSansCJKtc-Black 16 1bpp" + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp" ], [ - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp", - "NotoSans-Black 16 1bpp" + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp", + "montserrat 16 4bpp" ] ], "languages": [ diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp index 90e9d539a..3799ca788 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL.lvglp @@ -2313,18 +2313,6 @@ } }, "fonts": [ - { - "bpp": 1, - "compressed": false, - "custom code range": "", - "file path": "fonts/NotoSansCJKjp-Black.otf", - "include language table": true, - "name": "NotoSansCJKjp-Black", - "size": 16, - "unicode range names": [ - "Ascii" - ] - }, { "bpp": 1, "compressed": false, @@ -2337,18 +2325,6 @@ "Ascii" ] }, - { - "bpp": 1, - "compressed": false, - "custom code range": "", - "file path": "fonts/NotoSansCJKtc-Black.otf", - "include language table": true, - "name": "NotoSansCJKtc-Black", - "size": 16, - "unicode range names": [ - "Ascii" - ] - }, { "bpp": 1, "compressed": false, diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c index 34331e35f..c97ec7631 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.c @@ -527,9 +527,7 @@ lv_plugin_font_t lv_plugin_UIFlowLVGL_font_table[] = { { NULL }, { &lv_font_montserrat_16 }, - { ¬osanscjkjp_black_16_1bpp }, { ¬osanscjksc_black_16_1bpp }, - { ¬osanscjktc_black_16_1bpp }, { &arialuni_16_1bpp }, { &arialuni_18_1bpp }, { &arialuni_32_1bpp }, @@ -562,9 +560,9 @@ lv_plugin_string_t* lv_plugin_language_table[] = { }; lv_plugin_res_id lv_plugin_language_font_table_EN[] = { - LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, - LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, - LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_1BPP, + LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_1BPP, + LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_1BPP, LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, }; @@ -618,19 +616,19 @@ lv_plugin_res_id lv_plugin_language_font_table_SC[] = { }; lv_plugin_res_id lv_plugin_language_font_table_JP[] = { - LV_PLUGIN_FONT_ID_NOTOSANSCJKJP_BLACK_16_1BPP, - LV_PLUGIN_FONT_ID_NOTOSANSCJKJP_BLACK_16_1BPP, - LV_PLUGIN_FONT_ID_NOTOSANSCJKJP_BLACK_16_1BPP, - LV_PLUGIN_FONT_ID_NOTOSANSCJKJP_BLACK_16_1BPP, - LV_PLUGIN_FONT_ID_NOTOSANSCJKJP_BLACK_16_1BPP, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, }; lv_plugin_res_id lv_plugin_language_font_table_TC[] = { - LV_PLUGIN_FONT_ID_NOTOSANSCJKTC_BLACK_16_1BPP, - LV_PLUGIN_FONT_ID_NOTOSANSCJKTC_BLACK_16_1BPP, - LV_PLUGIN_FONT_ID_NOTOSANSCJKTC_BLACK_16_1BPP, - LV_PLUGIN_FONT_ID_NOTOSANSCJKTC_BLACK_16_1BPP, - LV_PLUGIN_FONT_ID_NOTOSANSCJKTC_BLACK_16_1BPP, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, + LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16, }; lv_plugin_res_id lv_plugin_language_font_table_RU[] = { diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h index 43312d676..3b3f78926 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowLVGL.h @@ -53,9 +53,7 @@ extern lv_obj_t *UIFlowWifiLinkOK; extern lv_obj_t *UIFlowWifiWait; extern lv_obj_t *UIFlowPassword; -LV_FONT_DECLARE(notosanscjkjp_black_16_1bpp); LV_FONT_DECLARE(notosanscjksc_black_16_1bpp); -LV_FONT_DECLARE(notosanscjktc_black_16_1bpp); LV_FONT_DECLARE(arialuni_16_1bpp); LV_FONT_DECLARE(arialuni_18_1bpp); LV_FONT_DECLARE(arialuni_32_1bpp); @@ -1055,25 +1053,23 @@ LV_IMG_DECLARE(work_mode); #define LV_PLUGIN_IMG_TABLE_SIZE 484 #define LV_PLUGIN_FONT_ID_LV_FONT_MONTSERRAT_16 1 -#define LV_PLUGIN_FONT_ID_NOTOSANSCJKJP_BLACK_16_1BPP 2 -#define LV_PLUGIN_FONT_ID_NOTOSANSCJKSC_BLACK_16_1BPP 3 -#define LV_PLUGIN_FONT_ID_NOTOSANSCJKTC_BLACK_16_1BPP 4 -#define LV_PLUGIN_FONT_ID_ARIALUNI_16_1BPP 5 -#define LV_PLUGIN_FONT_ID_ARIALUNI_18_1BPP 6 -#define LV_PLUGIN_FONT_ID_ARIALUNI_32_1BPP 7 -#define LV_PLUGIN_FONT_ID_ARIALUNI_48_1BPP 8 -#define LV_PLUGIN_FONT_ID_ARIALUNI_60_1BPP 9 -#define LV_PLUGIN_FONT_ID_ARIALUNI_86_1BPP 10 -#define LV_PLUGIN_FONT_ID_ARIALUNI_106_1BPP 11 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_8BPP 12 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_8BPP 13 -#define LV_PLUGIN_FONT_ID_ARIALUNI_74_1BPP 14 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_8BPP 15 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_1BPP 16 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_1BPP 17 -#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_1BPP 18 -#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 19 -#define LV_PLUGIN_FONT_TABLE_SIZE 20 +#define LV_PLUGIN_FONT_ID_NOTOSANSCJKSC_BLACK_16_1BPP 2 +#define LV_PLUGIN_FONT_ID_ARIALUNI_16_1BPP 3 +#define LV_PLUGIN_FONT_ID_ARIALUNI_18_1BPP 4 +#define LV_PLUGIN_FONT_ID_ARIALUNI_32_1BPP 5 +#define LV_PLUGIN_FONT_ID_ARIALUNI_48_1BPP 6 +#define LV_PLUGIN_FONT_ID_ARIALUNI_60_1BPP 7 +#define LV_PLUGIN_FONT_ID_ARIALUNI_86_1BPP 8 +#define LV_PLUGIN_FONT_ID_ARIALUNI_106_1BPP 9 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_8BPP 10 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_8BPP 11 +#define LV_PLUGIN_FONT_ID_ARIALUNI_74_1BPP 12 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_8BPP 13 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_BOLD_20_1BPP 14 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_18_1BPP 15 +#define LV_PLUGIN_FONT_ID_SF_UI_TEXT_MEDIUM_16_1BPP 16 +#define LV_PLUGIN_FONT_ID_NOTOSANS_BLACK_8_1BPP 17 +#define LV_PLUGIN_FONT_TABLE_SIZE 18 #define LV_PLUGIN_STRING_ID_STRID_NULL_ 1 #define LV_PLUGIN_STRING_ID_STRID_MODE 2 diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c index 65be1b8e7..cc4c4fefe 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirm.c @@ -51,6 +51,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_CHECKED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_CHECKED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); @@ -59,6 +60,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_FOCUSED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_FOCUSED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xcc, 0x02, 0x62, 0xb6) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_EDITED, color); @@ -67,6 +69,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_EDITED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_EDITED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xcc, 0x02, 0x62, 0xb6) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_HOVERED, color); @@ -75,6 +78,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_HOVERED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_HOVERED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); @@ -83,6 +87,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_PRESSED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_PRESSED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xcc, 0x02, 0x62, 0xb6) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_DISABLED, color); @@ -91,6 +96,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_DISABLED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_DISABLED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x87, 0x5e, 0x5e, 0x5e) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_DISABLED, color); static lv_style_t message_box_1_s1; @@ -143,6 +149,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&message_box_1_s2, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_value_color(&message_box_1_s2, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&message_box_1_s2, LV_STATE_CHECKED, color); + lv_style_set_text_font(&message_box_1_s2,LV_STATE_CHECKED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s2, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s2, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&message_box_1_s2, LV_STATE_FOCUSED, color); @@ -155,6 +162,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&message_box_1_s2, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_value_color(&message_box_1_s2, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&message_box_1_s2, LV_STATE_FOCUSED, color); + lv_style_set_text_font(&message_box_1_s2,LV_STATE_FOCUSED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s2, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s2, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&message_box_1_s2, LV_STATE_EDITED, color); @@ -166,6 +174,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&message_box_1_s2, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_value_color(&message_box_1_s2, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&message_box_1_s2, LV_STATE_EDITED, color); + lv_style_set_text_font(&message_box_1_s2,LV_STATE_EDITED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s2, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s2, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&message_box_1_s2, LV_STATE_HOVERED, color); @@ -177,6 +186,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&message_box_1_s2, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_value_color(&message_box_1_s2, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&message_box_1_s2, LV_STATE_HOVERED, color); + lv_style_set_text_font(&message_box_1_s2,LV_STATE_HOVERED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s2, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s2, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xbd, 0xc7, 0xfb, 0xe7) ; lv_style_set_bg_color(&message_box_1_s2, LV_STATE_PRESSED, color); @@ -188,6 +198,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&message_box_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_value_color(&message_box_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&message_box_1_s2, LV_STATE_PRESSED, color); + lv_style_set_text_font(&message_box_1_s2,LV_STATE_PRESSED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s2, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&message_box_1_s2, LV_STATE_DISABLED, color); @@ -199,6 +210,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&message_box_1_s2, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_value_color(&message_box_1_s2, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&message_box_1_s2, LV_STATE_DISABLED, color); + lv_style_set_text_font(&message_box_1_s2,LV_STATE_DISABLED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s2, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s2, LV_STATE_DISABLED, color); lv_obj_t *message_box_1 = lv_msgbox_create(parent, NULL); @@ -280,7 +292,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_tips_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_tips_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_CHECKED, color); @@ -391,7 +403,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_yes_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_yes_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_yes_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_yes_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_yes_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_yes_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_yes_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_yes_s0, LV_STATE_CHECKED, color); @@ -502,7 +514,7 @@ lv_obj_t* UIFlowMenuCommonConfirm_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_no_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_no_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_no_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_no_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_no_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_no_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_no_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_no_s0, LV_STATE_CHECKED, color); 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 d34c01f3c..d8b7c96f6 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 @@ -1164,7 +1164,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_1_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_CHECKED, color); @@ -1226,7 +1226,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_CHECKED, color); @@ -1323,7 +1323,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_time_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_time_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_time_1_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_time_1_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_time_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_time_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_time_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&label_time_1_s0, LV_STATE_CHECKED, color); @@ -1385,7 +1385,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_time_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_time_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_time_2_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_time_2_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_time_2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_time_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_time_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&label_time_2_s0, LV_STATE_CHECKED, color); @@ -1447,7 +1447,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_5_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_5_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_5_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&label_5_s0, LV_STATE_CHECKED, color); @@ -1509,7 +1509,7 @@ lv_obj_t* UIFlowMenuCommonOption_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_6_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_6_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_6_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_bg_color(&label_6_s0, LV_STATE_CHECKED, color); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c index 5d10fe303..8fec9a776 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovie.c @@ -210,7 +210,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_date_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_date_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_date_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_date_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_date_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_date_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_date_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_date_s0, LV_STATE_CHECKED, color); @@ -270,7 +270,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_time_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_time_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_time_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_time_s0, LV_STATE_CHECKED, color); @@ -379,7 +379,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_rec_time_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_rec_time_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_rec_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_rec_time_s0, LV_STATE_CHECKED, color); @@ -538,7 +538,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_size_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_size_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_size_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_size_s0, LV_STATE_CHECKED, color); @@ -796,7 +796,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_zoom_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_zoom_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_color(&label_zoom_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_zoom_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_zoom_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_zoom_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_zoom_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_zoom_s0, LV_STATE_CHECKED, color); @@ -857,7 +857,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_maxtime_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_maxtime_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_maxtime_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_maxtime_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_maxtime_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_maxtime_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_maxtime_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_maxtime_s0, LV_STATE_CHECKED, color); @@ -1016,7 +1016,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_4_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_4_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_4_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_4_s0, LV_STATE_CHECKED, color); @@ -1127,7 +1127,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_5_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_5_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_5_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_5_s0, LV_STATE_CHECKED, color); @@ -1238,7 +1238,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_6_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_6_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_6_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_6_s0, LV_STATE_CHECKED, color); @@ -1349,7 +1349,7 @@ lv_obj_t* UIFlowMovie_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_sim_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_sim_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_sim_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_sim_s0, LV_STATE_CHECKED, color); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPassword.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPassword.c index e1624a462..802093316 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPassword.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPassword/UIFlowPassword.c @@ -84,7 +84,7 @@ lv_obj_t* UIFlowPassword_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_enter_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_enter_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_enter_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_enter_s0,LV_STATE_DEFAULT,&arialuni_16_1bpp); + lv_style_set_text_font(&label_enter_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_enter_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_enter_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_enter_s0, LV_STATE_CHECKED, color); @@ -263,7 +263,7 @@ lv_obj_t* UIFlowPassword_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_select_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_select_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_select_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_select_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_select_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_select_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_select_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_select_s0, LV_STATE_CHECKED, color); @@ -375,7 +375,7 @@ lv_obj_t* UIFlowPassword_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_tips_s0,LV_STATE_DEFAULT,&arialuni_18_1bpp); + lv_style_set_text_font(&label_tips_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_CHECKED, color); @@ -426,7 +426,7 @@ lv_obj_t* UIFlowPassword_create(){ lv_label_set_align(label_tips, LV_LABEL_ALIGN_CENTER); lv_label_set_long_mode(label_tips, LV_LABEL_LONG_BREAK); lv_obj_set_pos(label_tips, 42, 71); - lv_obj_set_size(label_tips, 237, 21); + lv_obj_set_size(label_tips, 237, 20); lv_obj_add_style(label_tips, 0, &label_tips_s0); label_tips_scr_uiflowpassword = label_tips; 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 c6429c345..4494b85e2 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 @@ -412,7 +412,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_size_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_size_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_size_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_size_s0, LV_STATE_CHECKED, color); @@ -523,7 +523,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_free_pic_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_free_pic_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_free_pic_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_free_pic_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_free_pic_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_free_pic_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_free_pic_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_free_pic_s0, LV_STATE_CHECKED, color); @@ -683,7 +683,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_self_timer_cnt_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_self_timer_cnt_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_self_timer_cnt_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_self_timer_cnt_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_self_timer_cnt_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_self_timer_cnt_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_self_timer_cnt_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_self_timer_cnt_s0, LV_STATE_CHECKED, color); @@ -731,7 +731,7 @@ lv_obj_t* UIFlowPhoto_create(){ lv_plugin_label_allocate_ext_attr(label_self_timer_cnt); lv_plugin_label_set_font_type(label_self_timer_cnt, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_self_timer_cnt, 68, -40); - lv_obj_set_size(label_self_timer_cnt, 9, 18); + lv_obj_set_size(label_self_timer_cnt, 10, 20); lv_obj_add_style(label_self_timer_cnt, 0, &label_self_timer_cnt_s0); label_self_timer_cnt_scr_uiflowphoto = label_self_timer_cnt; @@ -827,7 +827,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_dzoom_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_dzoom_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_dzoom_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_dzoom_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_dzoom_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_dzoom_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_dzoom_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_dzoom_s0, LV_STATE_CHECKED, color); @@ -956,48 +956,43 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_1_s0, LV_STATE_DEFAULT, color); + lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_1_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_1_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_1_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_1_s0, LV_STATE_HOVERED, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_HOVERED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_1_s0, LV_STATE_PRESSED, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_PRESSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_text_color(&label_1_s0, LV_STATE_DISABLED, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_DISABLED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_DISABLED, color); lv_obj_t *label_1 = lv_label_create(button_1, NULL); @@ -1023,7 +1018,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_2_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_2_s0, LV_STATE_DEFAULT, color); @@ -1031,42 +1026,42 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&button_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_2_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_2_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_2_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_2_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_2_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x13, 0x44, 0xd1, 0xb6) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_2_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_2_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xbc, 0xcc, 0xec, 0xef) ; lv_style_set_bg_color(&button_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_2_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_2_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_border_color(&button_2_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_outline_color(&button_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_2_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_2_s0, LV_STATE_DISABLED, color); @@ -1090,6 +1085,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DEFAULT, color); + lv_style_set_text_font(&label_2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_CHECKED, color); @@ -1108,7 +1104,6 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_2_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_HOVERED, color); @@ -1127,7 +1122,6 @@ lv_obj_t* UIFlowPhoto_create(){ 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); @@ -1152,7 +1146,7 @@ lv_obj_t* UIFlowPhoto_create(){ lv_style_set_opa_scale(&button_3_s0,LV_STATE_DEFAULT,120); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_3_s0, LV_STATE_DEFAULT, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_border_color(&button_3_s0, LV_STATE_DEFAULT, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_3_s0, LV_STATE_DEFAULT, color); lv_style_set_border_width(&button_3_s0,LV_STATE_DEFAULT,0); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_3_s0, LV_STATE_DEFAULT, color); @@ -1161,42 +1155,42 @@ lv_obj_t* UIFlowPhoto_create(){ lv_style_set_value_font(&button_3_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_bg_color(&button_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_3_s0, LV_STATE_CHECKED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_border_color(&button_3_s0, LV_STATE_CHECKED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_3_s0, LV_STATE_FOCUSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_border_color(&button_3_s0, LV_STATE_FOCUSED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_3_s0, LV_STATE_EDITED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_border_color(&button_3_s0, LV_STATE_EDITED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_3_s0, LV_STATE_HOVERED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_border_color(&button_3_s0, LV_STATE_HOVERED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_3_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xbc, 0xcc, 0xec, 0xef) ; lv_style_set_bg_color(&button_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_3_s0, LV_STATE_PRESSED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_border_color(&button_3_s0, LV_STATE_PRESSED, color); + STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_border_color(&button_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_value_color(&button_3_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&button_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&button_3_s0, LV_STATE_DISABLED, color); - STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_border_color(&button_3_s0, LV_STATE_DISABLED, color); + STYLE_COLOR_PROP(0x9c, 0x88, 0x88, 0x88) ; lv_style_set_border_color(&button_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_outline_color(&button_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_shadow_color(&button_3_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_pattern_recolor(&button_3_s0, LV_STATE_DISABLED, color); @@ -1221,27 +1215,25 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_DEFAULT, color); 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); + lv_style_set_text_font(&label_3_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); 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(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); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_3_s0, LV_STATE_CHECKED, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_CHECKED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_FOCUSED, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_FOCUSED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x31, 0x40, 0x4f) ; lv_style_set_text_color(&label_3_s0, LV_STATE_EDITED, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_EDITED,&lv_font_montserrat_16); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x01, 0xa2, 0xb1) ; lv_style_set_text_sel_bg_color(&label_3_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_HOVERED, color); @@ -1383,7 +1375,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_sim_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_sim_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_sim_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_sim_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_sim_s0, LV_STATE_CHECKED, color); @@ -1935,7 +1927,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_4_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_4_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_4_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_4_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_4_s0, LV_STATE_CHECKED, color); @@ -2046,7 +2038,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_5_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_5_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_5_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_5_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_5_s0, LV_STATE_CHECKED, color); @@ -2157,7 +2149,7 @@ lv_obj_t* UIFlowPhoto_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_6_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_6_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_6_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_6_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_6_s0, LV_STATE_CHECKED, color); 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 64f5b009a..fd8a4c6a2 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 @@ -161,7 +161,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_file_name_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_CHECKED, color); @@ -370,7 +370,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_play_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_play_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_play_time_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_play_time_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_play_time_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_play_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_play_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_play_time_s0, LV_STATE_CHECKED, color); @@ -1063,7 +1063,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc6, 0xf4, 0xd3, 0x2e) ; lv_style_set_text_color(&label_file_time_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_file_time_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_file_time_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_file_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_file_time_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_time_s0, LV_STATE_CHECKED, color); @@ -1125,7 +1125,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_date_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_date_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc6, 0xf4, 0xd3, 0x2e) ; lv_style_set_text_color(&label_file_date_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_file_date_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_file_date_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_file_date_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_file_date_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_date_s0, LV_STATE_CHECKED, color); @@ -1334,7 +1334,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc6, 0xf4, 0xd3, 0x2e) ; lv_style_set_text_color(&label_file_size_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_file_size_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_file_size_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_file_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_file_size_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_size_s0, LV_STATE_CHECKED, color); @@ -1543,7 +1543,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_num_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_num_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_num_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_num_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_num_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_num_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_num_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_num_s0, LV_STATE_CHECKED, color); @@ -1605,7 +1605,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_1_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_CHECKED, color); @@ -1667,7 +1667,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_CHECKED, color); @@ -1898,7 +1898,7 @@ lv_obj_t* UIFlowPlay_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_playtime_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_playtime_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_playtime_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_playtime_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_playtime_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_playtime_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_playtime_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_playtime_s0, LV_STATE_CHECKED, color); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlayThumb/UIFlowPlayThumb.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlayThumb/UIFlowPlayThumb.c index 77125064d..0a8c5076a 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlayThumb/UIFlowPlayThumb.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlayThumb/UIFlowPlayThumb.c @@ -1543,7 +1543,7 @@ lv_obj_t* UIFlowPlayThumb_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_page_info_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_page_info_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xe7, 0xd9, 0xd9, 0xd9) ; lv_style_set_text_color(&label_page_info_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_page_info_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_page_info_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_page_info_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_page_info_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_page_info_s0, LV_STATE_CHECKED, color); @@ -1605,7 +1605,7 @@ lv_obj_t* UIFlowPlayThumb_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_file_name_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_file_name_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xe7, 0xd9, 0xd9, 0xd9) ; lv_style_set_text_color(&label_file_name_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_file_name_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_file_name_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3b, 0x3e, 0x42) ; lv_style_set_text_sel_color(&label_file_name_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_file_name_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_file_name_s0, LV_STATE_CHECKED, color); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c index 6c4787590..c0a68086f 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSB/UIFlowUSB.c @@ -70,7 +70,7 @@ lv_obj_t* UIFlowUSB_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbmode_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbmode_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_usbmode_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_usbmode_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_usbmode_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0x2f, 0x00, 0x9e, 0x84) ; lv_style_set_text_sel_color(&label_usbmode_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x0e, 0x00, 0x00, 0xff) ; lv_style_set_text_sel_bg_color(&label_usbmode_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbmode_s0, LV_STATE_CHECKED, color); @@ -118,8 +118,8 @@ lv_obj_t* UIFlowUSB_create(){ lv_label_set_text(label_usbmode,"Mass Storage"); lv_plugin_label_allocate_ext_attr(label_usbmode); lv_plugin_label_set_font_type(label_usbmode, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); - lv_obj_set_pos(label_usbmode, 99, 14); - lv_obj_set_size(label_usbmode, 108, 18); + lv_obj_set_pos(label_usbmode, 101, 14); + lv_obj_set_size(label_usbmode, 105, 20); lv_obj_add_style(label_usbmode, 0, &label_usbmode_s0); label_usbmode_scr_uiflowusb = label_usbmode; @@ -166,7 +166,7 @@ lv_obj_t* UIFlowUSB_create(){ lv_obj_set_hidden(image_usb, false); lv_obj_set_click(image_usb, false); lv_obj_set_drag(image_usb, false); - lv_obj_set_pos(image_usb, 139, 44); + lv_obj_set_pos(image_usb, 139, 46); lv_obj_set_size(image_usb, 28, 28); lv_img_set_src(image_usb, &icon_usb_on); lv_obj_add_style(image_usb, 0, &image_usb_s0); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSBMenu/UIFlowUSBMenu.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSBMenu/UIFlowUSBMenu.c index a1c8f6e1d..01d0bf578 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSBMenu/UIFlowUSBMenu.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowUSBMenu/UIFlowUSBMenu.c @@ -149,7 +149,7 @@ lv_obj_t* UIFlowUSBMenu_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_usbt_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_usbt_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_usbt_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_usbt_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_usbt_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_usbt_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_usbt_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_usbt_s0, LV_STATE_CHECKED, color); @@ -197,8 +197,8 @@ lv_obj_t* UIFlowUSBMenu_create(){ lv_label_set_text(label_usbt,"USB"); lv_plugin_label_allocate_ext_attr(label_usbt); lv_plugin_label_set_font_type(label_usbt, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); - lv_obj_set_pos(label_usbt, 33, 13); - lv_obj_set_size(label_usbt, 35, 18); + lv_obj_set_pos(label_usbt, 33, 12); + lv_obj_set_size(label_usbt, 33, 20); lv_obj_add_style(label_usbt, 0, &label_usbt_s0); label_usbt_scr_uiflowusbmenu = label_usbt; @@ -245,7 +245,7 @@ lv_obj_t* UIFlowUSBMenu_create(){ lv_obj_set_hidden(image_1, false); lv_obj_set_click(image_1, false); lv_obj_set_drag(image_1, false); - lv_obj_set_pos(image_1, 84, 8); + lv_obj_set_pos(image_1, 82, 8); lv_obj_set_size(image_1, 28, 28); lv_img_set_src(image_1, &icon_usb_on); lv_obj_add_style(image_1, 0, &image_1_s0); @@ -328,7 +328,7 @@ lv_obj_t* UIFlowUSBMenu_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_msdc_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_msdc_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_msdc_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_msdc_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_msdc_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_msdc_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_msdc_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_msdc_s0, LV_STATE_CHECKED, color); @@ -377,7 +377,7 @@ lv_obj_t* UIFlowUSBMenu_create(){ lv_plugin_label_allocate_ext_attr(label_msdc); lv_plugin_label_set_font_type(label_msdc, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_msdc, 33, 12); - lv_obj_set_size(label_msdc, 108, 18); + lv_obj_set_size(label_msdc, 105, 20); lv_obj_add_style(label_msdc, 0, &label_msdc_s0); label_msdc_scr_uiflowusbmenu = label_msdc; @@ -424,7 +424,7 @@ lv_obj_t* UIFlowUSBMenu_create(){ lv_obj_set_hidden(image_2, false); lv_obj_set_click(image_2, false); lv_obj_set_drag(image_2, false); - lv_obj_set_pos(image_2, 157, 12); + lv_obj_set_pos(image_2, 154, 12); lv_obj_set_size(image_2, 28, 28); lv_img_set_src(image_2, &icon_usb_msdc); lv_obj_add_style(image_2, 0, &image_2_s0); @@ -507,7 +507,7 @@ lv_obj_t* UIFlowUSBMenu_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pcc_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pcc_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_pcc_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_pcc_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_pcc_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pcc_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pcc_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pcc_s0, LV_STATE_CHECKED, color); @@ -556,7 +556,7 @@ lv_obj_t* UIFlowUSBMenu_create(){ lv_plugin_label_allocate_ext_attr(label_pcc); lv_plugin_label_set_font_type(label_pcc, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_pcc, 33, 12); - lv_obj_set_size(label_pcc, 92, 18); + lv_obj_set_size(label_pcc, 85, 20); lv_obj_add_style(label_pcc, 0, &label_pcc_s0); label_pcc_scr_uiflowusbmenu = label_pcc; @@ -603,7 +603,7 @@ lv_obj_t* UIFlowUSBMenu_create(){ lv_obj_set_hidden(image_3, false); lv_obj_set_click(image_3, false); lv_obj_set_drag(image_3, false); - lv_obj_set_pos(image_3, 141, 12); + lv_obj_set_pos(image_3, 134, 12); lv_obj_set_size(image_3, 28, 28); lv_img_set_src(image_3, &icon_usb_uvc); lv_obj_add_style(image_3, 0, &image_3_s0); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWaitMoment/UIFlowWaitMoment.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWaitMoment/UIFlowWaitMoment.c index 8c839d9e2..8e8367105 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWaitMoment/UIFlowWaitMoment.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWaitMoment/UIFlowWaitMoment.c @@ -69,7 +69,7 @@ lv_obj_t* UIFlowWaitMoment_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&label_1_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_CHECKED, color); diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLink/UIFlowWifiLink.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLink/UIFlowWifiLink.c index d7803b670..13b930fd5 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLink/UIFlowWifiLink.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLink/UIFlowWifiLink.c @@ -155,7 +155,7 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ref_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ref_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_ref_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_ref_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_ref_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ref_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ref_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ref_s0, LV_STATE_CHECKED, color); @@ -203,8 +203,8 @@ lv_obj_t* UIFlowWifiLink_create(){ lv_label_set_text(label_ref,"Refresh"); lv_plugin_label_allocate_ext_attr(label_ref); lv_plugin_label_set_font_type(label_ref, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); - lv_obj_set_pos(label_ref, 31, 8); - lv_obj_set_size(label_ref, 64, 18); + lv_obj_set_pos(label_ref, 33, 7); + lv_obj_set_size(label_ref, 60, 20); lv_obj_add_style(label_ref, 0, &label_ref_s0); label_ref_scr_uiflowwifilink = label_ref; @@ -285,7 +285,7 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifioff_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifioff_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf0, 0xea, 0xea, 0xea) ; lv_style_set_text_color(&label_wifioff_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_wifioff_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_wifioff_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifioff_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifioff_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifioff_s0, LV_STATE_CHECKED, color); @@ -333,8 +333,8 @@ lv_obj_t* UIFlowWifiLink_create(){ lv_label_set_text(label_wifioff,"WiFi_OFF"); lv_plugin_label_allocate_ext_attr(label_wifioff); lv_plugin_label_set_font_type(label_wifioff, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); - lv_obj_set_pos(label_wifioff, 24, 8); - lv_obj_set_size(label_wifioff, 77, 18); + lv_obj_set_pos(label_wifioff, 27, 7); + lv_obj_set_size(label_wifioff, 70, 20); lv_obj_add_style(label_wifioff, 0, &label_wifioff_s0); label_wifioff_scr_uiflowwifilink = label_wifioff; @@ -383,7 +383,7 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_1_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_CHECKED, color); @@ -431,7 +431,7 @@ lv_obj_t* UIFlowWifiLink_create(){ lv_plugin_label_allocate_ext_attr(label_1); lv_plugin_label_set_font_type(label_1, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_1, 23, 90); - lv_obj_set_size(label_1, 38, 18); + lv_obj_set_size(label_1, 37, 20); lv_obj_add_style(label_1, 0, &label_1_s0); label_1_scr_uiflowwifilink = label_1; @@ -443,7 +443,7 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_CHECKED, color); @@ -491,7 +491,7 @@ lv_obj_t* UIFlowWifiLink_create(){ lv_plugin_label_allocate_ext_attr(label_2); lv_plugin_label_set_font_type(label_2, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_2, 23, 127); - lv_obj_set_size(label_2, 29, 18); + lv_obj_set_size(label_2, 26, 20); lv_obj_add_style(label_2, 0, &label_2_s0); label_2_scr_uiflowwifilink = label_2; @@ -503,7 +503,7 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_ssid_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_ssid_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_ssid_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_ssid_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_ssid_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_ssid_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_ssid_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_ssid_s0, LV_STATE_CHECKED, color); @@ -551,7 +551,7 @@ lv_obj_t* UIFlowWifiLink_create(){ lv_plugin_label_allocate_ext_attr(label_ssid); lv_plugin_label_set_font_type(label_ssid, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_ssid, 101, 90); - lv_obj_set_size(label_ssid, 25, 18); + lv_obj_set_size(label_ssid, 23, 20); lv_obj_add_style(label_ssid, 0, &label_ssid_s0); label_ssid_scr_uiflowwifilink = label_ssid; @@ -563,7 +563,7 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_pwa2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_pwa2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_pwa2_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_pwa2_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_pwa2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_pwa2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_pwa2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_pwa2_s0, LV_STATE_CHECKED, color); @@ -611,7 +611,7 @@ lv_obj_t* UIFlowWifiLink_create(){ lv_plugin_label_allocate_ext_attr(label_pwa2); lv_plugin_label_set_font_type(label_pwa2, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_pwa2, 103, 128); - lv_obj_set_size(label_pwa2, 25, 18); + lv_obj_set_size(label_pwa2, 23, 20); lv_obj_add_style(label_pwa2, 0, &label_pwa2_s0); label_pwa2_scr_uiflowwifilink = label_pwa2; @@ -623,7 +623,7 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_3_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_3_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_3_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_3_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_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(0xc5, 0xff, 0xb4, 0x00) ; lv_style_set_bg_color(&label_3_s0, LV_STATE_CHECKED, color); @@ -671,7 +671,7 @@ lv_obj_t* UIFlowWifiLink_create(){ lv_plugin_label_allocate_ext_attr(label_3); lv_plugin_label_set_font_type(label_3, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_3, 23, 50); - lv_obj_set_size(label_3, 46, 18); + lv_obj_set_size(label_3, 43, 20); lv_obj_add_style(label_3, 0, &label_3_s0); label_3_scr_uiflowwifilink = label_3; @@ -683,7 +683,7 @@ lv_obj_t* UIFlowWifiLink_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifimode_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifimode_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifimode_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_wifimode_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_wifimode_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifimode_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifimode_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifimode_s0, LV_STATE_CHECKED, color); @@ -732,7 +732,7 @@ lv_obj_t* UIFlowWifiLink_create(){ lv_plugin_label_allocate_ext_attr(label_wifimode); lv_plugin_label_set_font_type(label_wifimode, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_wifimode, 101, 50); - lv_obj_set_size(label_wifimode, 76, 18); + lv_obj_set_size(label_wifimode, 68, 20); lv_obj_add_style(label_wifimode, 0, &label_wifimode_s0); label_wifimode_scr_uiflowwifilink = label_wifimode; diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLinkOK/UIFlowWifiLinkOK.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLinkOK/UIFlowWifiLinkOK.c index 1e8f16e32..d42dd9eb9 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLinkOK/UIFlowWifiLinkOK.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWifiLinkOK/UIFlowWifiLinkOK.c @@ -105,7 +105,7 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_select_msg_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_select_msg_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_select_msg_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_select_msg_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_select_msg_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_select_msg_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_select_msg_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_select_msg_s0, LV_STATE_CHECKED, color); @@ -152,8 +152,8 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ lv_label_set_text(label_select_msg,"Press Select to Disconnect"); lv_plugin_label_allocate_ext_attr(label_select_msg); lv_plugin_label_set_font_type(label_select_msg, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); - lv_obj_set_pos(label_select_msg, 29, 8); - lv_obj_set_size(label_select_msg, 213, 18); + lv_obj_set_pos(label_select_msg, 32, 7); + lv_obj_set_size(label_select_msg, 206, 20); lv_obj_add_style(label_select_msg, 0, &label_select_msg_s0); label_select_msg_scr_uiflowwifilinkok = label_select_msg; @@ -201,7 +201,7 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_2_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_2_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_2_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_2_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_2_s0, LV_STATE_CHECKED, color); @@ -249,7 +249,7 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ lv_plugin_label_allocate_ext_attr(label_2); lv_plugin_label_set_font_type(label_2, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_2, 15, 18); - lv_obj_set_size(label_2, 39, 18); + lv_obj_set_size(label_2, 37, 20); lv_obj_add_style(label_2, 0, &label_2_s0); label_2_scr_uiflowwifilinkok = label_2; @@ -261,7 +261,7 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_mac_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_mac_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_mac_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_mac_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_mac_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_mac_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_mac_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_mac_s0, LV_STATE_CHECKED, color); @@ -309,7 +309,7 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ lv_plugin_label_allocate_ext_attr(label_mac); lv_plugin_label_set_font_type(label_mac, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_mac, 92, 18); - lv_obj_set_size(label_mac, 156, 18); + lv_obj_set_size(label_mac, 149, 20); lv_obj_add_style(label_mac, 0, &label_mac_s0); label_mac_scr_uiflowwifilinkok = label_mac; @@ -321,7 +321,7 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_wifista_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_wifista_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xf8, 0xfd, 0xfd, 0xfd) ; lv_style_set_text_color(&label_wifista_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_wifista_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_wifista_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_wifista_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_wifista_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_wifista_s0, LV_STATE_CHECKED, color); @@ -369,7 +369,7 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ lv_plugin_label_allocate_ext_attr(label_wifista); lv_plugin_label_set_font_type(label_wifista, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_wifista, 92, 65); - lv_obj_set_size(label_wifista, 120, 18); + lv_obj_set_size(label_wifista, 113, 20); lv_obj_add_style(label_wifista, 0, &label_wifista_s0); label_wifista_scr_uiflowwifilinkok = label_wifista; @@ -381,7 +381,7 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xc4, 0xff, 0xa8, 0x00) ; lv_style_set_text_color(&label_1_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_1_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_1_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_1_s0, LV_STATE_CHECKED, color); @@ -429,7 +429,7 @@ lv_obj_t* UIFlowWifiLinkOK_create(){ lv_plugin_label_allocate_ext_attr(label_1); lv_plugin_label_set_font_type(label_1, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_obj_set_pos(label_1, 15, 65); - lv_obj_set_size(label_1, 53, 18); + lv_obj_set_size(label_1, 50, 20); lv_obj_add_style(label_1, 0, &label_1_s0); label_1_scr_uiflowwifilinkok = label_1; 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 6330450e6..3d2b0b236 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 @@ -47,6 +47,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_CHECKED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_CHECKED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_CHECKED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); @@ -55,6 +56,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_FOCUSED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_FOCUSED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_FOCUSED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_EDITED, color); @@ -63,6 +65,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_EDITED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_EDITED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_EDITED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_HOVERED, color); @@ -71,6 +74,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_HOVERED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_HOVERED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_HOVERED, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); @@ -79,6 +83,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_PRESSED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_PRESSED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_PRESSED, color); STYLE_COLOR_PROP(0xcc, 0x02, 0x62, 0xb6) ; lv_style_set_bg_color(&message_box_1_s0, LV_STATE_DISABLED, color); @@ -87,6 +92,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_outline_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x09, 0xc0, 0xc0, 0xc0) ; lv_style_set_shadow_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_text_color(&message_box_1_s0, LV_STATE_DISABLED, color); + lv_style_set_text_font(&message_box_1_s0,LV_STATE_DISABLED,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&message_box_1_s0, LV_STATE_DISABLED, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&message_box_1_s0, LV_STATE_DISABLED, color); lv_obj_t *message_box_1 = lv_msgbox_create(parent, NULL); @@ -94,7 +100,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ lv_obj_set_click(message_box_1, true); lv_obj_set_drag(message_box_1, false); lv_obj_set_pos(message_box_1, 55, 52); - lv_obj_set_size(message_box_1, 210, 134); + lv_obj_set_size(message_box_1, 210, 136); lv_plugin_msgbox_allocate_ext_attr(message_box_1); lv_plugin_msgbox_set_text(message_box_1, LV_PLUGIN_STRING_ID_STRID_NULL_); lv_msgbox_set_text(message_box_1,"\n"); @@ -164,7 +170,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_grad_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x01, 0x00, 0x00, 0x00) ; lv_style_set_border_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_color(&label_tips_s0, LV_STATE_DEFAULT, color); - lv_style_set_text_font(&label_tips_s0,LV_STATE_DEFAULT,&lv_font_montserrat_16); + lv_style_set_text_font(&label_tips_s0,LV_STATE_DEFAULT,&sf_ui_text_medium_16_1bpp); STYLE_COLOR_PROP(0xd3, 0x3c, 0x3c, 0x3c) ; lv_style_set_text_sel_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x3a, 0x00, 0xb4, 0x95) ; lv_style_set_text_sel_bg_color(&label_tips_s0, LV_STATE_DEFAULT, color); STYLE_COLOR_PROP(0x02, 0xff, 0xff, 0xff) ; lv_style_set_bg_color(&label_tips_s0, LV_STATE_CHECKED, color); @@ -213,7 +219,7 @@ lv_obj_t* UIFlowWrnMsg_create(){ lv_plugin_label_set_font_type(label_tips, LV_PLUGIN_LANGUAGE_FONT_TYPE_0); lv_label_set_long_mode(label_tips, LV_LABEL_LONG_BREAK); lv_obj_set_pos(label_tips, 13, 12); - lv_obj_set_size(label_tips, 184, 54); + lv_obj_set_size(label_tips, 184, 60); lv_obj_add_style(label_tips, 0, &label_tips_s0); label_tips_scr_uiflowwrnmsg = label_tips;