From f16e7e4df7e7813e4a3052dae752aae3e6937b30 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 08 七月 2022 16:53:12 +0800
Subject: [PATCH] 自研可视对讲、毫米波
---
HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 852711b..a873ee1 100644
--- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
+++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
@@ -106,18 +106,18 @@
{
X = Application.GetRealWidth(51),
Y = Application.GetRealHeight(66),
- Width = Application.GetRealWidth(17),
- Height = Application.GetRealWidth(17),
- UnSelectedImagePath = "Public/DeviceInfoIcon/HumidityIcon.png",
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "FunctionIcon/CAC/HvacCacHumidityIcon.png",
};
bodyDiv.AddChidren(btnHumidityIcon);
var btnHumidityValues = new TextButton()
{
- X = btnHumidityIcon.Right + Application.GetRealWidth(4),
- Y = Application.GetRealHeight(66),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS_Color.MainBackgroundColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ 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,
};
@@ -126,26 +126,26 @@
Button btnTempIcon = new Button()
{
- X = btnHumidityValues.Right + Application.GetRealWidth(20),
- Gravity = Gravity.CenterVertical,
+ X = Application.GetRealWidth(110),
+ Y = Application.GetRealHeight(66),
Width = Application.GetMinRealAverage(17),
Height = Application.GetMinRealAverage(17),
- UnSelectedImagePath = "Public/DeviceInfoIcon/TempIcon.png",
+ UnSelectedImagePath = "FunctionIcon/CAC/HvacCacTempIcon.png",
};
bodyDiv.AddChidren(btnTempIcon);
var btnTempValues = new TextButton()
{
- X = btnTempIcon.Right + Application.GetRealWidth(4),
- Gravity = Gravity.CenterVertical,
- TextColor = CSS_Color.MainBackgroundColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = function.GetAttrState(FunctionAttributeKey.RoomTemp) + "掳",
+ 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();
- btnTempValues.Width = btnTempValues.GetTextWidth();
- bodyDiv.AddChidren(btnTempIcon);
+ bodyDiv.AddChidren(btnTempValues);
var btnJinMaoIcon = new Button()
{
--
Gitblit v1.8.0