2020-12-1

陈嘉乐

2020-12-01 e08a444a9d7acea0cf39f50d22d29179f6a59292

 HDL_ON/Entity/UserInfo.cs

@@ -3,12 +3,75 @@
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>
@@ -16,11 +79,26 @@
        /// <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>
@@ -32,7 +110,7 @@
        /// <summary>
        /// 用户ID
        /// </summary>
        public int ID;
        public string ID;
        /// <summary>
        /// 用户选择显示的语言
        /// </summary>
@@ -40,8 +118,7 @@
        /// <summary>
        /// 用户区域
        /// </summary>
        public int areaCode = 86;

        public string areaCode = "86";
        /// <summary>
        /// 用户头像图片
        /// </summary>
@@ -50,12 +127,10 @@
        /// 用户头像byte数据
        /// </summary>
        public byte[] headImagePageBytes = null;

        /// <summary>
        /// 上一次登录时间
        /// </summary>
        public DateTime lastTime = DateTime.MinValue;

        public DateTime LastTime = DateTime.MinValue;
        /// <summary>
        /// 是否是登录状态
        /// </summary>
@@ -63,27 +138,23 @@
        {
            get
            {
                return (DateTime.Now - lastTime).TotalDays < 7;
                return (DateTime.Now - LastTime).TotalDays < 7;
            }
        }
        /// <summary>
        /// 
        /// </summary>
        public string LoginTokenString;
        /// <summary>
        /// 
        /// </summary>
        public string RefreshToken;
        /// <summary>
        /// UserType B端账号 C端账号 
        /// </summary>
        public string userType = "USER_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>
@@ -91,10 +162,8 @@

        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)));
        }

      


        private byte[] convertByte(Image img)