wei
2021-06-02 e13a9980ce617db1394a76944186c5d5bd595d5d
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 || function.spk == SPK.ElectricEnergy)
                {
                    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)
                    {
@@ -189,12 +189,12 @@
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = scene.collect
            };
            //bodyDiv.AddChidren(btnCollectionIcon);
            bodyDiv.AddChidren(btnCollectionIcon);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                bodyDiv.AddChidren(btnCollectionIcon);
            }
            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            //{
            //    bodyDiv.AddChidren(btnCollectionIcon);
            //}
            btnIcon.UnSelectedImagePath = "FunctionIcon/Scene/SceneIcon.png";
            if (scene.sceneType == SceneType.MovieScene)