Merge branch 'WJC' into temp-wxr

wxr

2021-03-19 355bf4219bcd33f2178ed3b1aa54e0af71905fdf

 HDL_ON/UI/UI2/4-PersonalCenter/AddDevice/AddMiniRemoteControlDirection4Page.cs

@@ -240,7 +240,7 @@
                        {
                            var page = new UI2.PersonalCenter.PirDevice.PirMain();
                            MainPage.BasePageView.AddChidren(page);
                            page.Show();
                            page.Show(newDevice);
                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        });
                    });