From efd01cddef2e9d29907592cbed154fba548d7ede Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 07 十一月 2023 11:14:43 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
index bb118a5..053765d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/Iot_BrandFunctionListPage.cs
@@ -38,22 +38,24 @@
};
page.LoadPage(brand_Iot);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- new TopViewDiv(bodyView, brand_Iot.brandName).LoadTopView_3tyIot(action);
+ };
+ var topView = new TopViewDiv(bodyView, brand_Iot.brandName);
+ topView.maginY = 10;
+ topView.LoadTopView_3tyIot(action);
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
bodyView.AddChidren(new Button
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(1),
BackgroundColor = CSS_Color.DividingLineColor,
});
Button btnTipText = new Button()
{
- Y = Application.GetRealHeight(80),
+ Y = Application.GetRealHeight(80+10),
Width = Application.GetRealWidth(347),
Height = Application.GetRealHeight(65),
Gravity = Gravity.CenterHorizontal,
@@ -74,8 +76,8 @@
contentView = new FrameLayout()
{
- Y = Application.GetRealHeight(150),
- Height = Application.GetRealHeight(573),
+ Y = Application.GetRealHeight(150+10),
+ Height = Application.GetRealHeight(573-10),
};
bodyView.AddChidren(contentView);
@@ -353,7 +355,7 @@
var btnTip = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(88),
+ Y = Application.GetRealHeight(88 + 10),
Width = Application.GetRealWidth(180),
Height = Application.GetRealWidth(180),
UnSelectedImagePath = "TipNot.png",
--
Gitblit v1.8.0