From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 HDL_ON/Common/UserInfo.cs |   51 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/HDL_ON/Common/UserInfo.cs b/HDL_ON/Common/UserInfo.cs
index 61ddacf..c82538d 100644
--- a/HDL_ON/Common/UserInfo.cs
+++ b/HDL_ON/Common/UserInfo.cs
@@ -5,6 +5,7 @@
 using System.Drawing;
 using HDL_ON.DAL;
 using HDL_ON.DAL.Server;
+using Shared;
 
 namespace HDL_ON
 {
@@ -22,8 +23,42 @@
         {
             get
             {
+                //Dome妯″紡
+                if (MainPage.NoLoginMode)
+                {
+                    if (Language.CurrentLanguage == "Chinese")
+                    {
+                        m_Current = new UserInfo()
+                        {
+                            ID = "1234567890",
+                            userName = "浣撻獙璐﹀彿",
+                            AccountString = "浣撻獙璐﹀彿",
+                            userMobileInfo = "浣撻獙璐﹀彿",
+                            userEmailInfo = "浣撻獙璐﹀彿",
+                            language = "Chinese",
+                            areaCode = "86",
+                            headImagePagePath = "LoginIcon/2.png",
+                        };
+                    }
+                    else
+                    {
+                        m_Current = new UserInfo()
+                        {
+                            ID = "1234567890",
+                            userName = "Trial account",
+                            AccountString = "Trial account",
+                            userMobileInfo = "Trial account",
+                            userEmailInfo = "Trial account",
+                            language = "English",
+                            areaCode = "86",
+                            headImagePagePath = "LoginIcon/2.png",
+                        };
+                    }
+                    return m_Current;
+                }
                 if (m_Current == null)
                 {
+
                     try
                     {
                         UserInfo temp = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(
@@ -134,22 +169,6 @@
         {
             WirteUserinfo(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";//閲嶇疆鐢ㄦ埛澶村儚
-        //}
-
-        //public string SetLanguage = "";
 
         /// <summary>
         /// 杞欢瑙i攣鐣岄潰

--
Gitblit v1.8.0