From 2f1b0d944bd8feb7c6dca5126a4832228ba826ce Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 十二月 2020 14:00:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/Entity/UserInfo.cs | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/Entity/UserInfo.cs b/HDL_ON/Entity/UserInfo.cs
index 9465064..e9719c4 100644
--- a/HDL_ON/Entity/UserInfo.cs
+++ b/HDL_ON/Entity/UserInfo.cs
@@ -68,10 +68,23 @@
/// 蹇界暐鏇存柊鐨勭増鏈彿
/// </summary>
public string IgnoreUpdateVersion = string.Empty;
+
+ /// <summary>
+ /// 淇℃伅鎺ㄩ�佹爣璁�
+ /// </summary>
+ public string PushDeviceToken;
+ /// <summary>
+ /// phoneName
+ /// </summary>
+ public string PhoneName;
+ /// <summary>
+ /// 娣诲姞鎺ㄩ�乀oken鎴愬姛鏃惰繑鍥炵殑Id
+ /// </summary>
+ public string PushId;
#endregion
-
+ #region 鐢ㄦ埛鏁版嵁
/// <summary>
/// 鐢ㄦ埛鍚嶇О
/// </summary>
@@ -123,10 +136,10 @@
/// 鐢ㄦ埛澶村儚鍥剧墖
/// </summary>
public string headImagePagePath = "LoginIcon/2.png";
- /// <summary>
- /// 鐢ㄦ埛澶村儚byte鏁版嵁
- /// </summary>
- public byte[] headImagePageBytes = null;
+ ///// <summary>
+ ///// 鐢ㄦ埛澶村儚byte鏁版嵁
+ ///// </summary>
+ //public byte[] headImagePageBytes = null;
/// <summary>
/// 涓婁竴娆＄櫥褰曟椂闂�
/// </summary>
@@ -153,18 +166,31 @@
/// UserType B绔处鍙� C绔处鍙�
/// </summary>
public string userType = "USER_C";
-
-
/// <summary>
/// 鐢ㄦ埛浣忓畢鍒楄〃
/// </summary>
public List<RegionInfoRes> regionList = new List<RegionInfoRes>();
+
+ #endregion
public void SaveUserInfo()
{
FileUtils.WriteFileByBytes(ConfigFile, Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
}
+ /// <summary>
+ /// 閫�鍑虹櫥褰曢噸缃弬鏁�
+ /// </summary>
+ public void LogoutReset()
+ {
+ userName = "";
+ ID = "";
+ LoginTokenString = "";
+ RefreshToken = "";
+ userType = "USER_C";
+ LastTime = DateTime.MinValue;
+ headImagePagePath = "LoginIcon/2.png";//閲嶇疆鐢ㄦ埛澶村儚
+ }
private byte[] convertByte(Image img)
{
--
Gitblit v1.8.0