Merge branch 'WJC' into temp-wxr

wxr

2021-03-16 7584dea0241cefc276a4b5311331aee1dcda6c80

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

@@ -9,7 +9,7 @@
    {
        public AddControl()
        {
            Tag = "Pir";
            Tag = "PirView";
        }
        public void Show(Control control)
        {
@@ -151,7 +151,6 @@
                        view.RemoveFromParent();
                    }
                }
                //MainPage.BasePageView.RemoveViewByTag("Pir");
                AddControlComplete addControlComplete = new AddControlComplete();
                MainPage.BasePageView.AddChidren(addControlComplete);
                addControlComplete.Show(control,false);