Merge remote-tracking branch 'origin/Dev-Branch' into wjc

wjc

2022-09-14 9eec81850e418a3c16410b4870910bde142b06e3

 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>
@@ -166,7 +184,7 @@
        {
            get
            {
                return (DateTime.Now - LastTime).TotalMinutes > 5;
                return (DateTime.Now - LastTimeOpenDoor).TotalMinutes > 5;
            }
        }
        [Newtonsoft.Json.JsonIgnore]
@@ -323,6 +341,7 @@
        }



        /// <summary>
        /// 推送消息记录 
        /// </summary>
@@ -332,24 +351,10 @@
        /// </summary>
        public bool alreadyShowCallInDialog = false;

        //[Newtonsoft.Json.JsonIgnore]
        //public string PushMesTitle;
        //[Newtonsoft.Json.JsonIgnore]
        //public string PushMesMessage;
        //[Newtonsoft.Json.JsonIgnore]
        //public string PushMesExtras;
        //[Newtonsoft.Json.JsonIgnore]
        //public string PushMesHomeId;
        //[Newtonsoft.Json.JsonIgnore]
        //public string pushMesMessageType;
        //[Newtonsoft.Json.JsonIgnore]
        //public string pushMesExpantContent;

        [Newtonsoft.Json.JsonIgnore]
        public bool inVideo = false;
        [Newtonsoft.Json.JsonIgnore]
        public DateTime inCall = DateTime.MinValue;


    }
}