Merge branch 'temp-wxr' into NewFilePath

wxr

2021-02-23 34d49c20c2c2543658e844847c5eaa87f4c954e9

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

@@ -105,6 +105,10 @@
            {
                functionList.AddRange(FunctionList.List.sensorsEnvironmentalScience);
            }
            else if (titleId == StringId.Sensor)
            {
                functionList.AddRange(FunctionList.List.sensorsArm);
            }
            functionList.OrderByDescending(o => o.controlCounter).ToList();

            ShowFunctionRow(functionList);
@@ -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)
                    {
@@ -132,7 +136,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.sid
                        Tag = function.spk + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
@@ -148,7 +152,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.sid
                        Tag = function.spk + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);