Merge branch 'wxr6' into wxr4

wxr

2021-07-05 1ee407dd57a7273ef6b686ac25a40d4199f5bce9

 HDL_ON/Common/HDLCommon.cs

@@ -472,6 +472,10 @@
                {

                };
                while (MainPage.BasePageView.ChildrenCount > 1)
                {
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 2;
                }
                var skipPage = new MessageCenterPage();
                MainPage.BasePageView.AddChidren(skipPage);
                skipPage.LoadPage(backAction);
@@ -484,6 +488,7 @@
                alarmPushConfirmDialog = null;
            };


            //防止多次弹窗处理
            if (alarmPushConfirmDialog == null)
            {