Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google

wxr

2024-09-27 acc8caee31c4be90bd38d1af18136b0e84f6fe94

 HDL_ON/Common/UserInfo.cs

@@ -40,6 +40,20 @@
                            headImagePagePath = "LoginIcon/2.png",
                        };
                    }
                    else if(Language.CurrentLanguage == "russian")
                    {
                        m_Current = new UserInfo()
                        {
                            ID = "1234567890",
                            userName = "Пробный аккаунт",
                            AccountString = "Пробный аккаунт",
                            userMobileInfo = "Пробный аккаунт",
                            userEmailInfo = "Пробный аккаунт",
                            language = "russian",
                            areaCode = "86",
                            headImagePagePath = "LoginIcon/2.png",
                        };
                    }
                    else
                    {
                        m_Current = new UserInfo()
@@ -130,9 +144,13 @@
        ///// </summary>
        //public byte[] headImagePageBytes = null;
        /// <summary>
        /// 
        /// 云端访问Token  有前缀
        /// </summary>
        public string LoginTokenString;
        /// <summary>
        /// 云端访问Token  没有前缀
        /// </summary>
        public string AccessToken;
        /// <summary>
        /// 
        /// </summary>
@@ -146,19 +164,27 @@
        /// </summary>
        public List<RegionInfoRes> regionList = new List<RegionInfoRes>();
        /// <summary>
        /// token是否有效
        /// </summary>
        public bool ValidToken = false;
        /// <summary>
        /// 是否提示过Token过期
        /// </summary>
        public bool IsTipedInvalidToken = false;
        /// <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 = false;
        //{
        //    get
        //    {
        //        return (DateTime.Now - LastTime).TotalDays < 7;
        //    }
        //}

        [Newtonsoft.Json.JsonIgnore]
        public DateTime LastTimeOpenDoor = DateTime.MinValue;