Merge branch 'WJC' into temp-wxr

wxr

2021-03-08 8e5ba5665861b29a4b8da0335c81d620aa891862

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

@@ -154,7 +154,7 @@
                //MainPage.BasePageView.RemoveViewByTag("Pir");
                AddControlComplete addControlComplete = new AddControlComplete();
                MainPage.BasePageView.AddChidren(addControlComplete);
                addControlComplete.Show(control);
                addControlComplete.Show(control,false);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            #endregion