From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI1-Login/LoginPage.cs | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index e24e26d..d50aa67 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 鎺т欢鍒楄〃
@@ -145,7 +145,7 @@
/// <summary>
/// 鍔犺浇瑙嗗浘
/// </summary>
- public void LoadView()
+ public void LoadView(string account = "")
{
var btnIcon = new Button()
{
@@ -157,7 +157,8 @@
};
bodyView.AddChidren(btnIcon);
- var btnIcon_bg = new Button() {
+ var btnIcon_bg = new Button()
+ {
X = Application.GetRealWidth(171),
Y = Application.GetRealHeight(69),
Width = Application.GetMinRealAverage(254),
@@ -169,11 +170,9 @@
btnIcon.MouseUpEventHandler += (sender, e) =>
{
#if DEBUG
- UserConfig.Instance.SkinCode = UserConfig.Instance.SkinCode > 1 ? 0 : 1;
- SharedMethod.SharedMethod.ChangeSkin();
- MainPage.Log($"UserConfig.skincode{UserConfig.Instance.SkinCode}");
etAccount.Text = "464027401@qq.com";
etPassword.Text = "qqqqqq";
+ btnLogin.IsSelected = true;
#endif
};
@@ -184,7 +183,7 @@
Y = Application.GetRealHeight(177),
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(40),
- TextID = R.InternationalizationString.LoginByPhone,
+ TextID = StringId.LoginByPhone,
TextColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
@@ -197,7 +196,7 @@
Y = Application.GetRealHeight(177),
Width = Application.GetRealWidth(100),
Height = Application.GetRealHeight(40),
- TextID = R.InternationalizationString.LoginByEmail,
+ TextID = StringId.LoginByEmail,
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.TextFontSize,
@@ -223,7 +222,7 @@
Text = "+86",
TextSize = CSS_FontSize.TextFontSize,
};
- if (logintType == 0)
+ if (loginType == 0)
accountView.AddChidren(btnGlobalRoaming);
btnDividingLineVertical_AccountView = new Button()
@@ -240,14 +239,18 @@
{
X = Application.GetRealWidth(78),
Width = Application.GetRealWidth(319 - 78),
- TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
- PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryAccount),
+ PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
+ TextAlignment = TextAlignment.CenterLeft,
};
accountView.AddChidren(etAccount);
+ if (account != "")
+ {
+ etAccount.Text = account;
+ }
btnAccountViewBottomLine = new Button()
{
@@ -266,7 +269,7 @@
Height = Application.GetMinRealAverage(20),
UnSelectedImagePath = "LoginIcon/AccountIcon.png",
};
- if (logintType == 1)
+ if (loginType == 1)
{
accountView.AddChidren(btnAccountIcon);
}
@@ -308,12 +311,12 @@
{
X = Application.GetRealWidth(78),
Width = Application.GetRealWidth(61 + 84),
- TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
- PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryPassword),
+ PlaceholderText = Language.StringByID(StringId.PlsEntryPassword),
SecureTextEntry = true,
+ TextAlignment = TextAlignment.CenterLeft,
};
passwordView.AddChidren(etPassword);
@@ -345,7 +348,7 @@
Width = Application.GetRealWidth(56),
TextColor = CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.CenterLeft,
- TextID = R.InternationalizationString.ForgetPassword,
+ TextID = StringId.ForgetPassword,
TextSize = 12,
};
passwordView.AddChidren(btnForgetPassword);
@@ -356,10 +359,11 @@
{
X = Application.GetRealWidth(219),
Width = Application.GetRealWidth(100),
- TextID = R.InternationalizationString.GetVerificationCode,
- TextColor = CSS_Color.MainColor,
+ TextID = StringId.GetVerificationCode,
+ SelectedTextColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.CenterRight,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.FirstLevelTitleColor,
};
#endregion
@@ -384,7 +388,7 @@
Height = Application.GetRealHeight(17 + 12 + 12),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = R.InternationalizationString.SingUp,
+ TextID = StringId.SingUp,
TextAlignment = TextAlignment.CenterLeft,
};
bodyView.AddChidren(btnRegister);
@@ -397,7 +401,7 @@
Height = Application.GetRealHeight(51),
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = R.InternationalizationString.VerificationCodeLogin,
+ TextID = StringId.VerificationCodeLogin,
TextAlignment = TextAlignment.CenterRight,
};
bodyView.AddChidren(btnSwitchLoginMode);
@@ -413,7 +417,7 @@
Radius = (uint)Application.GetRealHeight(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
- TextID = R.InternationalizationString.Login,
+ TextID = StringId.Login,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
TextAlignment = TextAlignment.Center,
@@ -422,6 +426,7 @@
LoadEventList();
+ account = etAccount.Text.Trim();
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0