From ecbf9d722cf59efe93cf60ee47e8782eca18eca6 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 19 十二月 2020 13:22:55 +0800
Subject: [PATCH] 20201219-1
---
HDL_ON/Common/HDLCommon.cs | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
old mode 100644
new mode 100755
index 84158f7..02943ea
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -15,6 +15,11 @@
/// </summary>
public class HDLCommon
{
+ /// <summary>
+ /// 鏀跺埌鎺ㄩ�丄ction浜嬩欢
+ /// </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();
+ //鎶ヨ鎺ㄩ�佹墠寮圭獥鎻愮ず锛坢essageType鍖呭惈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
}
}
--
Gitblit v1.8.0