Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-04 2f1b0d944bd8feb7c6dca5126a4832228ba826ce

 HDL_ON/Entity/UserInfo.cs

@@ -68,10 +68,23 @@
        /// 忽略更新的版本号
        /// </summary>
        public string IgnoreUpdateVersion = string.Empty;

        /// <summary>
        /// 信息推送标记
        /// </summary>
        public string PushDeviceToken;
        /// <summary>
        /// phoneName
        /// </summary>
        public string PhoneName;
        /// <summary>
        /// 添加推送Token成功时返回的Id
        /// </summary>
        public string PushId;
        #endregion



        #region 用户数据
        /// <summary>
        /// 用户名称
        /// </summary>
@@ -123,10 +136,10 @@
        /// 用户头像图片
        /// </summary>
        public string headImagePagePath = "LoginIcon/2.png";
        /// <summary>
        /// 用户头像byte数据
        /// </summary>
        public byte[] headImagePageBytes = null;
        ///// <summary>
        ///// 用户头像byte数据
        ///// </summary>
        //public byte[] headImagePageBytes = null;
        /// <summary>
        /// 上一次登录时间
        /// </summary>
@@ -153,18 +166,31 @@
        /// UserType B端账号 C端账号 
        /// </summary>
        public string userType = "USER_C";
       

        /// <summary>
        /// 用户住宅列表
        /// </summary>
        public List<RegionInfoRes> regionList = new List<RegionInfoRes>();

        #endregion

        public void SaveUserInfo()
        {
            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)
        {