2020-12-17 1.信息中心增加换行显示。2.收到报警推送类型的通知才弹窗。

JLChen

2020-12-17 849d8656a8ec66bf3472ddabdc541f98cd0f3e09

 HDL_ON/Common/HDLCommon.cs

@@ -15,6 +15,11 @@
    /// </summary>
    public class HDLCommon
    {
        /// <summary>
        /// 收到推送Action事件
        /// </summary>
        public static Action GetPushMessageAction;

        #region ■ 变量声明___________________________
        /// <summary>
        /// 通用方法
@@ -256,6 +261,7 @@
                        new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
                        //退出登录操作
                        CheckLogout();
                     
                    });
                    return;
                }
@@ -263,7 +269,12 @@
                {
                    Shared.Application.RunOnMainThread(() =>
                    {
                        new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
                        //报警推送才弹窗提示（messageType包含Alarm关键字的）
                        if (jpushMessageInfo.messageType != null && jpushMessageInfo.messageType.Contains("Alarm"))
                        {
                            new Alert(jpushMessageInfo.Title, jpushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
                        }
                        GetPushMessageAction?.Invoke();
                    });
                    return;
                }
@@ -359,6 +370,17 @@
                    break;
            }
        }


        /// <summary>
        /// 
        /// </summary>
        /// <param name="userName"></param>
        /// <returns></returns>
        public string GetUserName(string userName)
        {
            return string.IsNullOrEmpty(userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : userName;
        }
        #endregion
    }
}