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 | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 232684e..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();
@@ -185,16 +185,16 @@
{
var btnHumidityIcon = new Button()
{
- X = Application.GetRealWidth(110),
+ X = Application.GetRealWidth(120),
Y = Application.GetRealHeight(66),
Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(18),
UnSelectedImagePath = "FunctionIcon/CAC/HvacCacHumidityIcon.png",
};
bodyDiv.AddChidren(btnHumidityIcon);
var btnHumidityValues = new TextButton()
{
- X = Application.GetRealWidth(130),
+ X = Application.GetRealWidth(140),
Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(18),
TextColor = 0xFF161616,
@@ -243,6 +243,8 @@
}
+ else if (function.spk == SPK.AcstParent) {
+ }
else
{
if (function.spk == SPK.ClothesHanger)//鏅捐。鏋�
--
Gitblit v1.8.0