From 488efb508eb0648773fe7b68e810e04bcd7ca075 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:15 +0800
Subject: [PATCH] 20201211

---
 HDL_ON/Entity/UserInfo.cs |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/HDL_ON/Entity/UserInfo.cs b/HDL_ON/Entity/UserInfo.cs
index e9719c4..4077417 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() { };
@@ -170,12 +169,16 @@
         /// 鐢ㄦ埛浣忓畢鍒楄〃
         /// </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>
@@ -192,24 +195,30 @@
             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>
+        /// 杞欢瑙i攣鐣岄潰
+        /// 1:鍚姩鏃�
+        /// 2:甯冮槻鎾ら槻鏃�
+        /// 3:杩滅▼寮�閿佹椂
+        /// </summary>
+        public List<string> appUnlockPage = new List<string>();
+        /// <summary>
+        /// 杞欢瑙i攣鏂瑰紡
+        /// 1:鏁板瓧瀵嗙爜
+        /// 2:鎵嬪娍瀵嗙爜
+        /// 3:鎸囩汗瀵嗙爜
+        /// 4:闈㈠ID
+        /// </summary>
+        public List<string> appUnlockType = new List<string>();
+        /// <summary>
+        /// 杞欢瑙i攣瀵嗙爜
+        /// </summary>
+        public string appUnlockPasswrod = "";
+        /// <summary>
+        /// 瑙i攣鏃堕棿
+        /// </summary>
+        public DateTime unlockTime = DateTime.MinValue;
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0