From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 63 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index af519dc..c8f2c83 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -36,15 +36,15 @@
/// 0:鎵嬫満
/// 1:閭
/// </summary>
- int logintType = 0;
+ int loginType = 0;
/// <summary>
/// 鐧诲綍鏂瑰紡
/// 0:瀵嗙爜
/// 1:楠岃瘉鐮�
/// </summary>
int logintMode = 0;
- string account;
- string password;
+ string account = "";
+ string password = "";
#endregion
#region 鎺т欢鍒楄〃
@@ -142,11 +142,26 @@
HttpServerRequest pm;
#endregion
+ string verAccount = "";
+
+ /// <summary>
+ ///
+ /// </summary>
+ string registerPhone;
+ string registerEmail;
+
+ public void VerfifyLogin(string account )
+ {
+ verAccount = account;
+ LoadView(account);
+ }
+
/// <summary>
/// 鍔犺浇瑙嗗浘
/// </summary>
public void LoadView(string account = "")
{
+ Language.CurrentLanguage = "Chinese";
var btnIcon = new Button()
{
X = Application.GetRealWidth(28),
@@ -192,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),
@@ -222,7 +237,7 @@
Text = "+86",
TextSize = CSS_FontSize.TextFontSize,
};
- if (logintType == 0)
+ if (loginType == 0)
accountView.AddChidren(btnGlobalRoaming);
btnDividingLineVertical_AccountView = new Button()
@@ -260,7 +275,6 @@
};
accountView.AddChidren(btnAccountViewBottomLine);
-
btnAccountIcon = new Button()
{
X = Application.GetRealWidth(21),
@@ -269,7 +283,7 @@
Height = Application.GetMinRealAverage(20),
UnSelectedImagePath = "LoginIcon/AccountIcon.png",
};
- if (logintType == 1)
+ if (loginType == 1)
{
accountView.AddChidren(btnAccountIcon);
}
@@ -360,11 +374,14 @@
X = Application.GetRealWidth(219),
Width = Application.GetRealWidth(100),
TextID = StringId.GetVerificationCode,
- TextColor = CSS_Color.MainColor,
+ SelectedTextColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.CenterRight,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- SelectedTextColor = CSS_Color.FirstLevelTitleColor,
+ TextColor = CSS_Color.PromptingColor1,
+ Visible = false,
+ IsSelected = false,
};
+ passwordView.AddChidren(btnGetVerificationCode);
#endregion
btnPasswordViewBottomLine = new Button()
@@ -377,7 +394,6 @@
passwordView.AddChidren(btnPasswordViewBottomLine);
#endregion
-
#region 娉ㄥ唽涓庡揩鎹风櫥褰�
btnRegister = new Button()
@@ -424,8 +440,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