Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 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,
@@ -243,6 +243,8 @@


            }
            else if (function.spk == SPK.AcstParent) {
            }
            else
            {
                if (function.spk == SPK.ClothesHanger)//晾衣架