Merge branch 'WJC' into temp-wxr

wxr

2021-03-17 47b841ed6c4d7dc03ff25bf74454fa41cd4e02a5

 HDL_ON/UI/UI2/4-PersonalCenter/PirDevice/AddControlComplete.cs

@@ -202,7 +202,7 @@
               // this.RemoveFromParent();
                MainPage.BasePageView.RemoveViewByTag("PirView");
                //主界面
                MainPage.BasePageView.RemoveViewByTag("PirMain");
                //MainPage.BasePageView.RemoveViewByTag("PirMain");
                
            };
            #endregion