From 23bbed132eea46eef51c6d01c21b346238e29ee2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 30 六月 2022 13:39:12 +0800
Subject: [PATCH] Merge branch 'wxr0114' into V1.5.9
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 203 +++-----------------------------------------------
1 files changed, 15 insertions(+), 188 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 92fea27..8185dc9 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -54,7 +54,6 @@
/// <summary>
/// 鍔犺浇鍔熻兘绫诲瀷鎺у埗鍗＄墖
- /// Tag 鍔熻兘灞炴�ф樉绀�
/// </summary>
public void LoadFunctionDiv()
{
@@ -100,178 +99,6 @@
else if (function.spk == SPK.DoorLock)
{
btnIcon.UnSelectedImagePath = "FunctionIcon/DoorLock/DoorLock.png";
- }
- else if(SPK.PanelSpkList().Contains(function.spk))//鏅鸿兘闈㈡澘璁惧
- {
- var powerLowTipAttr = function.attributes.Find((obj) => obj.key == FunctionAttributeKey.BatteryState);
- if (powerLowTipAttr != null)
- {
- if (powerLowTipAttr.state.ToLower() == "low")
- {
- Button btnTipPowerLow = new Button()
- {
- X = Application.GetRealWidth(307),
- Y = Application.GetRealHeight(70),
- Width = Application.GetRealWidth(24),
- Height = Application.GetRealWidth(24),
- UnSelectedImagePath = "FunctionIcon/ArmSensor/PowerLowIcon.png",
- SelectedImagePath = "FunctionIcon/ArmSensor/PowerLowIcon.png",
- };
- this.AddChidren(btnTipPowerLow);
- }
- }
- var alarmStatusAttr = function.GetAttribute("alarm_status");
- if(alarmStatusAttr !=null)
- {
- var btnAlarmStatus = new Button()
- {
- X = Application.GetRealWidth(8 + 10 + 32),
- Y = Application.GetRealHeight(53),
- Width = Application.GetRealWidth(200),
- Height = Application.GetRealHeight(24),
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
- Tag = "AlarmStatus"
- };
- if (alarmStatusAttr.state == "alarm")
- {
- btnAlarmStatus.TextID = StringId.InAlarm;
- btnAlarmStatus.TextColor = CSS_Color.WarningColor;
- }
- else
- {
- btnAlarmStatus.TextID = StringId.zhengchang;
- btnAlarmStatus.TextColor = CSS_Color.MainColor;
- }
-
- bodyDiv.AddChidren(btnAlarmStatus);
- }
-
- //var tipScrView1 = new HorizontalScrolViewLayout() {
- // X = Application.GetRealWidth(10),
- // Y = Application.GetRealHeight(56),
- // Height = Application.GetRealHeight(20),
- // Width = Application.GetRealWidth(330),
- // BackgroundColor = 0x22220022,
- //};
- //var tipScrView2 = new HorizontalScrolViewLayout()
- //{
- // X = Application.GetRealWidth(10),
- // Y = Application.GetRealHeight(83),
- // Height = Application.GetRealHeight(20),
- // Width = Application.GetRealWidth(330),
- // BackgroundColor = 0x22220022,
- //};
-
-
- foreach (var target in function.targetSids)
- {
- //bodyDiv.AddChidren(tipScrView1);
- //bodyDiv.AddChidren(tipScrView2);
- var targetObj = FunctionList.List.Functions.Find((obj) => target == obj.sid);
- if(targetObj == null)
- {
- continue;
- }
- if (SPK.AcSpkList().Contains(targetObj.spk))
- {
- bodyDiv.Height = Application.GetRealHeight(126);
-
- AC acDevice = new AC();
- var btnAcMode = new Button()
- {
- X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(56),
- Width = Application.GetRealWidth(62),
- Height = Application.GetRealHeight(19),
- BackgroundColor = 0x334484F4,
- TextAlignment = TextAlignment.Center,
- TextSize = 10,
- TextColor = 0xFF4484F4,
- Text = Language.StringByID(StringId.AC) + acDevice.GetModeAttrText(targetObj.GetAttrState(FunctionAttributeKey.Mode)),
- Tag = target + "screen.panel.ac.mode",
- Radius = (uint)Application.GetRealWidth(4),
- };
- bodyDiv.AddChidren(btnAcMode);
- //tipScrView1.AddChidren(new Button() { Width = Application.GetRealWidth(16)});
-
- var btnAcTemp = new Button()
- {
- X = Application.GetRealWidth(10 + 72),
- Y = Application.GetRealHeight(56),
- Width = Application.GetRealWidth(62),
- Height = Application.GetRealHeight(19),
- BackgroundColor = 0x334484F4,
- TextAlignment = TextAlignment.Center,
- TextSize = 10,
- TextColor = 0xFF4484F4,
- Text = Language.StringByID(StringId.AC) + targetObj.GetAttrState(FunctionAttributeKey.Temperature) + "掳C",
- Radius = (uint)Application.GetRealWidth(4),
- Tag = target + "screen.panel.ac.temp"
- };
- bodyDiv.AddChidren(btnAcTemp);
- //tipScrView1.AddChidren(new Button() { Width = Application.GetRealWidth(6) });
- }
- else if (SPK.FhSpkList().Contains(targetObj.spk))
- {
-
- FloorHeating fhDevice = new FloorHeating();
- var btnFhMode = new Button()
- {
- X = Application.GetRealWidth(10 + 72*2),
- Y = Application.GetRealHeight(56),
- Radius = (uint)Application.GetRealWidth(4),
- Width = Application.GetRealWidth(62),
- Height = Application.GetRealHeight(19),
- BackgroundColor = 0x33ff9d54,
- TextAlignment = TextAlignment.Center,
- TextSize = 10,
- TextColor = 0xFFff9d54,
- Text = Language.StringByID(StringId.FloorHeating) + fhDevice.GetModeAttrText(targetObj.GetAttrState(FunctionAttributeKey.Mode)),
- Tag = target + "screen.panel.fh.mode"
- };
- bodyDiv.AddChidren(btnFhMode);
- //tipScrView1.AddChidren(new Button() { Width = Application.GetRealWidth(6) });
-
- var btnFhTemp = new Button()
- {
- X = Application.GetRealWidth(10 + 72 * 3),
- Y = Application.GetRealHeight(56),
- Radius = (uint)Application.GetRealWidth(4),
- Width = Application.GetRealWidth(62),
- Height = Application.GetRealHeight(19),
- BackgroundColor = 0x33ff9d54,
- TextAlignment = TextAlignment.Center,
- TextSize = 10,
- TextColor = 0xFFff9d54,
- Text = Language.StringByID(StringId.FloorHeating) + targetObj.GetAttrState(FunctionAttributeKey.Temperature) + "掳C",
- Tag = target + "screen.panel.fh.temp"
- };
- bodyDiv.AddChidren(btnFhTemp);
- //tipScrView1.AddChidren(new Button() { Width = Application.GetRealWidth(6) });
- }
- else if (SPK.AirFreshSpkList().Contains(targetObj.spk))
- {
-
- AC acDevice = new AC();
- var btnAirFreshFanSpeed = new Button()
- {
- X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(83),
- Width = Application.GetRealWidth(62),
- Height = Application.GetRealHeight(19),
- BackgroundColor = 0x3309bb07,
- TextAlignment = TextAlignment.Center,
- TextSize = 10,
- TextColor = 0xFF09bb07,
- Radius = (uint)Application.GetRealWidth(4),
- Text = Language.StringByID(StringId.AirFresh) + acDevice.GetFanAttrText(targetObj.GetAttrState(FunctionAttributeKey.FanSpeed)),
- Tag = target + "screen.panel.airFresh.mode"
- };
- bodyDiv.AddChidren(btnAirFreshFanSpeed);
- }
- }
-
}
else
{
@@ -403,21 +230,21 @@
bodyDiv.AddChidren(btnCollectionIcon);
}
- //if (!function.online)
- //{
- // bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
- // btnOffline = new Button()
- // {
- // X = Application.GetRealWidth(8 + 10 + 32),
- // Y = Application.GetRealHeight(28 + 24),
- // Height = Application.GetRealHeight(30),
- // TextID = StringId.DeviceOffline,
- // TextColor = CSS_Color.WarningColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // TextAlignment = TextAlignment.CenterLeft
- // };
- // bodyDiv.AddChidren(btnOffline);
- //}
+ if (!function.online)
+ {
+ bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
+ btnOffline = new Button()
+ {
+ X = Application.GetRealWidth(8 + 10 + 32),
+ Y = Application.GetRealHeight(28 + 24),
+ Height = Application.GetRealHeight(30),
+ TextID = StringId.DeviceOffline,
+ TextColor = CSS_Color.WarningColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextAlignment = TextAlignment.CenterLeft
+ };
+ bodyDiv.AddChidren(btnOffline);
+ }
}
/// <summary>
--
Gitblit v1.8.0