20200608

wxr

2020-06-08 b71dfb3ca100340005d56e1298292807da82322d

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

@@ -97,8 +97,37 @@
                        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 != 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)
@@ -131,6 +160,7 @@
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
                }
                functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(10) });
            }

        }