Browse Source

页面逻辑修改

master
忱 沈 5 months ago
parent
commit
c073059846
  1. 74
      applications/lvgl/guider/generated/events_init.c
  2. 328
      applications/lvgl/guider/generated/gui_guider.h
  3. 6456
      applications/lvgl/guider/generated/setup_scr_screen.c
  4. 2
      applications/lvgl/lv_port_indev.c

74
applications/lvgl/guider/generated/events_init.c

@ -182,13 +182,81 @@ static void screen_p_insert_event_handler (lv_event_t *e)
} }
} }
static void screen_btn_DIU_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_DI_t1, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_DI_t2, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(guider_ui.screen_btn_DID, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_btn_DIU, LV_OBJ_FLAG_HIDDEN);
break;
}
default:
break;
}
}
static void screen_btn_DID_event_handler (lv_event_t *e)
{
lv_event_code_t code = lv_event_get_code(e);
switch (code) {
case LV_EVENT_CLICKED:
{
lv_obj_add_flag(guider_ui.screen_DI_t1, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(guider_ui.screen_DI_t2, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_btn_DID, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(guider_ui.screen_btn_DIU, LV_OBJ_FLAG_HIDDEN);
break;
}
default:
break;
}
}
static void screen_btn_DOU_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_btn_DOD, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_btn_DOU, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(guider_ui.screen_DO_t1, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_DO_t2, LV_OBJ_FLAG_HIDDEN);
break;
}
default:
break;
}
}
static void screen_btn_DOD_event_handler (lv_event_t *e)
{
lv_event_code_t code = lv_event_get_code(e);
switch (code) {
case LV_EVENT_CLICKED:
{
lv_obj_add_flag(guider_ui.screen_btn_DOD, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(guider_ui.screen_btn_DOU, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_DO_t1, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(guider_ui.screen_DO_t2, LV_OBJ_FLAG_HIDDEN);
break;
}
default:
break;
}
}
static void screen_btn_AIOU_event_handler (lv_event_t *e) static void screen_btn_AIOU_event_handler (lv_event_t *e)
{ {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
switch (code) { switch (code) {
case LV_EVENT_CLICKED: case LV_EVENT_CLICKED:
{ {
lv_obj_add_flag(guider_ui.screen_AIO_t2, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(guider_ui.screen_AIO_t2, LV_OBJ_FLAG_HIDDEN | LV_OBJ_FLAG_CLICK_FOCUSABLE);
lv_obj_clear_flag(guider_ui.screen_AIO_t1, LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(guider_ui.screen_AIO_t1, LV_OBJ_FLAG_HIDDEN);
lv_obj_clear_flag(guider_ui.screen_btn_AIOD, LV_OBJ_FLAG_HIDDEN); lv_obj_clear_flag(guider_ui.screen_btn_AIOD, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(guider_ui.screen_btn_AIOU, LV_OBJ_FLAG_HIDDEN); lv_obj_add_flag(guider_ui.screen_btn_AIOU, LV_OBJ_FLAG_HIDDEN);
@ -302,6 +370,10 @@ void events_init_screen (lv_ui *ui)
lv_obj_add_event_cb(ui->screen_p_edit, screen_p_edit_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_p_edit, screen_p_edit_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_p_delete, screen_p_delete_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_p_delete, screen_p_delete_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_p_insert, screen_p_insert_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_p_insert, screen_p_insert_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_btn_DIU, screen_btn_DIU_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_btn_DID, screen_btn_DID_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_btn_DOU, screen_btn_DOU_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_btn_DOD, screen_btn_DOD_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_btn_AIOU, screen_btn_AIOU_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_btn_AIOU, screen_btn_AIOU_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_btn_AIOD, screen_btn_AIOD_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_btn_AIOD, screen_btn_AIOD_event_handler, LV_EVENT_ALL, ui);
lv_obj_add_event_cb(ui->screen_set_Insert, screen_set_Insert_event_handler, LV_EVENT_ALL, ui); lv_obj_add_event_cb(ui->screen_set_Insert, screen_set_Insert_event_handler, LV_EVENT_ALL, ui);

328
applications/lvgl/guider/generated/gui_guider.h

@ -72,26 +72,7 @@ typedef struct
lv_obj_t *screen_w_io_tab_2; lv_obj_t *screen_w_io_tab_2;
lv_obj_t *screen_w_io_tab_3; lv_obj_t *screen_w_io_tab_3;
lv_obj_t *screen_w_io_tab_4; lv_obj_t *screen_w_io_tab_4;
lv_obj_t *screen_di1; lv_obj_t *screen_DI_t1;
lv_obj_t *screen_di2;
lv_obj_t *screen_di3;
lv_obj_t *screen_di4;
lv_obj_t *screen_di5;
lv_obj_t *screen_di6;
lv_obj_t *screen_di7;
lv_obj_t *screen_di8;
lv_obj_t *screen_di9;
lv_obj_t *screen_di10;
lv_obj_t *screen_di11;
lv_obj_t *screen_di12;
lv_obj_t *screen_di13;
lv_obj_t *screen_di14;
lv_obj_t *screen_di15;
lv_obj_t *screen_di16;
lv_obj_t *screen_di17;
lv_obj_t *screen_di18;
lv_obj_t *screen_di19;
lv_obj_t *screen_di20;
lv_obj_t *screen_name_di0; lv_obj_t *screen_name_di0;
lv_obj_t *screen_name_di1; lv_obj_t *screen_name_di1;
lv_obj_t *screen_name_di2; lv_obj_t *screen_name_di2;
@ -104,50 +85,6 @@ typedef struct
lv_obj_t *screen_name_di9; lv_obj_t *screen_name_di9;
lv_obj_t *screen_name_di10; lv_obj_t *screen_name_di10;
lv_obj_t *screen_name_di11; lv_obj_t *screen_name_di11;
lv_obj_t *screen_di21;
lv_obj_t *screen_di22;
lv_obj_t *screen_di23;
lv_obj_t *screen_di24;
lv_obj_t *screen_di25;
lv_obj_t *screen_di26;
lv_obj_t *screen_di27;
lv_obj_t *screen_di28;
lv_obj_t *screen_di29;
lv_obj_t *screen_di30;
lv_obj_t *screen_di31;
lv_obj_t *screen_di32;
lv_obj_t *screen_di33;
lv_obj_t *screen_di34;
lv_obj_t *screen_di35;
lv_obj_t *screen_di36;
lv_obj_t *screen_di37;
lv_obj_t *screen_di38;
lv_obj_t *screen_di39;
lv_obj_t *screen_di40;
lv_obj_t *screen_di41;
lv_obj_t *screen_di42;
lv_obj_t *screen_di43;
lv_obj_t *screen_di44;
lv_obj_t *screen_di45;
lv_obj_t *screen_di46;
lv_obj_t *screen_di47;
lv_obj_t *screen_di48;
lv_obj_t *screen_di49;
lv_obj_t *screen_di50;
lv_obj_t *screen_di51;
lv_obj_t *screen_di52;
lv_obj_t *screen_di53;
lv_obj_t *screen_di54;
lv_obj_t *screen_di55;
lv_obj_t *screen_di56;
lv_obj_t *screen_di57;
lv_obj_t *screen_di58;
lv_obj_t *screen_di59;
lv_obj_t *screen_di60;
lv_obj_t *screen_di61;
lv_obj_t *screen_di62;
lv_obj_t *screen_di63;
lv_obj_t *screen_di64;
lv_obj_t *screen_name_di12; lv_obj_t *screen_name_di12;
lv_obj_t *screen_name_di13; lv_obj_t *screen_name_di13;
lv_obj_t *screen_name_di14; lv_obj_t *screen_name_di14;
@ -184,22 +121,125 @@ typedef struct
lv_obj_t *screen_name_di45; lv_obj_t *screen_name_di45;
lv_obj_t *screen_name_di46; lv_obj_t *screen_name_di46;
lv_obj_t *screen_name_di47; lv_obj_t *screen_name_di47;
lv_obj_t *screen_name_di48; lv_obj_t *screen_di1;
lv_obj_t *screen_name_di49; lv_obj_t *screen_di2;
lv_obj_t *screen_name_di50; lv_obj_t *screen_di3;
lv_obj_t *screen_name_di51; lv_obj_t *screen_di4;
lv_obj_t *screen_name_di52; lv_obj_t *screen_di5;
lv_obj_t *screen_name_di53; lv_obj_t *screen_di6;
lv_obj_t *screen_name_di54; lv_obj_t *screen_di7;
lv_obj_t *screen_name_di55; lv_obj_t *screen_di8;
lv_obj_t *screen_name_di56; lv_obj_t *screen_di9;
lv_obj_t *screen_name_di57; lv_obj_t *screen_di10;
lv_obj_t *screen_name_di58; lv_obj_t *screen_di11;
lv_obj_t *screen_name_di59; lv_obj_t *screen_di12;
lv_obj_t *screen_name_di60; lv_obj_t *screen_di13;
lv_obj_t *screen_name_di61; lv_obj_t *screen_di14;
lv_obj_t *screen_name_di62; lv_obj_t *screen_di15;
lv_obj_t *screen_di16;
lv_obj_t *screen_di17;
lv_obj_t *screen_di18;
lv_obj_t *screen_di19;
lv_obj_t *screen_di20;
lv_obj_t *screen_di21;
lv_obj_t *screen_di22;
lv_obj_t *screen_di23;
lv_obj_t *screen_di24;
lv_obj_t *screen_di25;
lv_obj_t *screen_di26;
lv_obj_t *screen_di27;
lv_obj_t *screen_di28;
lv_obj_t *screen_di29;
lv_obj_t *screen_di30;
lv_obj_t *screen_di31;
lv_obj_t *screen_di32;
lv_obj_t *screen_di33;
lv_obj_t *screen_di34;
lv_obj_t *screen_di35;
lv_obj_t *screen_di36;
lv_obj_t *screen_di37;
lv_obj_t *screen_di38;
lv_obj_t *screen_di39;
lv_obj_t *screen_di40;
lv_obj_t *screen_di41;
lv_obj_t *screen_di42;
lv_obj_t *screen_di43;
lv_obj_t *screen_di44;
lv_obj_t *screen_di45;
lv_obj_t *screen_di46;
lv_obj_t *screen_di47;
lv_obj_t *screen_di48;
lv_obj_t *screen_DI_t2;
lv_obj_t *screen_name_di63; lv_obj_t *screen_name_di63;
lv_obj_t *screen_name_di62;
lv_obj_t *screen_name_di61;
lv_obj_t *screen_name_di60;
lv_obj_t *screen_name_di59;
lv_obj_t *screen_name_di58;
lv_obj_t *screen_name_di57;
lv_obj_t *screen_name_di56;
lv_obj_t *screen_name_di55;
lv_obj_t *screen_name_di54;
lv_obj_t *screen_name_di53;
lv_obj_t *screen_name_di52;
lv_obj_t *screen_name_di51;
lv_obj_t *screen_name_di50;
lv_obj_t *screen_name_di49;
lv_obj_t *screen_name_di48;
lv_obj_t *screen_di64;
lv_obj_t *screen_di63;
lv_obj_t *screen_di62;
lv_obj_t *screen_di61;
lv_obj_t *screen_di60;
lv_obj_t *screen_di59;
lv_obj_t *screen_di58;
lv_obj_t *screen_di57;
lv_obj_t *screen_di56;
lv_obj_t *screen_di55;
lv_obj_t *screen_di54;
lv_obj_t *screen_di53;
lv_obj_t *screen_di52;
lv_obj_t *screen_di51;
lv_obj_t *screen_di50;
lv_obj_t *screen_di49;
lv_obj_t *screen_btn_DIU;
lv_obj_t *screen_btn_DIU_label;
lv_obj_t *screen_btn_DID;
lv_obj_t *screen_btn_DID_label;
lv_obj_t *screen_DO_t2;
lv_obj_t *screen_name_do48;
lv_obj_t *screen_name_do49;
lv_obj_t *screen_name_do50;
lv_obj_t *screen_name_do51;
lv_obj_t *screen_name_do52;
lv_obj_t *screen_name_do53;
lv_obj_t *screen_name_do54;
lv_obj_t *screen_name_do55;
lv_obj_t *screen_name_do56;
lv_obj_t *screen_name_do57;
lv_obj_t *screen_name_do58;
lv_obj_t *screen_name_do59;
lv_obj_t *screen_name_do60;
lv_obj_t *screen_name_do61;
lv_obj_t *screen_name_do62;
lv_obj_t *screen_name_do63;
lv_obj_t *screen_do48;
lv_obj_t *screen_do49;
lv_obj_t *screen_do50;
lv_obj_t *screen_do51;
lv_obj_t *screen_do52;
lv_obj_t *screen_do53;
lv_obj_t *screen_do54;
lv_obj_t *screen_do55;
lv_obj_t *screen_do56;
lv_obj_t *screen_do57;
lv_obj_t *screen_do58;
lv_obj_t *screen_do59;
lv_obj_t *screen_do60;
lv_obj_t *screen_do61;
lv_obj_t *screen_do62;
lv_obj_t *screen_do63;
lv_obj_t *screen_DO_t1;
lv_obj_t *screen_do0; lv_obj_t *screen_do0;
lv_obj_t *screen_do1; lv_obj_t *screen_do1;
lv_obj_t *screen_do2; lv_obj_t *screen_do2;
@ -248,86 +288,58 @@ typedef struct
lv_obj_t *screen_do45; lv_obj_t *screen_do45;
lv_obj_t *screen_do46; lv_obj_t *screen_do46;
lv_obj_t *screen_do47; lv_obj_t *screen_do47;
lv_obj_t *screen_do48;
lv_obj_t *screen_do49;
lv_obj_t *screen_do50;
lv_obj_t *screen_do51;
lv_obj_t *screen_do52;
lv_obj_t *screen_do53;
lv_obj_t *screen_do54;
lv_obj_t *screen_do55;
lv_obj_t *screen_do56;
lv_obj_t *screen_do57;
lv_obj_t *screen_do58;
lv_obj_t *screen_do59;
lv_obj_t *screen_do60;
lv_obj_t *screen_do61;
lv_obj_t *screen_do62;
lv_obj_t *screen_do63;
lv_obj_t *screen_name_do0;
lv_obj_t *screen_name_do1;
lv_obj_t *screen_name_do2;
lv_obj_t *screen_name_do3;
lv_obj_t *screen_name_do4;
lv_obj_t *screen_name_do5;
lv_obj_t *screen_name_do6;
lv_obj_t *screen_name_do7;
lv_obj_t *screen_name_do8;
lv_obj_t *screen_name_do9;
lv_obj_t *screen_name_do10;
lv_obj_t *screen_name_do11;
lv_obj_t *screen_name_do12;
lv_obj_t *screen_name_do13;
lv_obj_t *screen_name_do14;
lv_obj_t *screen_name_do15;
lv_obj_t *screen_name_do16;
lv_obj_t *screen_name_do17;
lv_obj_t *screen_name_do18;
lv_obj_t *screen_name_do19;
lv_obj_t *screen_name_do20;
lv_obj_t *screen_name_do21;
lv_obj_t *screen_name_do22;
lv_obj_t *screen_name_do23;
lv_obj_t *screen_name_do24;
lv_obj_t *screen_name_do25;
lv_obj_t *screen_name_do26;
lv_obj_t *screen_name_do27;
lv_obj_t *screen_name_do28;
lv_obj_t *screen_name_do29;
lv_obj_t *screen_name_do30;
lv_obj_t *screen_name_do31;
lv_obj_t *screen_name_do32;
lv_obj_t *screen_name_do33;
lv_obj_t *screen_name_do34;
lv_obj_t *screen_name_do35;
lv_obj_t *screen_name_do36;
lv_obj_t *screen_name_do37;
lv_obj_t *screen_name_do38;
lv_obj_t *screen_name_do39;
lv_obj_t *screen_name_do40;
lv_obj_t *screen_name_do41;
lv_obj_t *screen_name_do42;
lv_obj_t *screen_name_do43;
lv_obj_t *screen_name_do44;
lv_obj_t *screen_name_do45;
lv_obj_t *screen_name_do46;
lv_obj_t *screen_name_do47; lv_obj_t *screen_name_do47;
lv_obj_t *screen_name_do48; lv_obj_t *screen_name_do46;
lv_obj_t *screen_name_do49; lv_obj_t *screen_name_do45;
lv_obj_t *screen_name_do50; lv_obj_t *screen_name_do44;
lv_obj_t *screen_name_do51; lv_obj_t *screen_name_do43;
lv_obj_t *screen_name_do52; lv_obj_t *screen_name_do42;
lv_obj_t *screen_name_do53; lv_obj_t *screen_name_do41;
lv_obj_t *screen_name_do54; lv_obj_t *screen_name_do40;
lv_obj_t *screen_name_do55; lv_obj_t *screen_name_do39;
lv_obj_t *screen_name_do56; lv_obj_t *screen_name_do38;
lv_obj_t *screen_name_do57; lv_obj_t *screen_name_do37;
lv_obj_t *screen_name_do58; lv_obj_t *screen_name_do36;
lv_obj_t *screen_name_do59; lv_obj_t *screen_name_do35;
lv_obj_t *screen_name_do60; lv_obj_t *screen_name_do34;
lv_obj_t *screen_name_do61; lv_obj_t *screen_name_do33;
lv_obj_t *screen_name_do62; lv_obj_t *screen_name_do32;
lv_obj_t *screen_name_do63; lv_obj_t *screen_name_do31;
lv_obj_t *screen_name_do30;
lv_obj_t *screen_name_do29;
lv_obj_t *screen_name_do28;
lv_obj_t *screen_name_do27;
lv_obj_t *screen_name_do26;
lv_obj_t *screen_name_do25;
lv_obj_t *screen_name_do24;
lv_obj_t *screen_name_do23;
lv_obj_t *screen_name_do22;
lv_obj_t *screen_name_do21;
lv_obj_t *screen_name_do20;
lv_obj_t *screen_name_do19;
lv_obj_t *screen_name_do18;
lv_obj_t *screen_name_do17;
lv_obj_t *screen_name_do16;
lv_obj_t *screen_name_do15;
lv_obj_t *screen_name_do14;
lv_obj_t *screen_name_do13;
lv_obj_t *screen_name_do12;
lv_obj_t *screen_name_do11;
lv_obj_t *screen_name_do10;
lv_obj_t *screen_name_do9;
lv_obj_t *screen_name_do8;
lv_obj_t *screen_name_do7;
lv_obj_t *screen_name_do6;
lv_obj_t *screen_name_do5;
lv_obj_t *screen_name_do4;
lv_obj_t *screen_name_do3;
lv_obj_t *screen_name_do2;
lv_obj_t *screen_name_do1;
lv_obj_t *screen_name_do0;
lv_obj_t *screen_btn_DOU;
lv_obj_t *screen_btn_DOU_label;
lv_obj_t *screen_btn_DOD;
lv_obj_t *screen_btn_DOD_label;
lv_obj_t *screen_AIO_t2; lv_obj_t *screen_AIO_t2;
lv_obj_t *screen_label_41; lv_obj_t *screen_label_41;
lv_obj_t *screen_label_40; lv_obj_t *screen_label_40;

6456
applications/lvgl/guider/generated/setup_scr_screen.c

File diff suppressed because it is too large

2
applications/lvgl/lv_port_indev.c

@ -208,7 +208,7 @@ int touchpad_example(void)
touch = rt_device_find("touch"); touch = rt_device_find("touch");
rt_device_open(touch, RT_DEVICE_FLAG_RDONLY); rt_device_open(touch, RT_DEVICE_FLAG_RDONLY);
rt_thread_t touchpad_thread = rt_thread_create("touch", touchpad_thread_entry, RT_NULL, 800, 10, 20); rt_thread_t touchpad_thread = rt_thread_create("touch", touchpad_thread_entry, RT_NULL, 1024, 20, 10);
if (touchpad_thread == RT_NULL) if (touchpad_thread == RT_NULL)
{ {
LOG_D("create touchpad thread err"); LOG_D("create touchpad thread err");

Loading…
Cancel
Save