From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 151 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 8185dc9..0c2265f 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -67,7 +67,7 @@
btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
-
+
if (SPK.CurtainSpkList().Contains(function.spk))
{//绐楀笜娌℃湁寮�鍏虫寜閽�
CurtainFragment();
@@ -95,10 +95,155 @@
this.AddChidren(btnTipPowerLow);
}
}
+
+
+
+ else if (function.spk == SPK.SenesorMegahealth)
+ {
+ var btnStatus = new Button()
+ {
+ X = Application.GetRealWidth(51),
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(18),
+ TextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
+ Text = "",
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = function.sid + "_SenesorMegahealth_Status"
+ };
+ bodyDiv.AddChidren(btnStatus);
+
+
+
+ var tempStatus = function.attributes.Find((sta) => sta.key == FunctionAttributeKey.TargetStatus);
+ if (tempStatus != null)
+ {
+
+ switch (tempStatus.state)
+ {//0绌猴紝1璧帮紝2璺戯紝3鍧愶紝4璺屽�掞紝5绔�
+ case "0":
+ btnStatus.TextID = StringId.SensorNormalState;
+ btnStatus.TextColor = CSS_Color.MainColor;
+ break;
+ case "1":
+ btnStatus.TextID = StringId.SomeoneIn;
+ btnStatus.TextColor = CSS_Color.WarningColor;
+ break;
+ case "2":
+ if (function.extSet.labModel)
+ {
+ btnStatus.TextID = StringId.SomeoneRunning;
+ btnStatus.TextColor = CSS_Color.WarningColor;
+ }
+ else
+ {
+ btnStatus.TextID = StringId.SomeoneIn;
+ btnStatus.TextColor = CSS_Color.WarningColor;
+ }
+ break;
+ case "3":
+ if (function.extSet.labModel)
+ {
+ btnStatus.TextID = StringId.SomeoneSitting;
+ btnStatus.TextColor = CSS_Color.WarningColor;
+ }
+ else
+ {
+ btnStatus.TextID = StringId.SomeoneIn;
+ btnStatus.TextColor = CSS_Color.WarningColor;
+ }
+ break;
+ case "4":
+ btnStatus.TextID = StringId.SomeoneFell;
+ btnStatus.TextColor = CSS_Color.WarningColor;
+ break;
+ case "5":
+ if (function.extSet.labModel)
+ {
+ btnStatus.TextID = StringId.SomeoneStanding;
+ btnStatus.TextColor = CSS_Color.WarningColor;
+ }
+ else
+ {
+ btnStatus.TextID = StringId.SomeoneIn;
+ btnStatus.TextColor = CSS_Color.WarningColor;
+ }
+ break;
+ }
+
+
+ }
+
+ }
+
}
else if (function.spk == SPK.DoorLock)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
+ }
+ else if (function.spk == SPK.HvacCac)
+ {
+ var btnHumidityIcon = new Button()
+ {
+ X = Application.GetRealWidth(120),
+ Y = Application.GetRealHeight(66),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(18),
+ UnSelectedImagePath = "FunctionIcon/CAC/HvacCacHumidityIcon.png",
+ };
+ bodyDiv.AddChidren(btnHumidityIcon);
+ var btnHumidityValues = new TextButton()
+ {
+ X = Application.GetRealWidth(140),
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(18),
+ TextColor = 0xFF161616,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = function.GetAttrState(FunctionAttributeKey.RoomHumidity) + "%",
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = function.sid + "_Humidity",
+ };
+ btnHumidityValues.Width = btnHumidityValues.GetTextWidth();
+ bodyDiv.AddChidren(btnHumidityValues);
+
+ Button btnTempIcon = new Button()
+ {
+ X = Application.GetRealWidth(51),
+ Y = Application.GetRealHeight(66),
+ Width = Application.GetMinRealAverage(17),
+ Height = Application.GetMinRealAverage(17),
+ UnSelectedImagePath = "FunctionIcon/CAC/HvacCacTempIcon.png",
+ };
+ bodyDiv.AddChidren(btnTempIcon);
+
+ var btnTempValues = new TextButton()
+ {
+ X = Application.GetRealWidth(70),
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(18),
+ TextColor = 0xFF161616,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = function.GetAttrState(FunctionAttributeKey.RoomTemp) + "掳C",
+ TextAlignment = TextAlignment.CenterLeft,
+ Tag = function.sid + "_Temp",
+ };
+ btnTempValues.Width = btnTempValues.GetTextWidth();
+ bodyDiv.AddChidren(btnTempValues);
+
+ var btnJinMaoIcon = new Button()
+ {
+ X = Application.GetRealWidth(238),
+ Y = Application.GetRealHeight(64),
+ Width = Application.GetRealWidth(102),
+ Height = Application.GetRealHeight(29),
+ UnSelectedImagePath = "FunctionIcon/CAC/JinMaoIcon.png"
+ };
+ bodyDiv.AddChidren(btnJinMaoIcon);
+
+
+
+ }
+ else if (function.spk == SPK.AcstParent) {
}
else
{
@@ -230,6 +375,11 @@
bodyDiv.AddChidren(btnCollectionIcon);
}
+ if(function.spk == SPK.SenesorMegahealth)
+ {
+ bodyDiv.AddChidren(btnCollectionIcon);
+ }
+
if (!function.online)
{
bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
--
Gitblit v1.8.0