Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-18 f2d122dc78c58925a05d770d716e7fefcbd784ef

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

old mode 100644
new mode 100755
@@ -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()
            {