2021-3-30-2

陈嘉乐

2021-03-30 003abaf86b766eb40ef62300ab0c707774c36ba9

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

@@ -83,27 +83,31 @@

            if (titleId == StringId.Lights)
            {
                functionList.AddRange(FunctionList.List.lights);
                functionList.AddRange(FunctionList.List.GetLightList());
            }
            else if (titleId == StringId.AC)
            {
                functionList.AddRange(FunctionList.List.aCs);
                functionList.AddRange(FunctionList.List.GetAcList());
            }
            else if (titleId == StringId.Curtain)
            {
                functionList.AddRange(FunctionList.List.curtains);
                functionList.AddRange(FunctionList.List.GetCurtainList());
            }
            else if (titleId == StringId.FloorHeating)
            {
                functionList.AddRange(FunctionList.List.floorHeatings);
                functionList.AddRange(FunctionList.List.GetFloorHeatingList());
            }
            else if (titleId == StringId.Electric)
            {
                functionList.AddRange(FunctionList.List.electricals);
                functionList.AddRange(FunctionList.List.GetElectricals());
            }
            else if (titleId == StringId.EnvironmentalScience)
            {
                functionList.AddRange(FunctionList.List.sensorsEnvironmentalScience);
                functionList.AddRange(FunctionList.List.GetEnvirSensorsList());
            }
            else if (titleId == StringId.Sensor)
            {
                functionList.AddRange(FunctionList.List.GetArmSensorList());
            }
            functionList.OrderByDescending(o => o.controlCounter).ToList();

@@ -121,7 +125,7 @@
            foreach (var function in showList)
            {

                if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
                if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                {
                    var functionDiv = new FunctionControlZone(function)
                    {