Merge branch 'CJL' into NewFilePath

wxr

2020-12-20 6a8e27a164158b31356b30c1e2947b95898275fe

 HDL_ON/Common/HDLCommon.cs

@@ -270,12 +270,15 @@
                {
                    Shared.Application.RunOnMainThread(() =>
                    {
                        GetPushMessageAction?.Invoke();
                        //报警推送才弹窗提示（messageType包含Alarm关键字的）
                        if (jpushMessageInfo.messageType != null && jpushMessageInfo.messageType.Contains("Alarm"))
                        {
                            new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
                            //报警推送弹窗提示
                            ShowAlarmPushMessage(jpushMessageInfo);
                            //new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
                        }
                        GetPushMessageAction?.Invoke();
                       
                    });
                    return;
                }
@@ -340,6 +343,57 @@
                }
            }).Start();
        }

        /// <summary>
        /// 
        /// </summary>
        ConfirmDialog alarmPushConfirmDialog;
        /// <summary>
        /// 报警推送弹窗提示,点击查看跳转信息中心
        /// </summary>
        /// <param name="jpushMessageInfo"></param>
        public void ShowAlarmPushMessage(JPushMessageInfo jpushMessageInfo)
        {
            //没登录不处理
            if (UserInfo.Current == null || !UserInfo.Current.IsLogin || MainPage.BasePageView == null)
            {
                return;
            }

            //跳转信息中心页面
            Action goAction = () =>
            {
                //Dialog
                alarmPushConfirmDialog = null;
                Action backAction = () => {
                   
                };
                var skipPage = new MessageCenterPage();
                MainPage.BasePageView.AddChidren(skipPage);
                skipPage.LoadPage(backAction);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };

            //取消事件
            Action cancelAction = () =>
            {
                alarmPushConfirmDialog = null;
            };

            //防止多次弹窗处理
            if (alarmPushConfirmDialog == null)
            {
                alarmPushConfirmDialog = new ConfirmDialog();
                alarmPushConfirmDialog.ShowDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver);
            }
            else
            {
                alarmPushConfirmDialog.RefreshDialog(Language.StringByID(StringId.Tip), jpushMessageInfo.Content, goAction, cancelAction, StringId.Cancel, StringId.LookOver);

            }

        }

        #endregion

        #region ■ 常用方法_______________________