Merge branch 'wxr6' into newBranch1

wxr

2021-07-05 4f8fc4fe0a7d6f73c3a06e6f924a4a2615b090d7

 HDL_ON/Common/HDLCommon.cs

@@ -452,6 +452,10 @@
                {

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


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