修复了页面不对的问题
This commit is contained in:
parent
67e41c13f9
commit
d21a703471
File diff suppressed because one or more lines are too long
@ -2801,19 +2801,19 @@
|
|||||||
{
|
{
|
||||||
"nid": 1060,
|
"nid": 1060,
|
||||||
"strtype": "IMGBUTTON/Image_checked_released",
|
"strtype": "IMGBUTTON/Image_checked_released",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"nid": 1070,
|
"nid": 1070,
|
||||||
"strtype": "IMGBUTTON/Image_checked_pressed",
|
"strtype": "IMGBUTTON/Image_checked_pressed",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"nid": 1080,
|
"nid": 1080,
|
||||||
"strtype": "IMGBUTTON/Image_checked_disabled",
|
"strtype": "IMGBUTTON/Image_checked_disabled",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -3292,25 +3292,25 @@
|
|||||||
{
|
{
|
||||||
"nid": 1050,
|
"nid": 1050,
|
||||||
"strtype": "IMGBUTTON/Image_disabled",
|
"strtype": "IMGBUTTON/Image_disabled",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"nid": 1060,
|
"nid": 1060,
|
||||||
"strtype": "IMGBUTTON/Image_checked_released",
|
"strtype": "IMGBUTTON/Image_checked_released",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"nid": 1070,
|
"nid": 1070,
|
||||||
"strtype": "IMGBUTTON/Image_checked_pressed",
|
"strtype": "IMGBUTTON/Image_checked_pressed",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"nid": 1080,
|
"nid": 1080,
|
||||||
"strtype": "IMGBUTTON/Image_checked_disabled",
|
"strtype": "IMGBUTTON/Image_checked_disabled",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -3774,25 +3774,25 @@
|
|||||||
{
|
{
|
||||||
"nid": 1050,
|
"nid": 1050,
|
||||||
"strtype": "IMGBUTTON/Image_disabled",
|
"strtype": "IMGBUTTON/Image_disabled",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"nid": 1060,
|
"nid": 1060,
|
||||||
"strtype": "IMGBUTTON/Image_checked_released",
|
"strtype": "IMGBUTTON/Image_checked_released",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"nid": 1070,
|
"nid": 1070,
|
||||||
"strtype": "IMGBUTTON/Image_checked_pressed",
|
"strtype": "IMGBUTTON/Image_checked_pressed",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"nid": 1080,
|
"nid": 1080,
|
||||||
"strtype": "IMGBUTTON/Image_checked_disabled",
|
"strtype": "IMGBUTTON/Image_checked_disabled",
|
||||||
"strval": "",
|
"strval": "-",
|
||||||
"InheritedType": 5
|
"InheritedType": 5
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -4686,8 +4686,8 @@
|
|||||||
"flags": 17,
|
"flags": 17,
|
||||||
"strtype": "OBJECT/Position",
|
"strtype": "OBJECT/Position",
|
||||||
"intarray": [
|
"intarray": [
|
||||||
1,
|
320,
|
||||||
-37
|
-33
|
||||||
],
|
],
|
||||||
"InheritedType": 7
|
"InheritedType": 7
|
||||||
},
|
},
|
||||||
@ -4801,7 +4801,8 @@
|
|||||||
"InheritedType": 11
|
"InheritedType": 11
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"saved_objtypeKey": "PANEL"
|
"saved_objtypeKey": "PANEL",
|
||||||
|
"tree_closed": true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"guid": "GUID14744944-135404S257864112",
|
"guid": "GUID14744944-135404S257864112",
|
||||||
@ -13706,8 +13707,8 @@
|
|||||||
"flags": 17,
|
"flags": 17,
|
||||||
"strtype": "OBJECT/Position",
|
"strtype": "OBJECT/Position",
|
||||||
"intarray": [
|
"intarray": [
|
||||||
-1,
|
0,
|
||||||
-511
|
0
|
||||||
],
|
],
|
||||||
"InheritedType": 7
|
"InheritedType": 7
|
||||||
},
|
},
|
||||||
|
|||||||
@ -112,8 +112,8 @@ void ui_pageHome_screen_init(void)
|
|||||||
ui_pageHome_panelRight = lv_obj_create(ui_pageHome_panelBody);
|
ui_pageHome_panelRight = lv_obj_create(ui_pageHome_panelBody);
|
||||||
lv_obj_set_width(ui_pageHome_panelRight, 320);
|
lv_obj_set_width(ui_pageHome_panelRight, 320);
|
||||||
lv_obj_set_height(ui_pageHome_panelRight, 360);
|
lv_obj_set_height(ui_pageHome_panelRight, 360);
|
||||||
lv_obj_set_x(ui_pageHome_panelRight, 1);
|
lv_obj_set_x(ui_pageHome_panelRight, 320);
|
||||||
lv_obj_set_y(ui_pageHome_panelRight, -37);
|
lv_obj_set_y(ui_pageHome_panelRight, -33);
|
||||||
lv_obj_set_align(ui_pageHome_panelRight, LV_ALIGN_CENTER);
|
lv_obj_set_align(ui_pageHome_panelRight, LV_ALIGN_CENTER);
|
||||||
lv_obj_clear_flag(ui_pageHome_panelRight, LV_OBJ_FLAG_SCROLLABLE); /// Flags
|
lv_obj_clear_flag(ui_pageHome_panelRight, LV_OBJ_FLAG_SCROLLABLE); /// Flags
|
||||||
lv_obj_set_style_radius(ui_pageHome_panelRight, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
|
lv_obj_set_style_radius(ui_pageHome_panelRight, 0, LV_PART_MAIN | LV_STATE_DEFAULT);
|
||||||
@ -289,8 +289,6 @@ void ui_pageHome_screen_init(void)
|
|||||||
ui_pageHome_panelCenter = lv_obj_create(ui_pageHome_panelBody);
|
ui_pageHome_panelCenter = lv_obj_create(ui_pageHome_panelBody);
|
||||||
lv_obj_set_width(ui_pageHome_panelCenter, 297);
|
lv_obj_set_width(ui_pageHome_panelCenter, 297);
|
||||||
lv_obj_set_height(ui_pageHome_panelCenter, 430);
|
lv_obj_set_height(ui_pageHome_panelCenter, 430);
|
||||||
lv_obj_set_x(ui_pageHome_panelCenter, -1);
|
|
||||||
lv_obj_set_y(ui_pageHome_panelCenter, -511);
|
|
||||||
lv_obj_set_align(ui_pageHome_panelCenter, LV_ALIGN_CENTER);
|
lv_obj_set_align(ui_pageHome_panelCenter, LV_ALIGN_CENTER);
|
||||||
lv_obj_clear_flag(ui_pageHome_panelCenter, LV_OBJ_FLAG_SCROLLABLE); /// Flags
|
lv_obj_clear_flag(ui_pageHome_panelCenter, LV_OBJ_FLAG_SCROLLABLE); /// Flags
|
||||||
lv_obj_set_style_radius(ui_pageHome_panelCenter, 15, LV_PART_MAIN | LV_STATE_DEFAULT);
|
lv_obj_set_style_radius(ui_pageHome_panelCenter, 15, LV_PART_MAIN | LV_STATE_DEFAULT);
|
||||||
|
|||||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user