From 01b8b5bde8a58060bdd03b78a32747c5aa551976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 十二月 2021 09:32:54 +0800
Subject: [PATCH] 111
---
HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs
index 5647415..4ff5844 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ArmCenter/AddOutputPage.cs
@@ -37,7 +37,7 @@
SecurityAlarm alarm;
- public AddOutputPage(SecurityAlarm inOutput ,Action<SecurityAlarm> action)
+ public AddOutputPage(SecurityAlarm inOutput, Action<SecurityAlarm> action)
{
bodyView = this;
refreshAction = action;
@@ -92,7 +92,7 @@
functionListView = new VerticalScrolViewLayout()
{
Y = showdFunctionTypeRow.Bottom,
- Height = Application.GetRealHeight(530 -100),
+ Height = Application.GetRealHeight(530 - 100),
BackgroundColor = CSS_Color.BackgroundColor,
};
bodyView.AddChidren(functionListView);
@@ -136,7 +136,7 @@
/// <summary>
/// 閰嶇疆鏁版嵁
/// </summary>
- void SetData(string roomId="")
+ void SetData(string roomId = "")
{
allocatedList.Clear();
foreach (var function in FunctionList.List.GetLightList())
@@ -207,11 +207,14 @@
var output = alarm.output.Find((obj) => obj.sid == function.sid);
if (output == null)
{
- output = new SecurityOutput() { status = new List<SecurityOutputStatus> { new SecurityOutputStatus {
+ output = new SecurityOutput()
+ {
+ status = new List<SecurityOutputStatus> { new SecurityOutputStatus {
key = FunctionAttributeKey.OnOff,
value = "on"
- } } };
-
+ } }
+ };
+
output.sid = function.sid;
}
//else
@@ -259,7 +262,7 @@
TextColor = CSS_Color.PromptingColor1,
};
functionRow.AddChidren(btnState);
-
+
Button btnChooseIcon = new Button()
{
@@ -299,7 +302,7 @@
var localOutput = alarm.output.Find((obj) => obj.sid == output.sid);
- if (localOutput!=null)
+ if (localOutput != null)
{
btnChooseIcon.IsSelected = true;
btnState.Text = output.StateText();
@@ -376,7 +379,7 @@
optinView.AddChidren(btnClose);
if (output.status.Count > 0)
{
- btnOpen.IsSelected = output.status[0].value.ToLower() == "on";
+ btnOpen.IsSelected = output.status[0].value.ToLower() == "on";
btnClose.IsSelected = !btnOpen.IsSelected;
}
--
Gitblit v1.8.0