From bb4bcd1b320502b36d19aacec52ed886a975249a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 19 七月 2022 11:04:00 +0800
Subject: [PATCH] 1.5.9打包
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 74 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 436d5f9..a873ee1 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
-using HDL_ON.UI.Music;
using Shared;
namespace HDL_ON.UI
@@ -9,7 +8,7 @@
public partial class FunctionControlZone : FrameLayout
{
#region 鍖哄煙鎺т欢
- static FrameLayout bodyDiv;
+ FunctionControlZone bodyDiv;
/// <summary>
/// 鍔熻兘/鍦烘櫙icon
/// </summary>
@@ -26,6 +25,11 @@
/// 鏀惰棌鎸夐挳
/// </summary>
Button btnCollectionIcon;
+ /// <summary>
+ /// 绂荤嚎鏂囨湰
+ /// </summary>
+ Button btnOffline;
+
#endregion
#region 鍖哄煙鍙橀噺
@@ -61,8 +65,8 @@
}
LoadDiv();
-
- btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
+
+ btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/{function.IconName}.png";
if (SPK.CurtainSpkList().Contains(function.spk))
{//绐楀笜娌℃湁寮�鍏虫寜閽�
@@ -95,6 +99,66 @@
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(51),
+ Y = Application.GetRealHeight(66),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "FunctionIcon/CAC/HvacCacHumidityIcon.png",
+ };
+ bodyDiv.AddChidren(btnHumidityIcon);
+ var btnHumidityValues = new TextButton()
+ {
+ X = Application.GetRealWidth(70),
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(18),
+ TextColor = 0xFF161616,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = function.GetAttrState(FunctionAttributeKey.RoomHumidity) + "%",
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ btnHumidityValues.Width = btnHumidityValues.GetTextWidth();
+ bodyDiv.AddChidren(btnHumidityValues);
+
+ Button btnTempIcon = new Button()
+ {
+ X = Application.GetRealWidth(110),
+ 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(130),
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(18),
+ TextColor = 0xFF161616,
+ TextSize = CSS_FontSize.TextFontSize,
+ Text = function.GetAttrState(FunctionAttributeKey.RoomTemp) + "掳C",
+ TextAlignment = TextAlignment.CenterLeft,
+ };
+ 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
{
@@ -229,7 +293,7 @@
if (!function.online)
{
bodyDiv.BackgroundColor = CSS_Color.PromptingColor2;
- var btnOffline = new Button()
+ btnOffline = new Button()
{
X = Application.GetRealWidth(8 + 10 + 32),
Y = Application.GetRealHeight(28 + 24),
--
Gitblit v1.8.0