Merge remote-tracking branch 'origin/lss' into temp-wxr

wxr

2021-03-26 80faceb86399017851f9f72feaaef868a37ff23f

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

@@ -7,8 +7,12 @@
{
    public class PirMain : FrameLayout
    {
        /// <summary>
        /// 构造函数
        /// </summary>
        public PirMain()
        {
            /// 标记界面
            Tag = "PirMain";
        }
        /// <summary>
@@ -87,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;
            };
            ///添加遥控器图标点击事件
@@ -123,7 +122,7 @@
                    {
                        if (if_value == 3 || if_value == 4 || if_value == 5 || if_value == 6)
                        {
                            new TipPopView().FlashingBox("暂时不支持该功能.");
                            new TipPopView().FlashingBox(Language.StringByID(StringId.zanshibuzhichigaigongneng));
                            return;
                        }
                        if (DeviceTypeList.Count == 0)
@@ -358,7 +357,6 @@
        public override void RemoveFromParent()
        {
            BackAction();
            BackAction = null;
            base.RemoveFromParent();
        }