From 1de41bc038dcf623834b63422da350693429570b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 13 十二月 2023 16:20:47 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
index 1066e2f..5fef359 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/CombinedDimming/AddGroupControlPage.cs
@@ -92,11 +92,15 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
if (isAdd)
{
- new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.GroupControl));
+ topView.maginY = 10;
+ topView.LoadTopView();
}
else
{
- new TopViewDiv(bodyView, "").LoadTopView_SettingText(()=> {
+ var topView = new TopViewDiv(bodyView, "");
+ topView.maginY = 10;
+ topView.LoadTopView_SettingText(()=> {
Action action = () => {
var waitPage = new Loading();
@@ -158,8 +162,8 @@
}
var contentView = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(667-64),
+ Y = Application.GetRealHeight(64+10),
+ Height = Application.GetRealHeight(667-64-10),
};
bodyView.AddChidren(contentView);
@@ -371,7 +375,7 @@
functionListView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(220),
- Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100),
+ Height = Application.GetRealHeight(640 - 12 - 52 - 100 -100-10),
};
bodyView.AddChidren(functionListView);
--
Gitblit v1.8.0