From b19e150cea27f8826228accfb862590608c3f5fb Mon Sep 17 00:00:00 2001 From: ipason Date: Tue, 22 Apr 2025 11:11:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9EBS=E4=BA=8B=E4=BB=B6=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E7=A7=BB=E6=A4=8D=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FluxUI/fonts/ui_font_homePanelLabel.c | 58 ++++++++----- components/FluxUI/screens/ui_pageHome.c | 84 ++++++++++++------- components/FluxUI/ui.c | 22 +++++ components/FluxUI/ui.h | 4 + components/FluxUI/ui_event_homePage.c | 9 ++ components/FluxUI/ui_events.h | 2 + 6 files changed, 128 insertions(+), 51 deletions(-) diff --git a/components/FluxUI/fonts/ui_font_homePanelLabel.c b/components/FluxUI/fonts/ui_font_homePanelLabel.c index 4f5d50d..3fec62f 100644 --- a/components/FluxUI/fonts/ui_font_homePanelLabel.c +++ b/components/FluxUI/fonts/ui_font_homePanelLabel.c @@ -1,7 +1,7 @@ /******************************************************************************* * Size: 25 px * Bpp: 2 - * Opts: --bpp 2 --size 25 --font E:/FluxDC/SquareLineProj/assets/MiSans-Medium.otf -o E:/FluxDC/SquareLineProj/assets\ui_font_homePanelLabel.c --format lvgl -r 0x20-0x7f --symbols 开始测试1档：标称体积平均体积ml呼吸频率BPM累积体积 --no-compress --no-prefilter + * Opts: --bpp 2 --size 25 --font C:/Users/jarvis/Documents/FluxDC/SquareLineProj/assets/MiSans-Medium.otf -o C:/Users/jarvis/Documents/FluxDC/SquareLineProj/assets\ui_font_homePanelLabel.c --format lvgl -r 0x20-0x7f --symbols 开始测试1档：标称体积平均体积ml呼吸频率BPM累积体积带BS测试 --no-compress --no-prefilter ******************************************************************************/ #include "../ui.h" @@ -977,6 +977,25 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = { 0x0, 0xf4, 0x0, 0x3c, 0x8, 0x0, 0x3, 0xc0, 0x0, 0xf0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, + /* U+5E26 "带" */ + 0x0, 0x38, 0x3, 0x80, 0x74, 0x0, 0x0, 0xf0, + 0x1e, 0x2, 0xd0, 0x1, 0x57, 0xd5, 0xbd, 0x5b, + 0x95, 0xf, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x2a, + 0xbe, 0xab, 0xea, 0xfe, 0xa4, 0x0, 0xf0, 0x1e, + 0x2, 0xd0, 0x0, 0x3, 0xc0, 0x78, 0xb, 0x40, + 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1f, 0xff, + 0xff, 0xff, 0xff, 0xf0, 0x7f, 0xff, 0xff, 0xff, + 0xff, 0xc1, 0xe0, 0x0, 0x0, 0x0, 0xf, 0x7, + 0x80, 0x1, 0xf0, 0x0, 0x3c, 0x4, 0x0, 0x7, + 0xc0, 0x0, 0x50, 0x7, 0xff, 0xff, 0xff, 0xfc, + 0x0, 0x1f, 0xff, 0xff, 0xff, 0xf0, 0x0, 0x78, + 0x1, 0xf0, 0x3, 0xc0, 0x1, 0xe0, 0x7, 0xc0, + 0xf, 0x0, 0x7, 0x80, 0x1f, 0x0, 0x3c, 0x0, + 0x1e, 0x0, 0x7c, 0x2, 0xf0, 0x0, 0x78, 0x1, + 0xf3, 0xff, 0x80, 0x1, 0xe0, 0x7, 0xcb, 0xf8, + 0x0, 0x0, 0x0, 0x1f, 0x0, 0x0, 0x0, 0x0, + 0x0, 0x7c, 0x0, 0x0, 0x0, + /* U+5E73 "平" */ 0xf, 0xff, 0xff, 0xff, 0xff, 0xe0, 0x3f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x0, 0x0, 0x7c, 0x0, @@ -1302,18 +1321,19 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { {.bitmap_index = 5316, .adv_w = 400, .box_w = 22, .box_h = 22, .ofs_x = 2, .ofs_y = -1}, {.bitmap_index = 5437, .adv_w = 400, .box_w = 22, .box_h = 23, .ofs_x = 1, .ofs_y = -1}, {.bitmap_index = 5564, .adv_w = 400, .box_w = 23, .box_h = 25, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 5708, .adv_w = 400, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 5835, .adv_w = 400, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 5968, .adv_w = 400, .box_w = 24, .box_h = 23, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 6106, .adv_w = 400, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 6239, .adv_w = 400, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 6371, .adv_w = 400, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 6509, .adv_w = 400, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, - {.bitmap_index = 6642, .adv_w = 400, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 6780, .adv_w = 400, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 6907, .adv_w = 400, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 7045, .adv_w = 400, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 7183, .adv_w = 400, .box_w = 4, .box_h = 15, .ofs_x = 4, .ofs_y = -1} + {.bitmap_index = 5708, .adv_w = 400, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 5841, .adv_w = 400, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 5968, .adv_w = 400, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 6101, .adv_w = 400, .box_w = 24, .box_h = 23, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 6239, .adv_w = 400, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 6372, .adv_w = 400, .box_w = 22, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 6504, .adv_w = 400, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 6642, .adv_w = 400, .box_w = 23, .box_h = 23, .ofs_x = 1, .ofs_y = -3}, + {.bitmap_index = 6775, .adv_w = 400, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 6913, .adv_w = 400, .box_w = 23, .box_h = 22, .ofs_x = 1, .ofs_y = -1}, + {.bitmap_index = 7040, .adv_w = 400, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 7178, .adv_w = 400, .box_w = 23, .box_h = 24, .ofs_x = 1, .ofs_y = -2}, + {.bitmap_index = 7316, .adv_w = 400, .box_w = 4, .box_h = 15, .ofs_x = 4, .ofs_y = -1} }; /*--------------------- @@ -1321,9 +1341,9 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { *--------------------*/ static const uint16_t unicode_list_1[] = { - 0x0, 0x4e5, 0x529, 0x7f4, 0xa78, 0xf20, 0xfad, 0x18b4, - 0x1910, 0x1df8, 0x2434, 0x2a9c, 0x2a9d, 0x2ddc, 0x3c82, 0x493e, - 0xafc7 + 0x0, 0x4e5, 0x529, 0x7f4, 0xa78, 0xed3, 0xf20, 0xfad, + 0x18b4, 0x1910, 0x1df8, 0x2434, 0x2a9c, 0x2a9d, 0x2ddc, 0x3c82, + 0x493e, 0xafc7 }; /*Collect the unicode lists and glyph_id offsets*/ @@ -1335,7 +1355,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = }, { .range_start = 20307, .range_length = 45000, .glyph_id_start = 97, - .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 17, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY + .unicode_list = unicode_list_1, .glyph_id_ofs_list = NULL, .list_length = 18, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY } }; @@ -1361,7 +1381,7 @@ static const uint8_t kern_left_class_mapping[] = 50, 51, 49, 52, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0 + 0, 0, 0 }; /*Map glyph_ids to kern right classes*/ @@ -1381,7 +1401,7 @@ static const uint8_t kern_right_class_mapping[] = 38, 39, 37, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0 + 0, 0, 0 }; /*Kern values between classes*/ diff --git a/components/FluxUI/screens/ui_pageHome.c b/components/FluxUI/screens/ui_pageHome.c index ddd4429..548d168 100644 --- a/components/FluxUI/screens/ui_pageHome.c +++ b/components/FluxUI/screens/ui_pageHome.c @@ -95,9 +95,9 @@ void ui_pageHome_screen_init(void) ui_pageHome_panelBody = lv_obj_create(ui_pageHome); lv_obj_set_width(ui_pageHome_panelBody, 320); - lv_obj_set_height(ui_pageHome_panelBody, 360); + lv_obj_set_height(ui_pageHome_panelBody, 440); lv_obj_set_x(ui_pageHome_panelBody, 0); - lv_obj_set_y(ui_pageHome_panelBody, -30); + lv_obj_set_y(ui_pageHome_panelBody, 15); lv_obj_set_align(ui_pageHome_panelBody, LV_ALIGN_CENTER); lv_obj_add_flag(ui_pageHome_panelBody, LV_OBJ_FLAG_SCROLL_ONE); /// Flags lv_obj_set_scrollbar_mode(ui_pageHome_panelBody, LV_SCROLLBAR_MODE_ACTIVE); @@ -112,8 +112,8 @@ void ui_pageHome_screen_init(void) ui_pageHome_panelRight = lv_obj_create(ui_pageHome_panelBody); lv_obj_set_width(ui_pageHome_panelRight, 320); lv_obj_set_height(ui_pageHome_panelRight, 360); - lv_obj_set_x(ui_pageHome_panelRight, 322); - lv_obj_set_y(ui_pageHome_panelRight, 7); + lv_obj_set_x(ui_pageHome_panelRight, 323); + lv_obj_set_y(ui_pageHome_panelRight, -37); lv_obj_set_align(ui_pageHome_panelRight, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelRight, LV_OBJ_FLAG_SCROLLABLE); /// Flags lv_obj_set_style_radius(ui_pageHome_panelRight, 0, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -270,18 +270,36 @@ void ui_pageHome_screen_init(void) ui_pageHome_panelCenter = lv_obj_create(ui_pageHome_panelBody); lv_obj_set_width(ui_pageHome_panelCenter, 297); - lv_obj_set_height(ui_pageHome_panelCenter, 355); + lv_obj_set_height(ui_pageHome_panelCenter, 430); lv_obj_set_x(ui_pageHome_panelCenter, 0); - lv_obj_set_y(ui_pageHome_panelCenter, 2); + lv_obj_set_y(ui_pageHome_panelCenter, -1); lv_obj_set_align(ui_pageHome_panelCenter, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelCenter, LV_OBJ_FLAG_SCROLLABLE); /// Flags lv_obj_set_style_radius(ui_pageHome_panelCenter, 15, LV_PART_MAIN | LV_STATE_DEFAULT); + ui_pageHome_buttonStartTestBS = lv_btn_create(ui_pageHome_panelCenter); + lv_obj_set_width(ui_pageHome_buttonStartTestBS, 266); + lv_obj_set_height(ui_pageHome_buttonStartTestBS, 61); + lv_obj_set_x(ui_pageHome_buttonStartTestBS, 0); + lv_obj_set_y(ui_pageHome_buttonStartTestBS, 169); + lv_obj_set_align(ui_pageHome_buttonStartTestBS, LV_ALIGN_CENTER); + lv_obj_set_style_bg_color(ui_pageHome_buttonStartTestBS, lv_color_hex(0x4A58DD), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_bg_opa(ui_pageHome_buttonStartTestBS, 255, LV_PART_MAIN | LV_STATE_DEFAULT); + + ui_pageHome_labelStartTest1 = lv_label_create(ui_pageHome_buttonStartTestBS); + lv_obj_set_width(ui_pageHome_labelStartTest1, LV_SIZE_CONTENT); /// 1 + lv_obj_set_height(ui_pageHome_labelStartTest1, LV_SIZE_CONTENT); /// 1 + lv_obj_set_x(ui_pageHome_labelStartTest1, 3); + lv_obj_set_y(ui_pageHome_labelStartTest1, 3); + lv_obj_set_align(ui_pageHome_labelStartTest1, LV_ALIGN_CENTER); + lv_label_set_text(ui_pageHome_labelStartTest1, "带BS测试"); + lv_obj_set_style_text_font(ui_pageHome_labelStartTest1, &ui_font_homePanelLabel, LV_PART_MAIN | LV_STATE_DEFAULT); + ui_pageHome_panelResult1 = lv_obj_create(ui_pageHome_panelCenter); lv_obj_set_width(ui_pageHome_panelResult1, 266); lv_obj_set_height(ui_pageHome_panelResult1, 202); - lv_obj_set_x(ui_pageHome_panelResult1, -1); - lv_obj_set_y(ui_pageHome_panelResult1, -66); + lv_obj_set_x(ui_pageHome_panelResult1, 0); + lv_obj_set_y(ui_pageHome_panelResult1, -103); lv_obj_set_align(ui_pageHome_panelResult1, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelResult1, LV_OBJ_FLAG_SCROLLABLE); /// Flags @@ -653,8 +671,8 @@ void ui_pageHome_screen_init(void) ui_pageHome_panelStageBS = lv_obj_create(ui_pageHome_panelCenter); lv_obj_set_width(ui_pageHome_panelStageBS, 266); lv_obj_set_height(ui_pageHome_panelStageBS, 122); - lv_obj_set_x(ui_pageHome_panelStageBS, -1); - lv_obj_set_y(ui_pageHome_panelStageBS, 105); + lv_obj_set_x(ui_pageHome_panelStageBS, 0); + lv_obj_set_y(ui_pageHome_panelStageBS, 68); lv_obj_set_align(ui_pageHome_panelStageBS, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelStageBS, LV_OBJ_FLAG_SCROLLABLE); /// Flags @@ -734,9 +752,9 @@ void ui_pageHome_screen_init(void) ui_pageHome_panelLeft = lv_obj_create(ui_pageHome_panelBody); lv_obj_set_width(ui_pageHome_panelLeft, 297); - lv_obj_set_height(ui_pageHome_panelLeft, 355); - lv_obj_set_x(ui_pageHome_panelLeft, -317); - lv_obj_set_y(ui_pageHome_panelLeft, 3); + lv_obj_set_height(ui_pageHome_panelLeft, 430); + lv_obj_set_x(ui_pageHome_panelLeft, -313); + lv_obj_set_y(ui_pageHome_panelLeft, -2); lv_obj_set_align(ui_pageHome_panelLeft, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelLeft, LV_OBJ_FLAG_SCROLLABLE); /// Flags lv_obj_set_style_radius(ui_pageHome_panelLeft, 15, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -745,7 +763,7 @@ void ui_pageHome_screen_init(void) lv_obj_set_width(ui_pageHome_panelNominal, 266); lv_obj_set_height(ui_pageHome_panelNominal, 50); lv_obj_set_x(ui_pageHome_panelNominal, 0); - lv_obj_set_y(ui_pageHome_panelNominal, -87); + lv_obj_set_y(ui_pageHome_panelNominal, -118); lv_obj_set_align(ui_pageHome_panelNominal, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelNominal, LV_OBJ_FLAG_SCROLLABLE); /// Flags @@ -794,7 +812,7 @@ void ui_pageHome_screen_init(void) lv_obj_set_width(ui_pageHome_panelRate, 266); lv_obj_set_height(ui_pageHome_panelRate, 100); lv_obj_set_x(ui_pageHome_panelRate, 0); - lv_obj_set_y(ui_pageHome_panelRate, -5); + lv_obj_set_y(ui_pageHome_panelRate, -33); lv_obj_set_align(ui_pageHome_panelRate, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelRate, LV_OBJ_FLAG_SCROLLABLE); /// Flags @@ -866,8 +884,8 @@ void ui_pageHome_screen_init(void) ui_pageHome_panelResult = lv_obj_create(ui_pageHome_panelLeft); lv_obj_set_width(ui_pageHome_panelResult, 266); lv_obj_set_height(ui_pageHome_panelResult, 50); - lv_obj_set_x(ui_pageHome_panelResult, 0); - lv_obj_set_y(ui_pageHome_panelResult, -141); + lv_obj_set_x(ui_pageHome_panelResult, 1); + lv_obj_set_y(ui_pageHome_panelResult, -178); lv_obj_set_align(ui_pageHome_panelResult, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelResult, LV_OBJ_FLAG_SCROLLABLE); /// Flags @@ -894,7 +912,7 @@ void ui_pageHome_screen_init(void) lv_obj_set_width(ui_pageHome_panelStage, 266); lv_obj_set_height(ui_pageHome_panelStage, 80); lv_obj_set_x(ui_pageHome_panelStage, 0); - lv_obj_set_y(ui_pageHome_panelStage, 90); + lv_obj_set_y(ui_pageHome_panelStage, 64); lv_obj_set_align(ui_pageHome_panelStage, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelStage, LV_OBJ_FLAG_SCROLLABLE); /// Flags @@ -976,7 +994,7 @@ void ui_pageHome_screen_init(void) lv_obj_set_width(ui_pageHome_labelstr1, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_pageHome_labelstr1, LV_SIZE_CONTENT); /// 1 lv_obj_set_x(ui_pageHome_labelstr1, -98); - lv_obj_set_y(ui_pageHome_labelstr1, 156); + lv_obj_set_y(ui_pageHome_labelstr1, 122); lv_obj_set_align(ui_pageHome_labelstr1, LV_ALIGN_CENTER); lv_label_set_text(ui_pageHome_labelstr1, "测试结果:"); lv_obj_set_style_text_font(ui_pageHome_labelstr1, &ui_font_MiSansN, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -985,7 +1003,7 @@ void ui_pageHome_screen_init(void) lv_obj_set_width(ui_pageHome_labelstr2, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_pageHome_labelstr2, LV_SIZE_CONTENT); /// 1 lv_obj_set_x(ui_pageHome_labelstr2, -27); - lv_obj_set_y(ui_pageHome_labelstr2, 156); + lv_obj_set_y(ui_pageHome_labelstr2, 123); lv_obj_set_align(ui_pageHome_labelstr2, LV_ALIGN_CENTER); lv_label_set_text(ui_pageHome_labelstr2, "档"); lv_obj_set_style_text_font(ui_pageHome_labelstr2, &ui_font_MiSansN, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -993,8 +1011,8 @@ void ui_pageHome_screen_init(void) ui_pageHome_panelTestResult = lv_obj_create(ui_pageHome_panelLeft); lv_obj_set_width(ui_pageHome_panelTestResult, 30); lv_obj_set_height(ui_pageHome_panelTestResult, 30); - lv_obj_set_x(ui_pageHome_panelTestResult, 75); - lv_obj_set_y(ui_pageHome_panelTestResult, 155); + lv_obj_set_x(ui_pageHome_panelTestResult, 81); + lv_obj_set_y(ui_pageHome_panelTestResult, 122); lv_obj_set_align(ui_pageHome_panelTestResult, LV_ALIGN_CENTER); lv_obj_clear_flag(ui_pageHome_panelTestResult, LV_OBJ_FLAG_SCROLLABLE); /// Flags @@ -1009,8 +1027,8 @@ void ui_pageHome_screen_init(void) ui_pageHome_labelResultStage = lv_label_create(ui_pageHome_panelLeft); lv_obj_set_width(ui_pageHome_labelResultStage, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_pageHome_labelResultStage, LV_SIZE_CONTENT); /// 1 - lv_obj_set_x(ui_pageHome_labelResultStage, -51); - lv_obj_set_y(ui_pageHome_labelResultStage, 157); + lv_obj_set_x(ui_pageHome_labelResultStage, -52); + lv_obj_set_y(ui_pageHome_labelResultStage, 122); lv_obj_set_align(ui_pageHome_labelResultStage, LV_ALIGN_CENTER); lv_label_set_text(ui_pageHome_labelResultStage, "1"); lv_obj_set_style_text_decor(ui_pageHome_labelResultStage, LV_TEXT_DECOR_UNDERLINE, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -1019,7 +1037,7 @@ void ui_pageHome_screen_init(void) lv_obj_set_width(ui_pageHome_labelResultRate, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_pageHome_labelResultRate, LV_SIZE_CONTENT); /// 1 lv_obj_set_x(ui_pageHome_labelResultRate, -1); - lv_obj_set_y(ui_pageHome_labelResultRate, 157); + lv_obj_set_y(ui_pageHome_labelResultRate, 123); lv_obj_set_align(ui_pageHome_labelResultRate, LV_ALIGN_CENTER); lv_label_set_text(ui_pageHome_labelResultRate, "15"); lv_obj_set_style_text_decor(ui_pageHome_labelResultRate, LV_TEXT_DECOR_UNDERLINE, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -1027,8 +1045,8 @@ void ui_pageHome_screen_init(void) ui_pageHome_labelstr3 = lv_label_create(ui_pageHome_panelLeft); lv_obj_set_width(ui_pageHome_labelstr3, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_pageHome_labelstr3, LV_SIZE_CONTENT); /// 1 - lv_obj_set_x(ui_pageHome_labelstr3, 34); - lv_obj_set_y(ui_pageHome_labelstr3, 156); + lv_obj_set_x(ui_pageHome_labelstr3, 38); + lv_obj_set_y(ui_pageHome_labelstr3, 124); lv_obj_set_align(ui_pageHome_labelstr3, LV_ALIGN_CENTER); lv_label_set_text(ui_pageHome_labelstr3, "BPM"); lv_obj_set_style_text_font(ui_pageHome_labelstr3, &ui_font_MiSansN, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -1036,17 +1054,17 @@ void ui_pageHome_screen_init(void) ui_pageHome_labelResultCompare = lv_label_create(ui_pageHome_panelLeft); lv_obj_set_width(ui_pageHome_labelResultCompare, LV_SIZE_CONTENT); /// 1 lv_obj_set_height(ui_pageHome_labelResultCompare, LV_SIZE_CONTENT); /// 1 - lv_obj_set_x(ui_pageHome_labelResultCompare, 114); - lv_obj_set_y(ui_pageHome_labelResultCompare, 156); + lv_obj_set_x(ui_pageHome_labelResultCompare, 118); + lv_obj_set_y(ui_pageHome_labelResultCompare, 123); lv_obj_set_align(ui_pageHome_labelResultCompare, LV_ALIGN_CENTER); lv_label_set_text(ui_pageHome_labelResultCompare, "Low"); lv_obj_set_style_text_font(ui_pageHome_labelResultCompare, &ui_font_MiSansM, LV_PART_MAIN | LV_STATE_DEFAULT); - ui_pageHome_buttonStartTest = lv_btn_create(ui_pageHome); - lv_obj_set_width(ui_pageHome_buttonStartTest, 296); + ui_pageHome_buttonStartTest = lv_btn_create(ui_pageHome_panelLeft); + lv_obj_set_width(ui_pageHome_buttonStartTest, 266); lv_obj_set_height(ui_pageHome_buttonStartTest, 61); lv_obj_set_x(ui_pageHome_buttonStartTest, 3); - lv_obj_set_y(ui_pageHome_buttonStartTest, 194); + lv_obj_set_y(ui_pageHome_buttonStartTest, 170); lv_obj_set_align(ui_pageHome_buttonStartTest, LV_ALIGN_CENTER); lv_obj_set_style_bg_color(ui_pageHome_buttonStartTest, lv_color_hex(0x4A58DD), LV_PART_MAIN | LV_STATE_DEFAULT); lv_obj_set_style_bg_opa(ui_pageHome_buttonStartTest, 255, LV_PART_MAIN | LV_STATE_DEFAULT); @@ -1088,6 +1106,8 @@ void ui_pageHome_screen_init(void) lv_obj_add_event_cb(ui_pageHome_labelDebug, ui_event_pageHome_labelDebug, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageHome_imgbuttonFluxRead, ui_event_pageHome_imgbuttonFluxRead, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageHome_labelFluxRead, ui_event_pageHome_labelFluxRead, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageHome_buttonStartTestBS, ui_event_pageHome_buttonStartTestBS, LV_EVENT_ALL, NULL); + lv_obj_add_event_cb(ui_pageHome_DropdownTestTypeBS, ui_event_pageHome_DropdownTestTypeBS, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageHome_buttonMinusBS, ui_event_pageHome_buttonMinusBS, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageHome_buttonAddBS, ui_event_pageHome_buttonAddBS, LV_EVENT_ALL, NULL); lv_obj_add_event_cb(ui_pageHome_spinboxStageBS, ui_event_pageHome_spinboxStageBS, LV_EVENT_ALL, NULL); diff --git a/components/FluxUI/ui.c b/components/FluxUI/ui.c index 088c11e..c6544d4 100644 --- a/components/FluxUI/ui.c +++ b/components/FluxUI/ui.c @@ -49,6 +49,9 @@ void ui_event_pageHome_labelFluxRead(lv_event_t * e); lv_obj_t * ui_pageHome_labelFluxRead; lv_obj_t * ui_pageHome_str1; lv_obj_t * ui_pageHome_panelCenter; +void ui_event_pageHome_buttonStartTestBS(lv_event_t * e); +lv_obj_t * ui_pageHome_buttonStartTestBS; +lv_obj_t * ui_pageHome_labelStartTest1; lv_obj_t * ui_pageHome_panelResult1; lv_obj_t * ui_pageHome_labelstr9; lv_obj_t * ui_pageHome_labelstr8; @@ -87,6 +90,7 @@ lv_obj_t * ui_pageHome_LabelRate35DOWN; lv_obj_t * ui_pageHome_LabelRate40DOWN; lv_obj_t * ui_pageHome_labelstr20; lv_obj_t * ui_pageHome_BarTestProgBS; +void ui_event_pageHome_DropdownTestTypeBS(lv_event_t * e); lv_obj_t * ui_pageHome_DropdownTestTypeBS; lv_obj_t * ui_pageHome_labelstr21; lv_obj_t * ui_pageHome_labelstr7; @@ -513,6 +517,24 @@ void ui_event_pageHome_labelFluxRead(lv_event_t * e) } } +void ui_event_pageHome_buttonStartTestBS(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_CLICKED) { + on_buttonStartTestBS_clicked(e); + } +} + +void ui_event_pageHome_DropdownTestTypeBS(lv_event_t * e) +{ + lv_event_code_t event_code = lv_event_get_code(e); + + if(event_code == LV_EVENT_VALUE_CHANGED) { + on_dropdown_deviceTypeBS_valueChanged(e); + } +} + void ui_event_pageHome_buttonMinusBS(lv_event_t * e) { lv_event_code_t event_code = lv_event_get_code(e); diff --git a/components/FluxUI/ui.h b/components/FluxUI/ui.h index 0ef60ba..2fdfa96 100644 --- a/components/FluxUI/ui.h +++ b/components/FluxUI/ui.h @@ -59,6 +59,9 @@ void ui_event_pageHome_labelFluxRead(lv_event_t * e); extern lv_obj_t * ui_pageHome_labelFluxRead; extern lv_obj_t * ui_pageHome_str1; extern lv_obj_t * ui_pageHome_panelCenter; +void ui_event_pageHome_buttonStartTestBS(lv_event_t * e); +extern lv_obj_t * ui_pageHome_buttonStartTestBS; +extern lv_obj_t * ui_pageHome_labelStartTest1; extern lv_obj_t * ui_pageHome_panelResult1; extern lv_obj_t * ui_pageHome_labelstr9; extern lv_obj_t * ui_pageHome_labelstr8; @@ -97,6 +100,7 @@ extern lv_obj_t * ui_pageHome_LabelRate35DOWN; extern lv_obj_t * ui_pageHome_LabelRate40DOWN; extern lv_obj_t * ui_pageHome_labelstr20; extern lv_obj_t * ui_pageHome_BarTestProgBS; +void ui_event_pageHome_DropdownTestTypeBS(lv_event_t * e); extern lv_obj_t * ui_pageHome_DropdownTestTypeBS; extern lv_obj_t * ui_pageHome_labelstr21; extern lv_obj_t * ui_pageHome_labelstr7; diff --git a/components/FluxUI/ui_event_homePage.c b/components/FluxUI/ui_event_homePage.c index 0f00e40..9dc360d 100644 --- a/components/FluxUI/ui_event_homePage.c +++ b/components/FluxUI/ui_event_homePage.c @@ -423,4 +423,13 @@ static void comulate_result_read(lv_timer_t * timer) ESP_ERROR_CHECK(ModbusRTU_Send_0306(ECHO_UART_PORT_NUM1,&flux_frame)); lv_label_set_text(ui_pageHome_labelStartTest,"Test Complete!"); +} + +void on_buttonStartTestBS_clicked(lv_event_t * e) +{ + +} +void on_dropdown_deviceTypeBS_valueChanged(lv_event_t * e) +{ + } \ No newline at end of file diff --git a/components/FluxUI/ui_events.h b/components/FluxUI/ui_events.h index 1775e18..c24db88 100644 --- a/components/FluxUI/ui_events.h +++ b/components/FluxUI/ui_events.h @@ -10,6 +10,8 @@ extern "C" { #endif +void on_buttonStartTestBS_clicked(lv_event_t * e); +void on_dropdown_deviceTypeBS_valueChanged(lv_event_t * e); void on_spinboxStage_valueChanged(lv_event_t * e); void on_spinboxRate_valueChanged(lv_event_t * e); void on_buttonRateMinus_clicked(lv_event_t * e);