From 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 06 七月 2021 09:34:37 +0800
Subject: [PATCH] 合并乐橙代码

---
 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
index d6d93ae..a097bcd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs
@@ -196,8 +196,10 @@
                 Height = Application.GetRealWidth(40),
                 UnSelectedImagePath = "FunctionIcon/AC/SweepIconNullOn.png",
             };
-            FrameWhiteCentet1.AddChidren(btnSwing);
-
+            if (device.GetAttribute(FunctionAttributeKey.Swing) != null)
+            {
+                FrameWhiteCentet1.AddChidren(btnSwing);
+            }
 
 
             btnWindSpeed = new Button()
@@ -327,8 +329,7 @@
                     btnModeIcon.IsSelected = btnModeText.IsSelected = true;
                     device.SetAttrState(FunctionAttributeKey.Mode, m);
                     btnMode.UnSelectedImagePath = acFunction.GetModeIconPath(m);
-                    System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
-                    //btnMode.UnSelectedImagePath = btnModeIcon.UnSelectedImagePath;
+                    Dictionary<string, string> d = new Dictionary<string, string>();
                     d.Add(FunctionAttributeKey.Mode, m);
                     Control.Ins.SendWriteCommand(device, d);
                     dialog.Close();
@@ -594,8 +595,8 @@
                 {
                     Gravity = Gravity.CenterHorizontal,
                     Y = Application.GetRealHeight(334 + 80),
-                    Width = Application.GetRealWidth(30),
-                    Height = Application.GetRealWidth(30),
+                    Width = Application.GetRealWidth(35),
+                    Height = Application.GetRealWidth(35),
                     UnSelectedImagePath = "FunctionIcon/AC/More.png",
                 };
                 FrameWhiteCentet1.AddChidren(btnMore);

--
Gitblit v1.8.0