From c8dfa6df784741900a4c06918929d3db3c876234 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 16 七月 2021 10:40:56 +0800
Subject: [PATCH] Merge branch 'hxb-test' into wxr7-ez
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
index f77216c..cefa915 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/ArmCenterPage.cs
@@ -26,7 +26,7 @@
VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
- Height = Application.GetRealHeight(603),
+ Height = Application.GetRealHeight(667 - 64),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
};
@@ -71,6 +71,7 @@
{
X = Application.GetRealWidth(23),
Height = Application.GetRealWidth(80),
+ ScrollEnabled = false,
};
contentView.AddChidren(customDeploymentView);
@@ -84,6 +85,11 @@
Language.StringByID(StringId.HouseDefense));
customDeploymentView.AddChidren(view);
+ if(FunctionList.List.securities.Count>3)
+ {
+ customDeploymentView.ScrollEnabled = true;
+ }
+
foreach (var mode in FunctionList.List.securities)
{
}
@@ -96,7 +102,7 @@
var fixedDeploymentView = new FrameLayout()
{
- Height = Application.GetRealHeight(123),
+ Height = Application.GetRealHeight(133),
};
contentView.AddChidren(fixedDeploymentView);
@@ -129,6 +135,7 @@
{
Y = btnFixedDeploymentTip.Bottom + Application.GetRealHeight(15),
Height = Application.GetRealHeight(80),
+ ScrollEnabled = false,
};
fixedDeploymentView.AddChidren(fixedDeploymentTypeView);
--
Gitblit v1.8.0