From e06be53dff56744de8db2a2aec136d494cc187bf Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 07 十一月 2023 16:47:02 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs
index 3558ece..e0bfecc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddInputPage.cs
@@ -29,12 +29,14 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.AddDefenseFunction)).LoadTopView();
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.AddDefenseFunction));
+ topView.maginY = 10;
+ topView.LoadTopView();
#region 鏄剧ず鐨勫姛鑳界被鍨嬪垏鎹㈠尯鍩�
var showdFunctionTypeRow = new FrameLayout()
{
- Y = Application.GetRealHeight(64),
+ Y = Application.GetRealHeight(64+10),
Height = Application.GetRealHeight(53),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
@@ -66,7 +68,7 @@
btnFloor.MouseUpEventHandler = (sender, e) =>
{
string nowSelectId = null;
- var list = FunctionList.List.GetArmSensorList();
+ var list = FunctionList.List.GetArmCenterList();
#if DEBUG
list.AddRange(FunctionList.List.GetLightList());
@@ -81,19 +83,25 @@
}, nowSelectId);
};
+ showdFunctionTypeRow.AddChidren(new Button() {
+ Height = 1,
+ Y = Application.GetRealHeight(52),
+ BackgroundColor = CSS_Color.DividingLineColor
+ });
+
#endregion
functionListView = new VerticalScrolViewLayout()
{
Y = showdFunctionTypeRow.Bottom,
- Height = Application.GetRealHeight(530-60),
+ Height = Application.GetRealHeight(530-60-10),
BackgroundColor = CSS_Color.BackgroundColor,
};
bodyView.AddChidren(functionListView);
- var listAllFun = FunctionList.List.GetArmSensorList();
+ var listAllFun = FunctionList.List.GetArmCenterList();
#if DEBUG
listAllFun.AddRange(FunctionList.List.GetLightList());
#endif
@@ -145,7 +153,7 @@
if (functions == null)
{
//鍒濆鍊�
- functions = FunctionList.List.GetArmSensorList();
+ functions = FunctionList.List.GetArmCenterList();
}
@@ -177,6 +185,8 @@
inValue = "alarm";
break;
case SPK.SensorDoorWindow:
+ case SPK.SensorDryContact:
+ case SPK.SensorDryContact2:
inKey = "contact_status";
inValue = "open";
break;
--
Gitblit v1.8.0