Merge branch 'dev-tzy' into NewFilePath

wxr

2021-02-01 1dade03e0e71076af3a3de1bf10ba6cad61ac216

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

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

            btnSwitchIcon = new Button()
            {