From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/Entity/UserInfo.cs | 112 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 89 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/Entity/UserInfo.cs b/HDL_ON/Entity/UserInfo.cs
index 2fb7289..c0ffb02 100644
--- a/HDL_ON/Entity/UserInfo.cs
+++ b/HDL_ON/Entity/UserInfo.cs
@@ -1,6 +1,8 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
+using System.IO;
+using System.Drawing;
namespace HDL_ON
{
@@ -10,61 +12,82 @@
/// <summary>
/// 鐢ㄦ埛鍚嶇О
/// </summary>
- public string UserName = "";
+ public string userName = "";
/// <summary>
/// 鐢ㄦ埛
/// </summary>
- public string AccountString="";
+ public string accountString = "";
/// <summary>
/// 鐢ㄦ埛瀵嗙爜
/// </summary>
- public string Password = "";
+ public string password = "";
/// <summary>
/// 鐢ㄦ埛鎵嬫満鍙风爜
/// </summary>
- public string UserMobileInfo = "";
+ public string userMobileInfo = "";
/// <summary>
/// 鐢ㄦ埛閭淇℃伅
/// </summary>
- public string UserEmailInfo = "";
+ public string userEmailInfo = "";
/// <summary>
/// 鐢ㄦ埛ID
/// </summary>
public int 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;
+ public DateTime lastTime = DateTime.MinValue;
/// <summary>
/// 鏄惁鏄櫥褰曠姸鎬�
/// </summary>
- public bool IsLogin {
- get {
- return (DateTime.Now - LastTime).TotalDays < 7;
+ public bool IsLogin
+ {
+ get
+ {
+ return (DateTime.Now - lastTime).TotalDays < 7;
}
}
- public int AccountType = 0;
+ public int accountType = 0;
- public int MasterID = 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");
+ 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 甯愬彿-->
@@ -72,9 +95,52 @@
/// </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("Register_File", Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ }
+
+ /// <summary>
+ /// 杞欢瑙ｉ攣鐣岄潰
+ /// 1:鍚姩鏃�
+ /// 2:甯冮槻鎾ら槻鏃�
+ /// 3:杩滅▼寮�閿佹椂
+ /// </summary>
+ //[Newtonsoft.Json.JsonIgnore]
+ public List<string> appUnlockPage = new List<string>();
+ /// <summary>
+ /// 杞欢瑙ｉ攣鏂瑰紡
+ /// 1:鏁板瓧瀵嗙爜
+ /// 2:鎵嬪娍瀵嗙爜
+ /// 3:鎸囩汗瀵嗙爜
+ /// 4:闈㈠ID
+ /// </summary>
+ public List<string> appUnlockType = new List<string>();
+ /// <summary>
+ /// 杞欢瑙ｉ攣瀵嗙爜
+ /// </summary>
+ //[Newtonsoft.Json.JsonIgnore]
+ public string appUnlockPasswrod = "";
+
+
+ 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