合并前上传一个版本

黄学彪

2021-03-15 df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0

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

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

            btnSwitchIcon = new Button()
            {