20201218-5

wei

2020-12-18 d9338a1defea49b1173640b0d637ebd6e89ab14e

 HDL_ON/Common/HDLCommon.cs

old mode 100644
new mode 100755
@@ -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;
                }
@@ -281,6 +292,10 @@
        {
            //未登录不用处理
            if (!UserInfo.Current.IsLogin) return;

#if DEBUG
            return;
#endif

            Logout();
        }
@@ -304,7 +319,7 @@
                    //3.跳转登录页面
                    UserInfo.Current.LastTime = DateTime.MinValue;
                    UserInfo.Current.SaveUserInfo();
                    DB_ResidenceData.residenceData.EixtAccount();
                    DB_ResidenceData.Instance.EixtAccount();
                }
                catch (Exception ex)
                {
@@ -355,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
    }
}