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 | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 880b3ec..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,17 +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),
@@ -178,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
@@ -200,7 +203,7 @@
btnEmailLogin = new Button()
{
- X = btnPhoneLogin.Right,
+ X = btnPhoneLogin.Right + Application.GetRealWidth(20),
Y = Application.GetRealHeight(177),
Width = Application.GetRealWidth(100),
Height = Application.GetRealHeight(40),
@@ -229,7 +232,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
Text = "+86",
TextSize = CSS_FontSize.TextFontSize,
- BackgroundColor = 0xffff0000
+ 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()
@@ -268,7 +272,6 @@
Height = Application.GetRealHeight(1),
};
accountView.AddChidren(btnAccountViewBottomLine);
-
btnAccountIcon = new Button()
{
@@ -438,7 +441,7 @@
LoadEventList();
account = etAccount.Text.Trim();
- #if DEBUG
+ #if DEBUG1211
//鏈湴妯″紡
Button btnLocalMode = new Button()
{
@@ -458,6 +461,8 @@
MainPage.GoUserPage();
};
+ MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
+
#endif
}
--
Gitblit v1.8.0