Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy

tzy

2021-03-26 0c1e29166e6b188939c092d16f87ce2a27662c5f

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

@@ -91,12 +91,7 @@

                SetPir setPir = new SetPir();
                MainPage.BasePageView.AddChidren(setPir);
                setPir.Show(() =>
                {
                    //BackAction();
                    ////刷新界面
                    UIView(vv);
                });
                setPir.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            ///添加遥控器图标点击事件
@@ -362,7 +357,6 @@
        public override void RemoveFromParent()
        {
            BackAction();
            BackAction = null;
            base.RemoveFromParent();
        }