From 2e3223bb3bf241fd16d654b244fd201b6e1eda0c Mon Sep 17 00:00:00 2001 From: Yu Xifeng <2860280851@qq.com> Date: Mon, 20 Jan 2025 11:34:31 +0000 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=95=8C=E9=9D=A2=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main_app/GUI-Guider/generated/events_init.c | 34 +------------- main_app/GUI-Guider/generated/gui_guider.h | 4 +- .../generated/setup_scr_screen_home.c | 44 +++++-------------- 3 files changed, 13 insertions(+), 69 deletions(-) diff --git a/main_app/GUI-Guider/generated/events_init.c b/main_app/GUI-Guider/generated/events_init.c index 25e92ea..9765aa2 100755 --- a/main_app/GUI-Guider/generated/events_init.c +++ b/main_app/GUI-Guider/generated/events_init.c @@ -19,29 +19,14 @@ #include "guider_customer_fonts.h" #include "../custom/custom.h" #include "../custom/lv_conf_ext.h" - -static void set_global_font_for_tabview(lv_obj_t * tabview, const lv_font_t * font) { - static lv_style_t style; - lv_style_init(&style); - lv_style_set_text_font(&style, font); // 设置指定的字体[^1] - lv_obj_add_style(tabview, &style, LV_PART_MAIN | LV_STATE_DEFAULT); // 应用于主要部分 -} - void screen_home_init(lv_ui *ui) { #ifdef USE_CUSTOM_CODE lv_obj_set_style_text_font(ui->screen_home_table_1, lv_ft_MHEIGB[24].font, LV_PART_ITEMS|LV_STATE_DEFAULT); lv_obj_set_style_text_font(ui->screen_home_btnm_1, lv_ft_MHEIGB[24].font, LV_PART_ITEMS|LV_STATE_DEFAULT); - - // lv_obj_t *tab_btns = lv_tabview_get_tab_btns(ui->screen_home_tabview_2); - // set_global_font_for_tabview(tab_btns, lv_ft_MHEIGB[24].font); - - // // 设置标签栏的字体样式 - // lv_obj_set_style_text_font(tab_btns, lv_ft_MHEIGB[24].font, LV_PART_ITEMS | LV_STATE_DEFAULT); - - // lv_btnmatrix_set_btn_width(ui->screen_home_btnm_1, 0, LV_SIZE_CONTENT); // 设置所有按钮宽度自适应 + // lv_table_set_row_cnt(ui->screen_home_table_1,6); #endif - lv_table_set_col_width(ui->screen_home_table_1,0,60); + lv_table_set_col_width(ui->screen_home_table_1,0,70); } @@ -81,20 +66,6 @@ static void screen_home_tabview_1_event_handler (lv_event_t *e) } } -static void screen_home_btn_1_event_handler (lv_event_t *e) -{ - lv_event_code_t code = lv_event_get_code(e); - switch (code) { - case LV_EVENT_CLICKED: - { - lv_obj_clear_flag(guider_ui.screen_home_win_1, LV_OBJ_FLAG_HIDDEN); - break; - } - default: - break; - } -} - static void screen_home_btnm_1_event_handler (lv_event_t *e) { lv_event_code_t code = lv_event_get_code(e); @@ -147,7 +118,6 @@ static void screen_home_win_1_item0_event_handler (lv_event_t *e) void events_init_screen_home (lv_ui *ui) { lv_obj_add_event_cb(ui->screen_home_tabview_1, screen_home_tabview_1_event_handler, LV_EVENT_ALL, ui); - lv_obj_add_event_cb(ui->screen_home_btn_1, screen_home_btn_1_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_home_btnm_1, screen_home_btnm_1_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_home_win_1_item0, screen_home_win_1_item0_event_handler, LV_EVENT_ALL, ui); } diff --git a/main_app/GUI-Guider/generated/gui_guider.h b/main_app/GUI-Guider/generated/gui_guider.h index 4dd6509..439dbf0 100755 --- a/main_app/GUI-Guider/generated/gui_guider.h +++ b/main_app/GUI-Guider/generated/gui_guider.h @@ -30,19 +30,17 @@ typedef struct lv_obj_t *screen_home_tabview_1; lv_obj_t *screen_home_tabview_1_tab_1; lv_obj_t *screen_home_tabview_1_tab_2; - lv_obj_t *screen_home_btn_1; - lv_obj_t *screen_home_btn_1_label; lv_obj_t *screen_home_table_1; lv_obj_t *screen_home_btnm_1; lv_obj_t *screen_home_btn_2; lv_obj_t *screen_home_btn_2_label; lv_obj_t *screen_home_btnm_2; + lv_obj_t *screen_home_led_1; lv_obj_t *screen_home_tabview_2; lv_obj_t *screen_home_tabview_2_tab_1; lv_obj_t *screen_home_tabview_2_tab_2; lv_obj_t *screen_home_win_1; lv_obj_t *screen_home_win_1_item0; - lv_obj_t *screen_home_led_1; }lv_ui; typedef void (*ui_setup_scr_t)(lv_ui * ui); diff --git a/main_app/GUI-Guider/generated/setup_scr_screen_home.c b/main_app/GUI-Guider/generated/setup_scr_screen_home.c index abf879a..3230409 100755 --- a/main_app/GUI-Guider/generated/setup_scr_screen_home.c +++ b/main_app/GUI-Guider/generated/setup_scr_screen_home.c @@ -48,9 +48,9 @@ void setup_scr_screen_home(lv_ui *ui) lv_obj_set_style_shadow_width(ui->screen_home_cont_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); //Write codes screen_home_tabview_1 - ui->screen_home_tabview_1 = lv_tabview_create(ui->screen_home, LV_DIR_TOP, 50); - lv_obj_set_pos(ui->screen_home_tabview_1, 4, 104); - lv_obj_set_size(ui->screen_home_tabview_1, 943, 601); + ui->screen_home_tabview_1 = lv_tabview_create(ui->screen_home_cont_1, LV_DIR_TOP, 50); + lv_obj_set_pos(ui->screen_home_tabview_1, 0, 0); + lv_obj_set_size(ui->screen_home_tabview_1, 944, 660); lv_obj_set_scrollbar_mode(ui->screen_home_tabview_1, LV_SCROLLBAR_MODE_OFF); //Write style for screen_home_tabview_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. @@ -108,29 +108,6 @@ void setup_scr_screen_home(lv_ui *ui) lv_obj_t * screen_home_tabview_1_tab_1_label = lv_label_create(ui->screen_home_tabview_1_tab_1); lv_label_set_text(screen_home_tabview_1_tab_1_label, ""); - //Write codes screen_home_btn_1 - ui->screen_home_btn_1 = lv_btn_create(ui->screen_home_tabview_1_tab_1); - ui->screen_home_btn_1_label = lv_label_create(ui->screen_home_btn_1); - lv_label_set_text(ui->screen_home_btn_1_label, "Button"); - lv_label_set_long_mode(ui->screen_home_btn_1_label, LV_LABEL_LONG_WRAP); - lv_obj_align(ui->screen_home_btn_1_label, LV_ALIGN_CENTER, 0, 0); - lv_obj_set_style_pad_all(ui->screen_home_btn_1, 0, LV_STATE_DEFAULT); - lv_obj_set_width(ui->screen_home_btn_1_label, LV_PCT(100)); - lv_obj_set_pos(ui->screen_home_btn_1, -7, 414); - lv_obj_set_size(ui->screen_home_btn_1, 100, 50); - - //Write style for screen_home_btn_1, Part: LV_PART_MAIN, State: LV_STATE_DEFAULT. - lv_obj_set_style_bg_opa(ui->screen_home_btn_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_bg_color(ui->screen_home_btn_1, lv_color_hex(0x2195f6), LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_bg_grad_dir(ui->screen_home_btn_1, LV_GRAD_DIR_NONE, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_border_width(ui->screen_home_btn_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_radius(ui->screen_home_btn_1, 5, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_shadow_width(ui->screen_home_btn_1, 0, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_text_color(ui->screen_home_btn_1, lv_color_hex(0xffffff), LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_text_font(ui->screen_home_btn_1, &lv_font_montserratMedium_16, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_text_opa(ui->screen_home_btn_1, 255, LV_PART_MAIN|LV_STATE_DEFAULT); - lv_obj_set_style_text_align(ui->screen_home_btn_1, LV_TEXT_ALIGN_CENTER, LV_PART_MAIN|LV_STATE_DEFAULT); - //Write codes screen_home_table_1 ui->screen_home_table_1 = lv_table_create(ui->screen_home_tabview_1_tab_1); lv_table_set_col_cnt(ui->screen_home_table_1,6); @@ -279,6 +256,13 @@ void setup_scr_screen_home(lv_ui *ui) lv_obj_set_style_bg_grad_dir(ui->screen_home_btnm_2, LV_GRAD_DIR_NONE, LV_PART_ITEMS|LV_STATE_DEFAULT); lv_obj_set_style_shadow_width(ui->screen_home_btnm_2, 0, LV_PART_ITEMS|LV_STATE_DEFAULT); + //Write codes screen_home_led_1 + ui->screen_home_led_1 = lv_led_create(ui->screen_home_cont_1); + lv_led_set_brightness(ui->screen_home_led_1, 195); + lv_led_set_color(ui->screen_home_led_1, lv_color_hex(0x00fcff)); + lv_obj_set_pos(ui->screen_home_led_1, 15, 679); + lv_obj_set_size(ui->screen_home_led_1, 42, 26); + //Write codes screen_home_tabview_2 ui->screen_home_tabview_2 = lv_tabview_create(ui->screen_home, LV_DIR_TOP, 50); lv_obj_set_pos(ui->screen_home_tabview_2, 954, 314); @@ -345,7 +329,6 @@ void setup_scr_screen_home(lv_ui *ui) lv_obj_t * screen_home_tabview_2_tab_2_label = lv_label_create(ui->screen_home_tabview_2_tab_2); lv_label_set_text(screen_home_tabview_2_tab_2_label, "con2"); - //Write codes screen_home_win_1 ui->screen_home_win_1 = lv_win_create(ui->screen_home, 40); lv_obj_t * screen_home_win_1_title = lv_win_add_title(ui->screen_home_win_1, "title"); @@ -410,13 +393,6 @@ void setup_scr_screen_home(lv_ui *ui) lv_style_set_shadow_width(&style_screen_home_win_1_extra_btns_main_default, 0); lv_obj_add_style(ui->screen_home_win_1_item0, &style_screen_home_win_1_extra_btns_main_default, LV_PART_MAIN|LV_STATE_DEFAULT); - //Write codes screen_home_led_1 - ui->screen_home_led_1 = lv_led_create(ui->screen_home); - lv_led_set_brightness(ui->screen_home_led_1, 195); - lv_led_set_color(ui->screen_home_led_1, lv_color_hex(0x00fcff)); - lv_obj_set_pos(ui->screen_home_led_1, 1219, 382); - lv_obj_set_size(ui->screen_home_led_1, 42, 26); - //The custom code of screen_home.