状态属性更改，不要轻易合并

wei

2021-07-09 068c68295cad1967f7aafb4e5e951260ef03d4ce

 HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage.cs

@@ -101,12 +101,12 @@
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = function.collect
            };
            //controlView.AddChidren(btnCollection);
            controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                controlView.AddChidren(btnCollection);
            }
            //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            //{
            //    controlView.AddChidren(btnCollection);
            //}

            btnSwitchIcon = new Button()
            {
@@ -114,7 +114,7 @@
                Y = Application.GetRealHeight(100),
                Width = Application.GetRealWidth(198),
                Height = Application.GetRealWidth(198),
                IsSelected = function.trait_on_off.curValue.ToString() == "on",
                IsSelected = function.trait_on_off.state.ToString() == "on",
                UnSelectedImagePath = "FunctionIcon/Socket/SocketIconBg.png",
                SelectedImagePath = "FunctionIcon/Socket/SocketIconOnBg.png",  
            };
@@ -128,7 +128,7 @@
                Height = Application.GetMinRealAverage(40),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = function.trait_on_off.curValue.ToString() == "on"
                IsSelected = function.trait_on_off.state.ToString() == "on"
            };
            controlView.AddChidren(btnSwitch);