Merge branch 'WJC' into wxr6

wxr

2021-06-09 46fef61e8de822dc4a9eebca530ce37f2ed014f7

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

@@ -54,6 +54,7 @@
            FrameLayout50 banbenhaoFLayout = new FrameLayout50();
            banbenhaoFLayout.btnNextIcon.Visible = false;
            banbenhaoFLayout.btnText.Text = Language.StringByID(StringId.banbenhao) + ":"+ versions.version;
            banbenhaoFLayout.btnText.Width = Application.GetRealWidth(280);
            banbenhaoFLayout.frameLayout.Y = editNameFLayout.frameLayout.Bottom;// banbenshengjiFL.frameLayout.Bottom;
            viewLayout.AddChidren(banbenhaoFLayout.FLayoutView());
            //删除