From e6a26ee148587327478d9a82624a820c907b6e16 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 04 十一月 2020 14:58:15 +0800
Subject: [PATCH] 20201104

---
 HDL_ON/UI/UI1-Login/LoginPage.cs |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 4d112ea..fbd3b48 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -1,4 +1,5 @@
 锘縰sing System;
+using System.Text.RegularExpressions;
 using System.Threading;
 using HDL_ON.DAL.Server;
 using HDL_ON.UI.CSS;
@@ -144,18 +145,19 @@
 
         string verAccount = "";
 
-        public void VerfifyLogin(string account ) 
-        {
-            verAccount = account;
-            LoadView(account);
-        }
+        /// <summary>
+        /// 
+        /// </summary>
+        string registerPhone;
+        string registerEmail;
 
         /// <summary>
         /// 鍔犺浇瑙嗗浘
         /// </summary>
-        public void LoadView(string account = "")
+        public void LoadView(UserInfo userInfo = null)
         {
             Language.CurrentLanguage = "Chinese";
+
             var btnIcon = new Button()
             {
                 X = Application.GetRealWidth(28),
@@ -179,7 +181,7 @@
             btnIcon.MouseUpEventHandler += (sender, e) =>
             {
 #if DEBUG
-                etAccount.Text = "464027401@qq.com";
+                etAccount.Text = "464027401@qq.com"; //"2791308028@qq.com";// 
                 etPassword.Text = "qqqqqq";
                 btnLogin.IsSelected = true;
 #endif
@@ -230,6 +232,7 @@
                 TextColor = CSS_Color.FirstLevelTitleColor,
                 Text = "+86",
                 TextSize = CSS_FontSize.TextFontSize,
+                Enable = false,
             };
             if (loginType == 0)
                 accountView.AddChidren(btnGlobalRoaming);
@@ -256,9 +259,10 @@
             };
             accountView.AddChidren(etAccount);
 
-            if (account != "")
+            if (userInfo != null)
             {
-                etAccount.Text = account;
+                registerEmail = userInfo.userEmailInfo;
+                etAccount.Text = registerPhone = userInfo.userMobileInfo;
             }
 
             btnAccountViewBottomLine = new Button()
@@ -437,7 +441,7 @@
             LoadEventList();
             account = etAccount.Text.Trim();
 
-            #if DEBUG
+            #if DEBUG1211
             //鏈湴妯″紡
             Button btnLocalMode = new Button()
             {

--
Gitblit v1.8.0