From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs | 157 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 100 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
index 33ed547..b63cf28 100644
--- a/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
+++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs
@@ -9,6 +9,10 @@
{
#region 鎺т欢鍒楄〃
/// <summary>
+ /// 绛夊緟鎻愮ず
+ /// </summary>
+ Loading waitPage;
+ /// <summary>
/// 褰撳墠鐣岄潰
/// </summary>
FrameLayout bodyView;
@@ -16,10 +20,6 @@
/// 閫夋嫨鎵嬫満鐧诲綍鎸夐挳
/// </summary>
Button btnPhoneLogin;
- /// <summary>
- /// 鐧诲綍绫诲瀷閫変腑鎻愮ず绾�
- /// </summary>
- Button btnChooseBottomLine;
/// <summary>
/// 閫夋嫨閭鐧诲綍鎸夐挳
/// </summary>
@@ -116,7 +116,11 @@
/// <summary>
/// 鑾峰彇楠岃瘉鐮佹寜閽�
/// </summary>
- Button btnGetVerificationCode;
+ Button btnGetVerificationCode_Phone;
+ /// <summary>
+ /// 鑾峰彇楠岃瘉鐮佹寜閽�
+ /// </summary>
+ Button btnGetVerificationCode_Mail;
/// <summary>
/// 楠岃瘉鐮佸瓙鍖哄煙搴曢儴鍒嗗壊绾�
/// </summary>
@@ -124,7 +128,7 @@
/// <summary>
/// 淇敼鎸夐挳
/// </summary>
- Button btnRegister;
+ Button btnReset;
#endregion
@@ -136,42 +140,68 @@
/// </summary>
int accountType = 0;
/// <summary>
- /// 鎵嬫満鍙风爜鏄惁鏈夋晥
- /// </summary>
- bool ValidMobileNumber = false;
- /// <summary>
- /// 瀵嗙爜鏄惁鏈夋晥
- /// </summary>
- bool ValidPassword = false;
- /// <summary>
/// 鏈嶅姟鍣ㄨ姹傚璞�
/// </summary>
HttpServerRequest pm;
/// <summary>
/// 鍥炶皟浜嬩欢
+ /// 璐﹀彿锛屽瘑鐮侊紝鏄惁鎵嬫満
+ /// account锛宲assword锛宨sPhone
/// </summary>
- Action<string> callbackAction;
+ Action<string, string, bool> AutoLoginAction;
/// <summary>
/// 淇敼绫诲瀷
/// 0:鎵嬫満
/// 1:閭
/// </summary>
int registerType;
+ /// <summary>
+ /// 鎵嬫満鍖哄彿
+ /// </summary>
+ string phoneZoneCode = "86";
+
+ /// <summary>
+ ///
+ /// </summary>
+ string registerPhone;
+ string registerEmail;
+ /// <summary>
+ /// 鏄惁鐐瑰嚮浜嗚繑鍥烇紝鐢ㄤ簬灞忚斀EditText澶卞幓鐒︾偣妫�娴嬩簨浠�
+ /// </summary>
+ bool isHitBack;
#endregion
- public ForgetPasswordPage()
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="autoLoginAction">鑷姩鐧诲綍鍥炶皟浜嬩欢</param>
+ public ForgetPasswordPage(Action<string, string, bool> autoLoginAction)
{
+ AutoLoginAction = autoLoginAction;
bodyView = new FrameLayout()
{
- BackgroundColor = CSS_Color.BackgroundColor,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
};
AddChidren(bodyView);
+ //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+ bodyView.MouseDownEventHandler += (sender, e) => {
+ Application.HideSoftInput();
+ };
pm = new HttpServerRequest();
}
public void ShowDialog()
{
- new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(R.InternationalizationString.Register));
+ Action backAction = () =>
+ {
+ isHitBack = true;
+ //2020-12-22 澧炲姞鐐瑰嚮闅愯棌閿洏浜嬩欢
+ Application.HideSoftInput();
+
+ };
+ new TopViewDiv(this, bodyView, Language.StringByID(StringId.ModifyPassword)).LoadTopView(backAction);
+ //new PublicAssmebly().LoadTopView(this, bodyView, Language.StringByID(StringId.ForgetPassword));
#region 淇敼鏂瑰紡閫夋嫨
btnPhoneLogin = new Button()
@@ -180,24 +210,12 @@
Y = Application.GetRealHeight(112),
Width = Application.GetRealWidth(120),
Height = Application.GetRealHeight(40),
- TextID = R.InternationalizationString.LoginByPhone,
+ TextID = StringId.PhoneNumberAccount,
TextColor = CSS_Color.MainColor,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
};
bodyView.AddChidren(btnPhoneLogin);
-
- btnChooseBottomLine = new Button()
- {
- Width = Application.GetRealWidth(46),
- Height = Application.GetRealHeight(4),
- X = btnPhoneLogin.X + Application.GetRealWidth(27),
- Y = btnPhoneLogin.Bottom,
- Radius = (uint)Application.GetRealHeight(2),
- BorderWidth = 0,
- BackgroundColor = CSS_Color.MainColor,
- };
- bodyView.AddChidren(btnChooseBottomLine);
btnEmailLogin = new Button()
{
@@ -205,12 +223,19 @@
Y = Application.GetRealHeight(112),
Width = Application.GetRealWidth(100),
Height = Application.GetRealHeight(40),
- TextID = R.InternationalizationString.LoginByEmail,
+ TextID = StringId.EmailAccount,
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.TextFontSize,
};
bodyView.AddChidren(btnEmailLogin);
+
+ bodyView.AddChidren(btnEmailLogin);
+ if (Language.CurrentLanguage != "Chinese")
+ {
+ btnPhoneLogin.Width = Application.GetRealWidth(180);
+ btnEmailLogin.Width = Application.GetRealWidth(180);
+ }
#endregion
#region 璐﹀彿濉啓
@@ -229,23 +254,26 @@
X = Application.GetRealWidth(9),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = "+86",
+ Text = "+" + phoneZoneCode,
TextSize = CSS_FontSize.TextFontSize,
};
+
+ //璺宠浆鍥藉鍖哄彿閫夋嫨鐣岄潰
+ EventHandler<MouseEventArgs> eHandler = (sender, e) => {
+ JLCountrycode.CountryCodeView.Current.Show((countryName, code) => {
+ if (!string.IsNullOrEmpty(code))
+ {
+ phoneZoneCode = code;
+ btnGlobalRoaming.Text = "+" + phoneZoneCode;
+ }
+ });
+ };
+ btnGlobalRoaming.MouseUpEventHandler += eHandler;
+
if (accountType == 0)
{
accountView.AddChidren(btnGlobalRoaming);
}
-
- //btnDividingLineVertical_AccountView = new Button()
- //{
- // X = Application.GetRealWidth(65),
- // Gravity = Gravity.CenterVertical,
- // Width = 1,
- // Height = Application.GetRealHeight(20),
- // BackgroundColor = CSS_Color.DividingLineColor,
- //};
- //accountView.AddChidren(btnDividingLineVertical_AccountView);
etAccount = new EditText()
{
@@ -255,7 +283,8 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
- PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryPhoneNumber),
+ PlaceholderText = Language.StringByID(StringId.PlsEntryPhoneNumber),
+ IsNumberKeyboardType = true
};
accountView.AddChidren(etAccount);
@@ -320,21 +349,35 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
- PlaceholderText = Language.StringByID(R.InternationalizationString.PlsEntryVerificationCode),
+ PlaceholderText = Language.StringByID(StringId.PlsEntryVerificationCode),
+ IsNumberKeyboardType = true
};
verificationCodeView.AddChidren(etVerificationCode);
- btnGetVerificationCode = new Button()
+ btnGetVerificationCode_Phone = new Button()
{
X = Application.GetRealWidth(219),
Width = Application.GetRealWidth(100),
- TextID = R.InternationalizationString.GetVerificationCode,
+ TextID = StringId.GetVerificationCode,
SelectedTextColor = CSS_Color.MainColor,
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterRight,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
};
- verificationCodeView.AddChidren(btnGetVerificationCode);
+ verificationCodeView.AddChidren(btnGetVerificationCode_Phone);
+
+ btnGetVerificationCode_Mail = new Button()
+ {
+ X = Application.GetRealWidth(219),
+ Width = Application.GetRealWidth(100),
+ TextID = StringId.GetVerificationCode,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.PromptingColor1,
+ TextAlignment = TextAlignment.CenterRight,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ Visible = false
+ };
+ verificationCodeView.AddChidren(btnGetVerificationCode_Mail);
btnVerificationCodeViewBottomLine = new Button()
{
@@ -385,7 +428,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
- PlaceholderText = Language.StringByID(R.InternationalizationString.PlsRegisterPassword),
+ PlaceholderText = Language.StringByID(StringId.PlsRegisterPassword),
SecureTextEntry = true,
};
passwordView.AddChidren(etPassword);
@@ -417,7 +460,7 @@
repeatPasswordView = new FrameLayout()
{
X = Application.GetRealWidth(28),
- Y = Application.GetRealHeight(279),
+ Y = Application.GetRealHeight(335),
Width = Application.GetRealWidth(335),
Height = Application.GetRealHeight(44),
};
@@ -451,7 +494,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
PlaceholderTextColor = CSS_Color.PromptingColor1,
- PlaceholderText = Language.StringByID(R.InternationalizationString.PlsRegisterRepeatPassword),
+ PlaceholderText = Language.StringByID(StringId.PlsRegisterRepeatPassword),
SecureTextEntry = true,
};
repeatPasswordView.AddChidren(etRepeatPassword);
@@ -481,23 +524,23 @@
#endregion
- btnRegister = new Button()
+ btnReset = new Button()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(421),
Width = Application.GetRealWidth(220),
- Height = Application.GetRealHeight(44),
- Radius = (uint)Application.GetRealHeight(22),
+ Height = Application.GetRealWidth(44),
+ Radius = (uint)Application.GetRealWidth(22),
SelectedBackgroundColor = CSS_Color.MainColor,
BackgroundColor = CSS_Color.PromptingColor1,
- TextID = R.InternationalizationString.Register,
+ TextID = StringId.ConfirmReset,
TextSize = CSS_FontSize.SubheadingFontSize,
TextColor = CSS_Color.MainBackgroundColor,
TextAlignment = TextAlignment.Center,
};
- bodyView.AddChidren(btnRegister);
+ bodyView.AddChidren(btnReset);
- //LoadEventList();
+ LoadEventList();
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0