From 393825c701ad97e13ad71c1fac1f6914e3d0feba Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 13:35:37 +0800
Subject: [PATCH] 20201127 接受bus数据修改完成，搜索网关、一端口修改完成
---
HDL_ON/Entity/UserInfo.cs | 183 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 146 insertions(+), 37 deletions(-)
diff --git a/HDL_ON/Entity/UserInfo.cs b/HDL_ON/Entity/UserInfo.cs
index 2fb7289..8a0552d 100644
--- a/HDL_ON/Entity/UserInfo.cs
+++ b/HDL_ON/Entity/UserInfo.cs
@@ -1,80 +1,189 @@
锘縰sing System;
using System.Collections.Generic;
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;
+ #endregion
+
+
+
/// <summary>
/// 鐢ㄦ埛鍚嶇О
/// </summary>
- public string UserName = "";
+ public string userName = "";
/// <summary>
/// 鐢ㄦ埛
/// </summary>
- public string AccountString="";
- /// <summary>
- /// 鐢ㄦ埛瀵嗙爜
- /// </summary>
- public string Password = "";
+ 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");
+ // }
+ //}
/// <summary>
/// 鐢ㄦ埛鎵嬫満鍙风爜
/// </summary>
- public string UserMobileInfo = "";
+ public string userMobileInfo = "";
/// <summary>
/// 鐢ㄦ埛閭淇℃伅
/// </summary>
- public string UserEmailInfo = "";
+ public string userEmailInfo = "";
/// <summary>
/// 鐢ㄦ埛ID
/// </summary>
- public int ID;
-
+ public string ID;
+ /// <summary>
+ /// 鐢ㄦ埛閫夋嫨鏄剧ず鐨勮瑷�
+ /// </summary>
+ public string language = "Chinese";
+ /// <summary>
+ /// 鐢ㄦ埛鍖哄煙
+ /// </summary>
+ public string areaCode = "86";
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚鍥剧墖
+ /// </summary>
+ public string headImagePagePath = "LoginIcon/2.png";
+ /// <summary>
+ /// 鐢ㄦ埛澶村儚byte鏁版嵁
+ /// </summary>
+ public byte[] headImagePageBytes = null;
/// <summary>
/// 涓婁竴娆＄櫥褰曟椂闂�
/// </summary>
public DateTime LastTime = DateTime.MinValue;
-
/// <summary>
/// 鏄惁鏄櫥褰曠姸鎬�
/// </summary>
- public bool IsLogin {
- get {
+ public bool IsLogin
+ {
+ get
+ {
return (DateTime.Now - LastTime).TotalDays < 7;
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ public string LoginTokenString;
+ /// <summary>
+ ///
+ /// </summary>
+ public string refreshToken;
+ /// <summary>
+ /// UserType B绔处鍙� C绔处鍙�
+ /// </summary>
+ public string userType = "C";
+
- public int AccountType = 0;
-
- public int MasterID = 0;
-
- public string LoginTokenString{
- get {
- var result = Encoding.UTF8.GetBytes (Password);
- var md5 = new System.Security.Cryptography.MD5CryptoServiceProvider ();
- var output = md5.ComputeHash (result);
- var md5Password = BitConverter.ToString (output).Replace ("-", "");
- var account_md5Pssword = AccountString + ":" + md5Password;
- var tokenBytes = Encoding.UTF8.GetBytes (account_md5Pssword);
- return Convert.ToBase64String (tokenBytes).Replace ("=", "%3D");
- }
- }
/// <summary>
/// 鐢ㄦ埛浣忓畢鍒楄〃
/// </summary>
- public List<RegionInfoRes> HomeLists = new List<RegionInfoRes>();
+ public List<RegionInfoRes> regionList = new List<RegionInfoRes>();
- /// <summary>
- /// <!--SIP 甯愬彿-->
- /// 鍙瀵硅浣跨敤鐨勭櫥褰曡处鍙�
- /// </summary>
- public string SIP_Account;
-
- public void SaveUserInfo ()
+ public void SaveUserInfo()
{
- FileUtils.WriteFileByBytes ("Register_File", Encoding.UTF8.GetBytes (Newtonsoft.Json.JsonConvert.SerializeObject (this)));
+ FileUtils.WriteFileByBytes(ConfigFile, Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ }
+
+
+ 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;
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0