Merge branch 'tzy' into NewFilePath

wxr

2020-12-17 6ec12a036c96a200fc0a941967d6b4d07592f863

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -94,6 +94,12 @@
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
        }

        public override void RemoveFromParent()
        {
            UnregisterGetPushMessageAction();
            base.RemoveFromParent();
        }

        public void LoadPage()
        {
            try
@@ -656,7 +662,13 @@
                    SelectedImagePath = "Collection/CollectionWhiteIcon.png",
                    UnSelectedImagePath = "Collection/CollectionIcon.png",
                };
                view.AddChidren(btnCollection);
                //view.AddChidren(btnCollection);
                //2020-12-16 如果是成员隐藏收藏功能
                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
                {
                    view.AddChidren(btnCollection);
                }

                LoadEvent_FunctionCollection(btnCollection, function);

                if (function.functionCategory == FunctionCategory.Curtain)
@@ -890,7 +902,13 @@
                    SelectedImagePath = "Collection/CollectionWhiteIcon.png",
                    UnSelectedImagePath = "Collection/CollectionIcon.png",
                };
                view.AddChidren(btnCollection);
                //view.AddChidren(btnCollection);
                //2020-12-16 如果是成员隐藏收藏功能
                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
                {
                    view.AddChidren(btnCollection);
                }

                LoadEvent_SceneCollection(btnCollection, scene);
              
                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, scene);