diff --git a/main/GUI/custom/custom.c b/main/GUI/custom/custom.c index c7727af..996cff2 100644 --- a/main/GUI/custom/custom.c +++ b/main/GUI/custom/custom.c @@ -38,5 +38,8 @@ void custom_init(lv_ui *ui) { /* Add your codes here */ + guider_ui.home_btn_group = lv_group_create(); //创建组 + guider_ui.imglist_group = lv_group_create(); + guider_ui.file_btn_group = lv_group_create(); } diff --git a/main/GUI/generated/events_init.c b/main/GUI/generated/events_init.c index 17af8a3..83542ef 100644 --- a/main/GUI/generated/events_init.c +++ b/main/GUI/generated/events_init.c @@ -14,7 +14,7 @@ #if LV_USE_GUIDER_SIMULATOR && LV_USE_FREEMASTER #include "freemaster_client.h" #endif -extern lv_group_t *Key_Matrix_Group; +extern lv_indev_t *lvgl_button_indev; static void screen_btn_1_event_handler (lv_event_t *e) { @@ -22,10 +22,10 @@ static void screen_btn_1_event_handler (lv_event_t *e) switch (code) { case LV_EVENT_CLICKED: { - lv_group_remove_all_objs(Key_Matrix_Group); + lv_group_remove_all_objs(guider_ui.home_btn_group); ui_load_scr_animation(&guider_ui, &guider_ui.screen_imglist, guider_ui.screen_imglist_del, &guider_ui.screen_del, setup_scr_screen_imglist, LV_SCR_LOAD_ANIM_OVER_LEFT, 200, 200, false, false); - lv_group_add_obj(Key_Matrix_Group,guider_ui.screen_imglist_ddlist_1); - lv_group_add_obj(Key_Matrix_Group,guider_ui.screen_imglist_list_1); + lv_indev_set_group(lvgl_button_indev, guider_ui.imglist_group); + lv_group_add_obj(guider_ui.imglist_group,guider_ui.screen_imglist_ddlist_1); break; } default: diff --git a/main/GUI/generated/gui_guider.h b/main/GUI/generated/gui_guider.h index b797e46..1afbe08 100644 --- a/main/GUI/generated/gui_guider.h +++ b/main/GUI/generated/gui_guider.h @@ -38,6 +38,9 @@ typedef struct lv_obj_t *screen_imglist_list_1; lv_obj_t *screen_imglist_list_1_item0; lv_obj_t *screen_imglist_ddlist_1; + lv_group_t *home_btn_group; + lv_group_t *imglist_group; + lv_group_t *file_btn_group; }lv_ui; typedef void (*ui_setup_scr_t)(lv_ui * ui); diff --git a/main/GUI/generated/setup_scr_screen_imglist.c b/main/GUI/generated/setup_scr_screen_imglist.c index ef3ca62..2ad4ecf 100644 --- a/main/GUI/generated/setup_scr_screen_imglist.c +++ b/main/GUI/generated/setup_scr_screen_imglist.c @@ -75,9 +75,12 @@ void setup_scr_screen_imglist(lv_ui *ui) //Write codes screen_imglist_list_1 ui->screen_imglist_list_1 = lv_list_create(ui->screen_imglist); // ui->screen_imglist_list_1_item0 =lv_list_add_text(ui->screen_imglist_list_1, "save_1"); - lv_obj_t * btn; - btn = lv_list_add_btn(ui->screen_imglist_list_1,LV_SYMBOL_FILE,"OfflineBurn.bin"); - btn = lv_list_add_btn(ui->screen_imglist_list_1,LV_SYMBOL_FILE,"target_esp32s3.bin"); + lv_obj_t * btn1; + btn1 = lv_list_add_btn(ui->screen_imglist_list_1,LV_SYMBOL_FILE,"OfflineBurn.bin"); + lv_group_add_obj(ui->imglist_group,btn1); + lv_obj_t * btn2; + btn2 = lv_list_add_btn(ui->screen_imglist_list_1,LV_SYMBOL_FILE,"target_esp32s3.bin"); + lv_group_add_obj(ui->imglist_group,btn2); lv_obj_set_pos(ui->screen_imglist_list_1, 2, 43); lv_obj_set_size(ui->screen_imglist_list_1, 124, 110); lv_obj_set_scrollbar_mode(ui->screen_imglist_list_1, LV_SCROLLBAR_MODE_OFF); diff --git a/main/GUI/lvgl_task.c b/main/GUI/lvgl_task.c index dfaea83..7137e88 100644 --- a/main/GUI/lvgl_task.c +++ b/main/GUI/lvgl_task.c @@ -38,7 +38,7 @@ esp_lcd_panel_handle_t panel_handle = NULL; /* LVGL display and touch */ static lv_display_t *lvgl_disp = NULL; -static lv_indev_t *lvgl_button_indev = NULL; +lv_indev_t *lvgl_button_indev = NULL; #define BUTTON_COUNT 3 // 假设有 3 个按钮 #define BUTTON_ACTIVE_LEVEL 0 @@ -136,9 +136,6 @@ static esp_err_t app_lvgl_init(void) }; lvgl_button_indev = lvgl_port_add_navigation_buttons(&button_cfg); - Key_Matrix_Group = lv_group_create(); //创建组 - lv_indev_set_group(lvgl_button_indev, Key_Matrix_Group); //将组绑定到输入设备 - #if USE_KEYBOARD keyboard_init(); @@ -191,9 +188,10 @@ static void app_main_display(void) custom_init(&guider_ui); setup_ui(&guider_ui); // events_init(&guider_ui); - lv_group_add_obj(Key_Matrix_Group,guider_ui.screen_btn_1); - lv_group_add_obj(Key_Matrix_Group,guider_ui.screen_btn_2); - lv_group_add_obj(Key_Matrix_Group,guider_ui.screen_btn_3); + lv_indev_set_group(lvgl_button_indev, guider_ui.home_btn_group); //将组绑定到输入设备 + lv_group_add_obj(guider_ui.home_btn_group,guider_ui.screen_btn_1); + lv_group_add_obj(guider_ui.home_btn_group,guider_ui.screen_btn_2); + lv_group_add_obj(guider_ui.home_btn_group,guider_ui.screen_btn_3); /* Task unlock */ lvgl_port_unlock(); }