From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index d50aa67..4691fc3 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;
@@ -142,11 +143,21 @@
HttpServerRequest pm;
#endregion
+ string verAccount = "";
+
+ /// <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),
@@ -192,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),
@@ -247,9 +258,10 @@
};
accountView.AddChidren(etAccount);
- if (account != "")
+ if (userInfo != null)
{
- etAccount.Text = account;
+ registerEmail = userInfo.userEmailInfo;
+ etAccount.Text = registerPhone = userInfo.userMobileInfo;
}
btnAccountViewBottomLine = new Button()
@@ -259,7 +271,6 @@
Height = Application.GetRealHeight(1),
};
accountView.AddChidren(btnAccountViewBottomLine);
-
btnAccountIcon = new Button()
{
@@ -363,8 +374,11 @@
SelectedTextColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.CenterRight,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextColor = CSS_Color.FirstLevelTitleColor,
+ TextColor = CSS_Color.PromptingColor1,
+ Visible = false,
+ IsSelected = false,
};
+ passwordView.AddChidren(btnGetVerificationCode);
#endregion
btnPasswordViewBottomLine = new Button()
@@ -377,7 +391,6 @@
passwordView.AddChidren(btnPasswordViewBottomLine);
#endregion
-
#region 娉ㄥ唽涓庡揩鎹风櫥褰�
btnRegister = new Button()
@@ -424,9 +437,33 @@
};
bodyView.AddChidren(btnLogin);
-
LoadEventList();
account = etAccount.Text.Trim();
+
+ #if DEBUG1211
+ //鏈湴妯″紡
+ Button btnLocalMode = new Button()
+ {
+ Y = Application.GetRealHeight(600),
+ Height = Application.GetRealHeight(67),
+ Text = "Local Mode",
+ TextAlignment = TextAlignment.Center,
+ BackgroundColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.TextualColor,
+ };
+ bodyView.AddChidren(btnLocalMode);
+
+ btnLocalMode.MouseUpEventHandler = (sender, e) =>
+ {
+ MainPage.LocalMode = true;
+ MainPage.LoginUser = new UserInfo();
+ MainPage.GoUserPage();
+ };
+
+ MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
+
+ #endif
+
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0