Merge branch 'tzy' into NewFilePath

wxr

2020-12-17 6ec12a036c96a200fc0a941967d6b4d07592f863

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

@@ -113,8 +113,12 @@
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = tv.collect
            };
            controlView.AddChidren(btnCollection);

            //controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                controlView.AddChidren(btnCollection);
            }

            btnChangeTVAV = new Button()
            {
@@ -332,7 +336,6 @@
            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.TV)).LoadTopView_FunctionTop(tv, actionRefresh);
            DriverLayer.Control.Ins.SendReadCommand(tv);

        }