From b3abfd30576871c32f2839a322fa3bb783f96498 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 19:10:10 +0800
Subject: [PATCH] 2020-12-12 1.解锁逻辑优化
---
HDL_ON/Entity/UserInfo.cs | 104 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 73 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/Entity/UserInfo.cs b/HDL_ON/Entity/UserInfo.cs
index 8a0552d..8268cd3 100644
--- a/HDL_ON/Entity/UserInfo.cs
+++ b/HDL_ON/Entity/UserInfo.cs
@@ -11,7 +11,6 @@
[System.Serializable]
public class UserInfo
{
- public static readonly string ConfigFile = "UserInfo_File";
/// <summary>
/// 閫氱敤鏂规硶
/// </summary>
@@ -27,7 +26,7 @@
{
try
{
- UserInfo temp = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile(ConfigFile)));
+ UserInfo temp = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(Common.FileUtlis.Files.ReadUserInfo()));
if (temp == null)
{
m_Current = new UserInfo() { };
@@ -47,6 +46,13 @@
}
return m_Current;
}
+ }
+ /// <summary>
+ /// 娓呴櫎缂撳瓨鏁版嵁
+ /// </summary>
+ public void ClearUserInfo()
+ {
+ m_Current = null;
}
#region 鏂板淇濆瓨鍙傛暟
@@ -68,10 +74,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 +142,10 @@
/// 鐢ㄦ埛澶村儚鍥剧墖
/// </summary>
public string headImagePagePath = "LoginIcon/2.png";
- /// <summary>
- /// 鐢ㄦ埛澶村儚byte鏁版嵁
- /// </summary>
- public byte[] headImagePageBytes = null;
+ ///// <summary>
+ ///// 鐢ㄦ埛澶村儚byte鏁版嵁
+ ///// </summary>
+ //public byte[] headImagePageBytes = null;
/// <summary>
/// 涓婁竴娆＄櫥褰曟椂闂�
/// </summary>
@@ -148,42 +167,65 @@
/// <summary>
///
/// </summary>
- public string refreshToken;
+ public string RefreshToken;
/// <summary>
/// UserType B绔处鍙� C绔处鍙�
/// </summary>
- public string userType = "C";
-
-
+ public string userType = "USER_C";
/// <summary>
/// 鐢ㄦ埛浣忓畢鍒楄〃
/// </summary>
public List<RegionInfoRes> regionList = new List<RegionInfoRes>();
+ /// <summary>
+ /// 褰撳墠閫夋嫨鐨勪綇瀹呯储寮�
+ /// </summary>
+ public string CurReginID = "";
+
+ #endregion
public void SaveUserInfo()
{
- FileUtils.WriteFileByBytes(ConfigFile, Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ Common.FileUtlis.Files.WirteUserinfo(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)
- {
- MemoryStream ms = new MemoryStream();
- img.Save(ms, img.RawFormat);
- //byte[] bytes = new byte[ms.Length];
- //ms.Read(bytes, 0, Convert.ToInt32(ms.Length));
- //浠ヤ笂涓ゅ彞鏀规垚涓嬮潰涓ゅ彞
- byte[] bytes = ms.ToArray();
- ms.Close();
- return bytes;
- }
- private Image convertImg(byte[] datas)
- {
- MemoryStream ms = new MemoryStream(datas);
- Image img = Image.FromStream(ms, true);//鍦ㄨ繖閲屽嚭閿�
- //娴佺敤瀹岃鍙婃椂鍏抽棴
- ms.Close();
- return img;
- }
+ public string SetLanguage = "";
+
+ /// <summary>
+ /// 杞欢瑙ｉ攣鐣岄潰
+ /// 1:鍚姩鏃�
+ /// 2:甯冮槻鎾ら槻鏃�
+ /// 3:杩滅▼寮�閿佹椂
+ /// </summary>
+ public List<string> appUnlockPage = new List<string>();
+ /// <summary>
+ /// 杞欢瑙ｉ攣鏂瑰紡
+ /// 1:鏁板瓧瀵嗙爜
+ /// 2:鎵嬪娍瀵嗙爜
+ /// 3:鎸囩汗瀵嗙爜
+ /// 4:闈㈠ID
+ /// </summary>
+ public List<string> appUnlockType = new List<string>();
+ /// <summary>
+ /// 杞欢瑙ｉ攣瀵嗙爜
+ /// </summary>
+ public string appUnlockPasswrod = "";
+ /// <summary>
+ /// 瑙ｉ攣鏃堕棿
+ /// </summary>
+ public DateTime unlockTime = DateTime.MinValue;
}
}
\ No newline at end of file
--
Gitblit v1.8.0