From b3c9ada9a3e758c9f67abb9fc0a6a2764c7ea03d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 13 十月 2022 11:19:07 +0800
Subject: [PATCH] 光伏更新主页图标

---
 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs
index 2dfc170..4c33ddf 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(51),
+                    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(70),
+                    X = Application.GetRealWidth(140),
                     Y = Application.GetRealHeight(64),
                     Height = Application.GetRealHeight(18),
                     TextColor = 0xFF161616,
@@ -208,7 +208,7 @@
 
                 Button btnTempIcon = new Button()
                 {
-                    X = Application.GetRealWidth(110),
+                    X = Application.GetRealWidth(51),
                     Y = Application.GetRealHeight(66),
                     Width = Application.GetMinRealAverage(17),
                     Height = Application.GetMinRealAverage(17),
@@ -218,7 +218,7 @@
 
                 var btnTempValues = new TextButton()
                 {
-                    X = Application.GetRealWidth(130),
+                    X = Application.GetRealWidth(70),
                     Y = Application.GetRealHeight(64),
                     Height = Application.GetRealHeight(18),
                     TextColor = 0xFF161616,
@@ -242,6 +242,8 @@
 
 
 
+            }
+            else if (function.spk == SPK.AcstParent) {
             }
             else
             {
@@ -403,6 +405,7 @@
             switch (function.spk)
             {
                 case SPK.LightDimming:
+                case SPK.LightRGBW:
                 case SPK.LightRGB:
                     #region Dimmer
                     var btnDimmerMinValues = new Button()

--
Gitblit v1.8.0