From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/Entity/UserInfo.cs | 149 +++++++++++++++++++++++++++++++++++++++----------
1 files changed, 119 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/Entity/UserInfo.cs b/HDL_ON/Entity/UserInfo.cs
index 70800be..e9719c4 100644
--- a/HDL_ON/Entity/UserInfo.cs
+++ b/HDL_ON/Entity/UserInfo.cs
@@ -3,12 +3,88 @@
using System.Text;
using System.IO;
using System.Drawing;
+using HDL_ON.DAL;
+using HDL_ON.DAL.Server;
namespace HDL_ON
{
[System.Serializable]
public class UserInfo
{
+ public static readonly string ConfigFile = "UserInfo_File";
+ /// <summary>
+ /// 閫氱敤鏂规硶
+ /// </summary>
+ private static UserInfo m_Current = null;
+ /// <summary>
+ /// 閫氱敤鏂规硶
+ /// </summary>
+ public static UserInfo Current
+ {
+ get
+ {
+ if (m_Current == null)
+ {
+ try
+ {
+ UserInfo temp = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile(ConfigFile)));
+ if (temp == null)
+ {
+ m_Current = new UserInfo() { };
+ Utlis.WriteLine("UserInfo null");
+ }
+ else
+ {
+ m_Current = temp;
+ Utlis.WriteLine("UserInfo Current");
+ }
+ }
+ catch
+ {
+ m_Current = new UserInfo() { };
+ Utlis.WriteLine("UserInfo null");
+ }
+ }
+ return m_Current;
+ }
+ }
+
+ #region 鏂板淇濆瓨鍙傛暟
+ /// <summary>
+ /// 璐﹀彿娉ㄥ唽鏈嶅姟鍣ㄤ俊鎭�
+ /// </summary>
+ public string RequestHttpsHost = "https://china.hdlcontrol.com";
+ /// <summary>
+ ///
+ /// </summary>
+ public GlobalRegionListRes GlobalRegion;
+
+ /// <summary>
+ /// 鏄惁鍚屾剰鍗忚
+ /// </summary>
+ public bool isAgreePrivacyPolicy;
+
+ /// <summary>
+ /// 蹇界暐鏇存柊鐨勭増鏈彿
+ /// </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>
@@ -16,26 +92,26 @@
/// <summary>
/// 鐢ㄦ埛
/// </summary>
- public string accountString = "";
+ public string AccountString = "";
///// <summary>
///// 鐢ㄦ埛瀵嗙爜
///// </summary>
- //public string Password = "";
- string aesPassword = "";
- /// <summary>
- /// 鐢ㄦ埛瀵嗙爜
- /// </summary>
- public string password
- {
- get
- {
- return Shared.Securitys.EncryptionService.AesDecryptTopic(aesPassword, "85521566HDLONPRO");
- }
- set
- {
- aesPassword = Shared.Securitys.EncryptionService.AesEncryptTopic(value, "85521566HDLONPRO");
- }
- }
+ //public string password = "";
+ //string aesPassword = "";
+ ///// <summary>
+ ///// 鐢ㄦ埛瀵嗙爜
+ ///// </summary>
+ //public string password
+ //{
+ // get
+ // {
+ // return Shared.Securitys.EncryptionService.AesDecryptTopic(aesPassword, "85521566HDLONPRO");
+ // }
+ // set
+ // {
+ // aesPassword = Shared.Securitys.EncryptionService.AesEncryptTopic(value, "85521566HDLONPRO");
+ // }
+ //}
/// <summary>
/// 鐢ㄦ埛鎵嬫満鍙风爜
/// </summary>
@@ -55,19 +131,19 @@
/// <summary>
/// 鐢ㄦ埛鍖哄煙
/// </summary>
- public int areaCode = 86;
+ public string areaCode = "86";
/// <summary>
/// 鐢ㄦ埛澶村儚鍥剧墖
/// </summary>
public string headImagePagePath = "LoginIcon/2.png";
- /// <summary>
- /// 鐢ㄦ埛澶村儚byte鏁版嵁
- /// </summary>
- public byte[] headImagePageBytes = null;
+ ///// <summary>
+ ///// 鐢ㄦ埛澶村儚byte鏁版嵁
+ ///// </summary>
+ //public byte[] headImagePageBytes = null;
/// <summary>
/// 涓婁竴娆＄櫥褰曟椂闂�
/// </summary>
- public DateTime lastTime = DateTime.MinValue;
+ public DateTime LastTime = DateTime.MinValue;
/// <summary>
/// 鏄惁鏄櫥褰曠姸鎬�
/// </summary>
@@ -75,33 +151,46 @@
{
get
{
- return (DateTime.Now - lastTime).TotalDays < 7;
+ return (DateTime.Now - LastTime).TotalDays < 7;
}
}
/// <summary>
///
/// </summary>
- public string loginTokenString;
+ public string LoginTokenString;
/// <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>();
+ #endregion
+
public void SaveUserInfo()
{
- FileUtils.WriteFileByBytes("UserInfo_File", Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ 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