From 04c9e08d5069c986c918fa2e98b22dd85921effd Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 02 九月 2022 15:48:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxb' into Dev-Wxr
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 96 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 92 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index a873ee1..232684e 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -95,6 +95,87 @@
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)
{
@@ -104,7 +185,7 @@
{
var btnHumidityIcon = new Button()
{
- X = Application.GetRealWidth(51),
+ X = Application.GetRealWidth(110),
Y = Application.GetRealHeight(66),
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
@@ -113,20 +194,21 @@
bodyDiv.AddChidren(btnHumidityIcon);
var btnHumidityValues = new TextButton()
{
- X = Application.GetRealWidth(70),
+ X = Application.GetRealWidth(130),
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(110),
+ X = Application.GetRealWidth(51),
Y = Application.GetRealHeight(66),
Width = Application.GetMinRealAverage(17),
Height = Application.GetMinRealAverage(17),
@@ -136,13 +218,14 @@
var btnTempValues = new TextButton()
{
- X = Application.GetRealWidth(130),
+ 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);
@@ -290,6 +373,11 @@
bodyDiv.AddChidren(btnCollectionIcon);
}
+ if(function.spk == SPK.SenesorMegahealth)
+ {
+ bodyDiv.AddChidren(btnCollectionIcon);
+ }
+
if (!function.online)
{
bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
--
Gitblit v1.8.0