From 20c890d6b31a50daeb31e3fa24a3f80dd21c45ef Mon Sep 17 00:00:00 2001 From: sc <2401809606@qq.com> Date: Thu, 5 Feb 2026 02:11:47 +0800 Subject: [PATCH] =?UTF-8?q?ui=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/data/DATA_comm.c | 2 +- applications/lvgl/lv__user_gui.c | 1 + applications/lvgl/ui_data_labels.c | 7 ++++++- applications/lvgl/ui_data_labels.h | 28 ++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) diff --git a/applications/data/DATA_comm.c b/applications/data/DATA_comm.c index 6696f53..d2d142d 100644 --- a/applications/data/DATA_comm.c +++ b/applications/data/DATA_comm.c @@ -378,7 +378,7 @@ void pasre_DAT(const char *api, const char *json_str) } else if (strcmp(api, "SC822") == 0) { - db_send_select(DB_CMD_SELECT, "SELECT * FROM WorkOrderSet LIMIT 10;", 500,select_data); + db_send_select(DB_CMD_SELECT, "SELECT WorkOrder,ReDye,ProgramName FROM WorkOrder LIMIT 10;", 500,select_data); cJSON_AddItemToObject(dat,"ERR",cJSON_CreateString(select_data)); } else if (strcmp(api, "SC827") == 0) diff --git a/applications/lvgl/lv__user_gui.c b/applications/lvgl/lv__user_gui.c index 2c2cd9e..153e324 100644 --- a/applications/lvgl/lv__user_gui.c +++ b/applications/lvgl/lv__user_gui.c @@ -63,6 +63,7 @@ void setup_s_screen(lv_ui *ui) lv_label_set_text(ui->screen_temp, (const char *)temp_str); + update_led_i(); update_led_o(); diff --git a/applications/lvgl/ui_data_labels.c b/applications/lvgl/ui_data_labels.c index 77174d0..1223773 100644 --- a/applications/lvgl/ui_data_labels.c +++ b/applications/lvgl/ui_data_labels.c @@ -20,17 +20,22 @@ #include #include #include "lvgl.h" +#include // 全局或静态数组 char buf[8]; - lv_obj_t *di_led_array[64]; lv_obj_t *do_led_array[64]; lv_obj_t *di_labels[24]; // DI: AIO4001 ~ AIO4024 (24个) lv_obj_t *do_labels[16]; // DO: AIO5001 ~ AIO5016 (16个) +WorkOrder_DATA_tab * Work_DATA_tab=NULL; extern struct rt_memheap sram_SRAM1,sdram_heap; + void ui_init_io(lv_ui *ui) { + + Work_DATA_tab = rt_memheap_alloc(&sdram_heap, sizeof(WorkOrder_DATA_tab)*64); + //di di_led_array[0] = ui->screen_di1; di_led_array[1] = ui->screen_di2; diff --git a/applications/lvgl/ui_data_labels.h b/applications/lvgl/ui_data_labels.h index aa0c3eb..e573ab4 100644 --- a/applications/lvgl/ui_data_labels.h +++ b/applications/lvgl/ui_data_labels.h @@ -10,11 +10,39 @@ #ifndef APPLICATIONS_LVGL_UI_DATA_LABELS_H_ #define APPLICATIONS_LVGL_UI_DATA_LABELS_H_ +#define select_WorkOrder_DATA "SELECT WorkOrder,Dyelot,ReDye,\ + ProgramName,StartTime,EndTime,Time,lock,State,ColorName,\ + ColorNumber,Client,ClothWeight,ClothSpecies,BathRatio,Total,\ + Remark,USER FROM WorkOrder WHERE State=101 AND EndTime >" +typedef struct { + char WorkOrder[32]; + char Dyelot[32]; // 单号 + int ReDye; + char ProgramName[64]; + char StartTime[24]; + char EndTime[24]; + char Time[10]; + int lock; + int State; + char ColorName[32]; + char ColorNumber[32]; + char Client[32]; + char ClothWeight[32]; + char ClothSpecies[32]; + char BathRatio[32]; + char Total[32]; + char Remark[32]; + char USER[32]; +} WorkOrder_DATA_tab; +extern WorkOrder_DATA_tab * Work_DATA_tab; + extern lv_obj_t *di_led_array[64]; extern lv_obj_t *do_led_array[64]; extern lv_obj_t *di_labels[24]; // DI: AIO4001 ~ AIO4024 (24个) extern lv_obj_t *do_labels[16]; // DO: AIO5001 ~ AIO5016 (16个) + + void ui_init_io(lv_ui *ui); void update_io_labels(void); void update_led_i(void);