20200331

wxr

2020-03-31 002a3f2e9d2f9579c01f88af12bd8a320003569f

 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs

@@ -28,7 +28,6 @@
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(titleId)).LoadTopView();


            /// <summary>
            /// 房间内容显示区域
            /// </summary>
@@ -68,7 +67,6 @@
            roomFloorChangeView.AddChidren(btnFoor);
            #endregion


            functionListView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64 + 52),
@@ -80,28 +78,28 @@
            {
                if (titleId == StringId.Lights)
                {
                    if (function.functionCategory != FunctionType.Light)
                    if (function.functionCategory != FunctionCategory.Light)
                    {
                        continue;
                    }
                }
                if (titleId == StringId.AC)
                {
                    if (function.functionCategory != FunctionType.AC)
                    if (function.functionCategory != FunctionCategory.AC)
                    {
                        continue;
                    }
                }
                if (titleId == StringId.Curtain)
                {
                    if (function.functionCategory != FunctionType.Curtain)
                    if (function.functionCategory != FunctionCategory.Curtain)
                    {
                        continue;
                    }
                }
                functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });

                if (function.functionType == "RGB" || function.functionType == "Dimmer")
                if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
                {
                    var functionDiv = new FunctionControlZone(function)
                    {