From 9eec81850e418a3c16410b4870910bde142b06e3 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 14 九月 2022 15:50:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Dev-Branch' into wjc
---
HDL_ON/Common/UserInfo.cs | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index 30e8267..1e53ae7 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/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;
-
}
}
\ No newline at end of file
--
Gitblit v1.8.0