合并乐橙代码

wei

2021-07-06 533735b4bbaea0f7a87ccd3d1781ea7d469f75b5

 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);