Merge branch 'WJC' into temp-wxr

wxr

2021-03-24 94bed925cf453e148bc5a7556a8a86e0bcb9ad6c

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

@@ -32,9 +32,8 @@
            this.AddChidren(topView.FLayoutView());
            topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
            {
                BackAction();
                BackAction = null;
                this.RemoveFromParent();
               
                RemoveFromParent();
            };

            FrameLayout middFLayout = new FrameLayout();
@@ -519,7 +518,15 @@
                }
            }, id, "品牌列表");
        }

        /// <summary>
        /// 移除界面
        /// </summary>
        public override void RemoveFromParent()
        {
            BackAction();
            BackAction = null;
            base.RemoveFromParent();
        }

    }