From f788a1e320b8505435ed66e2456ddb2d0a838f76 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 19 十一月 2020 19:58:14 +0800
Subject: [PATCH] 2020-11-19 1.优化绑定和解绑页面。2.修改密码功能实现，UI界面实现，接口实现。
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 52 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 880b3ec..b8f1b69 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,23 @@
string verAccount = "";
- public void VerfifyLogin(string account )
- {
- verAccount = account;
- LoadView(account);
- }
+ /// <summary>
+ ///
+ /// </summary>
+ string registerPhone;
+ string registerEmail;
+ /// <summary>
+ /// 鎵嬫満鍖哄彿
+ /// </summary>
+ string phoneZoneCode = "86";
/// <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 +185,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 +207,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),
@@ -227,12 +234,27 @@
Width = Application.GetRealWidth(65),
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "+86",
+ Text = "+" + phoneZoneCode,
TextSize = CSS_FontSize.TextFontSize,
- BackgroundColor = 0xffff0000
+ Enable = true,
};
+
+ //璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
+ EventHandler<MouseEventArgs> eHandler = (sender, e) => {
+ JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
+ if (!string.IsNullOrEmpty(code))
+ {
+ phoneZoneCode = code;
+ btnGlobalRoaming.Text = "+" + phoneZoneCode;
+ }
+ });
+ };
+ btnGlobalRoaming.MouseUpEventHandler += eHandler;
+
if (loginType == 0)
+ {
accountView.AddChidren(btnGlobalRoaming);
+ }
btnDividingLineVertical_AccountView = new Button()
{
@@ -256,9 +278,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 +291,6 @@
Height = Application.GetRealHeight(1),
};
accountView.AddChidren(btnAccountViewBottomLine);
-
btnAccountIcon = new Button()
{
@@ -438,7 +460,7 @@
LoadEventList();
account = etAccount.Text.Trim();
- #if DEBUG
+ #if DEBUG1211
//鏈湴妯″紡
Button btnLocalMode = new Button()
{
@@ -458,6 +480,8 @@
MainPage.GoUserPage();
};
+ MainPage.Log("etAccount.TextAlignment : " + etAccount.TextAlignment.ToString());
+
#endif
}
--
Gitblit v1.8.0