20200811

wxr

2020-08-11 2bec9c838d2d688025698de8ec1de401ffd7dd1f

 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>
@@ -63,11 +62,10 @@
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                TextAlignment = TextAlignment.CenterLeft,
                Text = UserConfig.Instance.CurFoor,
                Text = OnAppConfig.Instance.CurFoor,
            };
            roomFloorChangeView.AddChidren(btnFoor);
            #endregion


            functionListView = new VerticalScrolViewLayout()
            {
@@ -80,28 +78,57 @@
            {
                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.functionType != FunctionType.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(titleId == StringId.FloorHeating)
                {
                    if(function.functionType != FunctionType.FloorHeating )
                    {
                        continue;
                    }
                }
                if(titleId == StringId.Electric)
                {
                    if(function.functionType != FunctionType.Socket &&
                        function.functionType != FunctionType.TV &&
                        function.functionType != FunctionType.Fan)
                    {
                        continue;
                    }
                }
                if (titleId == StringId.EnvironmentalScience)
                {

                if (function.functionType == "RGB" || function.functionType == "Dimmer")
                    if (function.functionType != FunctionType.PM10 ||
                    function.functionType != FunctionType.PM25 ||
                    //function.functionType != FunctionType.Noise ||
                    function.functionType != FunctionType.WindPower ||
                    function.functionType != FunctionType.CO2 ||
                    function.functionType != FunctionType.Temp ||
                    function.functionType != FunctionType.TVOC ||
                    function.functionType != FunctionType.Humidity)
                    {
                        continue;
                    }
                }
                if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
                {
                    var functionDiv = new FunctionControlZone(function)
                    {
@@ -133,6 +160,7 @@
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
                }
                functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
            }

        }