jarvis/FluxDC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

删除掉了设置页的拉取按钮

Browse Source
This commit is contained in:
jarvis 2025-03-12 08:13:34 +08:00
parent aca5d4a77a
commit b4f4cb6df9
11 changed files with 13 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SquareLineProj/ESP32S3_UI.sll
View File

File diff suppressed because one or more lines are too long

286
SquareLineProj/ESP32S3_UI.spj
View File

@ -9888,7 +9888,7 @@
},
{
"nid": 60,
"flags": 17,
"flags": 49,
"strtype": "OBJECT/Size",
"intarray": [
319,
@ -9964,7 +9964,7 @@
{
"nid": 1040,
"strtype": "TEXTAREA/One_line_mode",
"strval": "False",
"strval": "True",
"InheritedType": 2
},
{
@ -10040,281 +10040,6 @@
}
],
"saved_objtypeKey": "TEXTAREA"
},
{
"guid": "GUID10487105-16942S932466",
"deepid": -812952608,
"children": [
{
"guid": "GUID39782260-16944S47513466",
"deepid": 1631425203,
"dont_export": false,
"locked": false,
"properties": [
{
"nid": 10,
"strtype": "OBJECT/Name",
"strval": "Label9",
"InheritedType": 10
},
{
"nid": 20,
"strtype": "OBJECT/Layout",
"InheritedType": 1
},
{
"Flow": 0,
"Wrap": false,
"Reversed": false,
"MainAlignment": 0,
"CrossAlignment": 0,
"TrackAlignment": 0,
"LayoutType": 0,
"nid": 30,
"strtype": "OBJECT/Layout_type",
"strval": "No_layout",
"InheritedType": 13
},
{
"nid": 40,
"strtype": "OBJECT/Transform",
"InheritedType": 1
},
{
"nid": 50,
"flags": 17,
"strtype": "OBJECT/Position",
"intarray": [
0,
0
],
"InheritedType": 7
},
{
"nid": 60,
"flags": 51,
"strtype": "OBJECT/Size",
"intarray": [
1,
1
],
"InheritedType": 7
},
{
"nid": 70,
"strtype": "OBJECT/Align",
"strval": "CENTER",
"InheritedType": 3
},
{
"nid": 90,
"flags": 1048576,
"strtype": "OBJECT/Flags",
"InheritedType": 1
},
{
"nid": 110,
"strtype": "OBJECT/Clickable",
"strval": "False",
"InheritedType": 2
},
{
"nid": 225,
"flags": 1048576,
"strtype": "OBJECT/Scrolling",
"InheritedType": 1
},
{
"nid": 300,
"strtype": "OBJECT/Scrollbar_mode",
"strval": "AUTO",
"InheritedType": 3
},
{
"nid": 310,
"strtype": "OBJECT/Scroll_direction",
"strval": "ALL",
"InheritedType": 3
},
{
"nid": 314,
"strtype": "OBJECT/Scroll_snap_x",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 315,
"strtype": "OBJECT/Scroll_snap_y",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 320,
"flags": 1048576,
"strtype": "OBJECT/States",
"InheritedType": 1
},
{
"nid": 1010,
"strtype": "LABEL/Label",
"InheritedType": 1
},
{
"nid": 1020,
"strtype": "LABEL/Long_mode",
"strval": "WRAP",
"InheritedType": 3
},
{
"nid": 1030,
"strtype": "LABEL/Text",
"strval": "拉取",
"InheritedType": 10
},
{
"part": "lv.PART.MAIN",
"childs": [
{
"nid": 10000,
"strtype": "_style/StyleState",
"strval": "DEFAULT",
"childs": [
{
"nid": 10450,
"strtype": "_style/Text_Font",
"strval": "MiSansN",
"InheritedType": 3
}
],
"InheritedType": 1
}
],
"nid": 1040,
"strtype": "LABEL/Style_main",
"strval": "lv.PART.MAIN, Text, Rectangle, Pad, Transform",
"InheritedType": 11
},
{
"nid": 1050,
"strtype": "LABEL/Recolor",
"strval": "False",
"InheritedType": 2
}
],
"saved_objtypeKey": "LABEL"
}
],
"dont_export": false,
"locked": false,
"properties": [
{
"nid": 10,
"strtype": "OBJECT/Name",
"strval": "pull",
"InheritedType": 10
},
{
"nid": 20,
"strtype": "OBJECT/Layout",
"InheritedType": 1
},
{
"Flow": 0,
"Wrap": false,
"Reversed": false,
"MainAlignment": 0,
"CrossAlignment": 0,
"TrackAlignment": 0,
"LayoutType": 0,
"nid": 30,
"strtype": "OBJECT/Layout_type",
"strval": "No_layout",
"InheritedType": 13
},
{
"nid": 40,
"strtype": "OBJECT/Transform",
"InheritedType": 1
},
{
"nid": 50,
"flags": 17,
"strtype": "OBJECT/Position",
"intarray": [
3,
205
],
"InheritedType": 7
},
{
"nid": 60,
"flags": 17,
"strtype": "OBJECT/Size",
"intarray": [
320,
50
],
"InheritedType": 7
},
{
"nid": 70,
"strtype": "OBJECT/Align",
"strval": "CENTER",
"InheritedType": 3
},
{
"nid": 90,
"flags": 1048576,
"strtype": "OBJECT/Flags",
"InheritedType": 1
},
{
"nid": 225,
"flags": 1048576,
"strtype": "OBJECT/Scrolling",
"InheritedType": 1
},
{
"nid": 300,
"strtype": "OBJECT/Scrollbar_mode",
"strval": "AUTO",
"InheritedType": 3
},
{
"nid": 310,
"strtype": "OBJECT/Scroll_direction",
"strval": "ALL",
"InheritedType": 3
},
{
"nid": 314,
"strtype": "OBJECT/Scroll_snap_x",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 315,
"strtype": "OBJECT/Scroll_snap_y",
"strval": "NONE",
"InheritedType": 3
},
{
"nid": 320,
"flags": 1048576,
"strtype": "OBJECT/States",
"InheritedType": 1
},
{
"part": "lv.PART.MAIN",
"childs": [],
"nid": 1010,
"strtype": "BUTTON/Style_main",
"strval": "lv.PART.MAIN, Rectangle, Pad, Text, Transform",
"InheritedType": 11
}
],
"saved_objtypeKey": "BUTTON",
"tree_closed": true
}
],
"dont_export": false,
@ -10462,7 +10187,7 @@
"intarray": [
0,
0,
30,
10,
0
],
"InheritedType": 7
@ -10485,8 +10210,7 @@
"InheritedType": 11
}
],
"saved_objtypeKey": "PANEL",
"tree_closed": true
"saved_objtypeKey": "PANEL"
}
],
"isPage": true,
@ -22478,7 +22202,7 @@
"uiExportFolderPath": "D:\\yuwell_workspace\\FluxDC\\SquareLineProj\\Export",
"projectExportFolderPath": "D:\\yuwell_workspace\\FluxDC\\SquareLineProj\\Export",
"custom_variable_prefix": "uic",
"backup_cnt": 370,
"backup_cnt": 372,
"autosave_cnt": 0,
"group_color_cnt": 0,
"lvgl_version": "8.3.6",

19
SquareLineProj/Export/screens/ui_settings.c
View File

@ -52,7 +52,7 @@ void ui_settings_screen_init(void)
lv_obj_set_style_border_width(ui_settings_StepPannel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_left(ui_settings_StepPannel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_settings_StepPannel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_settings_StepPannel, 30, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_settings_StepPannel, 10, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_settings_StepPannel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
ui_settings_Bat = lv_obj_create(ui_settings_StepPannel);
@ -278,27 +278,14 @@ void ui_settings_screen_init(void)
ui_settings_TextArea2 = lv_textarea_create(ui_settings_StepPannel);
lv_obj_set_width(ui_settings_TextArea2, 319);
lv_obj_set_height(ui_settings_TextArea2, 124);
lv_obj_set_height(ui_settings_TextArea2, LV_SIZE_CONTENT); /// 124
lv_obj_set_x(ui_settings_TextArea2, 3);
lv_obj_set_y(ui_settings_TextArea2, 0);
lv_obj_set_align(ui_settings_TextArea2, LV_ALIGN_CENTER);
lv_textarea_set_placeholder_text(ui_settings_TextArea2, "来自服务器的反馈消息");
lv_textarea_set_one_line(ui_settings_TextArea2, true);
lv_obj_set_style_text_font(ui_settings_TextArea2, &ui_font_MiSansN, LV_PART_MAIN | LV_STATE_DEFAULT);
ui_settings_pull = lv_btn_create(ui_settings_StepPannel);
lv_obj_set_width(ui_settings_pull, 320);
lv_obj_set_height(ui_settings_pull, 50);
lv_obj_set_x(ui_settings_pull, 3);
lv_obj_set_y(ui_settings_pull, 205);
lv_obj_set_align(ui_settings_pull, LV_ALIGN_CENTER);
ui_settings_Label9 = lv_label_create(ui_settings_pull);
lv_obj_set_width(ui_settings_Label9, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_settings_Label9, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_settings_Label9, LV_ALIGN_CENTER);
lv_label_set_text(ui_settings_Label9, "拉取");
lv_obj_set_style_text_font(ui_settings_Label9, &ui_font_MiSansN, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_add_event_cb(ui_settings_HomeImg, ui_event_settings_HomeImg, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_settings_settingHeader, ui_event_settings_settingHeader, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_settings_Bat, ui_event_settings_Bat, LV_EVENT_ALL, NULL);

2
SquareLineProj/Export/ui.c
View File

@ -84,8 +84,6 @@ lv_obj_t * ui_settings_ToSDCard;
lv_obj_t * ui_settings_dianchi2;
lv_obj_t * ui_settings_Label13;
lv_obj_t * ui_settings_TextArea2;
lv_obj_t * ui_settings_pull;
lv_obj_t * ui_settings_Label9;
// CUSTOM VARIABLES
// SCREEN: ui_Batinfo

2
SquareLineProj/Export/ui.h
View File

@ -92,8 +92,6 @@ extern lv_obj_t * ui_settings_ToSDCard;
extern lv_obj_t * ui_settings_dianchi2;
extern lv_obj_t * ui_settings_Label13;
extern lv_obj_t * ui_settings_TextArea2;
extern lv_obj_t * ui_settings_pull;
extern lv_obj_t * ui_settings_Label9;
// CUSTOM VARIABLES
// SCREEN: ui_Batinfo

BIN
SquareLineProj/backup/ESP32S3_UI_backup01.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup02.zip
View File

Binary file not shown.

BIN
SquareLineProj/backup/ESP32S3_UI_backup03.zip
View File

Binary file not shown.

19
components/FluxUI/screens/ui_settings.c
View File

@ -52,7 +52,7 @@ void ui_settings_screen_init(void)
lv_obj_set_style_border_width(ui_settings_StepPannel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_left(ui_settings_StepPannel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_right(ui_settings_StepPannel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_settings_StepPannel, 30, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_top(ui_settings_StepPannel, 10, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_set_style_pad_bottom(ui_settings_StepPannel, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
ui_settings_Bat = lv_obj_create(ui_settings_StepPannel);
@ -278,27 +278,14 @@ void ui_settings_screen_init(void)
ui_settings_TextArea2 = lv_textarea_create(ui_settings_StepPannel);
lv_obj_set_width(ui_settings_TextArea2, 319);
lv_obj_set_height(ui_settings_TextArea2, 124);
lv_obj_set_height(ui_settings_TextArea2, LV_SIZE_CONTENT); /// 124
lv_obj_set_x(ui_settings_TextArea2, 3);
lv_obj_set_y(ui_settings_TextArea2, 0);
lv_obj_set_align(ui_settings_TextArea2, LV_ALIGN_CENTER);
lv_textarea_set_placeholder_text(ui_settings_TextArea2, "来自服务器的反馈消息");
lv_textarea_set_one_line(ui_settings_TextArea2, true);
lv_obj_set_style_text_font(ui_settings_TextArea2, &ui_font_MiSansN, LV_PART_MAIN | LV_STATE_DEFAULT);
ui_settings_pull = lv_btn_create(ui_settings_StepPannel);
lv_obj_set_width(ui_settings_pull, 320);
lv_obj_set_height(ui_settings_pull, 50);
lv_obj_set_x(ui_settings_pull, 3);
lv_obj_set_y(ui_settings_pull, 205);
lv_obj_set_align(ui_settings_pull, LV_ALIGN_CENTER);
ui_settings_Label9 = lv_label_create(ui_settings_pull);
lv_obj_set_width(ui_settings_Label9, LV_SIZE_CONTENT); /// 1
lv_obj_set_height(ui_settings_Label9, LV_SIZE_CONTENT); /// 1
lv_obj_set_align(ui_settings_Label9, LV_ALIGN_CENTER);
lv_label_set_text(ui_settings_Label9, "拉取");
lv_obj_set_style_text_font(ui_settings_Label9, &ui_font_MiSansN, LV_PART_MAIN | LV_STATE_DEFAULT);
lv_obj_add_event_cb(ui_settings_HomeImg, ui_event_settings_HomeImg, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_settings_settingHeader, ui_event_settings_settingHeader, LV_EVENT_ALL, NULL);
lv_obj_add_event_cb(ui_settings_Bat, ui_event_settings_Bat, LV_EVENT_ALL, NULL);

2
components/FluxUI/ui.c
View File

@ -84,8 +84,6 @@ lv_obj_t * ui_settings_ToSDCard;
lv_obj_t * ui_settings_dianchi2;
lv_obj_t * ui_settings_Label13;
lv_obj_t * ui_settings_TextArea2;
lv_obj_t * ui_settings_pull;
lv_obj_t * ui_settings_Label9;
// CUSTOM VARIABLES
// SCREEN: ui_Batinfo

2
components/FluxUI/ui.h
View File

@ -92,8 +92,6 @@ extern lv_obj_t * ui_settings_ToSDCard;
extern lv_obj_t * ui_settings_dianchi2;
extern lv_obj_t * ui_settings_Label13;
extern lv_obj_t * ui_settings_TextArea2;
extern lv_obj_t * ui_settings_pull;
extern lv_obj_t * ui_settings_Label9;
// CUSTOM VARIABLES
// SCREEN: ui_Batinfo