Merge remote-tracking branch 'origin/NewFilePath' into WJC

陈嘉乐

2021-01-11 1026814d931de92f0da5f15a58870565a94100e0

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

@@ -77,14 +77,14 @@

            foreach (var function in room.GetRoomFunctions(false))
            {
                if (function.functionCategory == FunctionCategory.Sensor)
                if (function.Spk_Prefix == FunctionCategory.Sensor)
                {
                    continue;
                }

                functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });

                if (function.functionType == FunctionType.RGB || function.functionType == FunctionType.Dimmer)
                if (function.spk == SPK.LightRGB || function.spk == SPK.LightDimming)
                {
                    var functionDiv = new FunctionControlZone(function)
                    {
@@ -95,7 +95,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.functionCategory.ToString() + "-" + function.functionType + "-" + function.sid
                        Tag = function.spk + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
@@ -111,7 +111,7 @@
                        BorderColor = 0x00FFFFFF,
                        BorderWidth = 1,
                        BackgroundColor = CSS_Color.MainBackgroundColor,
                        Tag = function.functionCategory.ToString() + "-" + function.functionType + "-" + function.sid
                        Tag = function.spk + function.sid
                    };
                    functionDiv.LoadFunctionDiv();
                    functionListView.AddChidren(functionDiv);
@@ -224,7 +224,7 @@
            btnCollectionIcon.MouseUpEventHandler += (sender, e) =>
            {
                btnCollectionIcon.IsSelected = scene.collect = !btnCollectionIcon.IsSelected;
                scene.SaveSceneData(true);
                scene.CollectScene();
            };
        }
        /// <summary>