Merge branch 'WJC' into temp-wxr

wxr

2021-03-31 3532db3610381f37eca1a6ac783d882517847c91

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

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text;
using HDL_ON.Entity;
using HDL_ON.UI.UI2.Intelligence.Automation.LogicView;
using Shared;
@@ -91,12 +92,7 @@

                SetPir setPir = new SetPir();
                MainPage.BasePageView.AddChidren(setPir);
                setPir.Show(() =>
                {
                    //BackAction();
                    ////刷新界面
                    UIView(vv);
                });
                setPir.Show();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            ///添加遥控器图标点击事件
@@ -152,8 +148,8 @@
            #endregion
            ///初始化界面
            UIView(vv);

        }

        /// <summary>
        /// 加载UI界面
        /// </summary>
@@ -362,7 +358,6 @@
        public override void RemoveFromParent()
        {
            BackAction();
            BackAction = null;
            base.RemoveFromParent();
        }