From f718d23a262a5a8e1241fdeaeb4153399f95e79d Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 21 四月 2020 09:19:05 +0800 Subject: [PATCH] 20200421 --- HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs | 45 ++++++++++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 17 deletions(-) diff --git a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs index fa2cae8..509ce4c 100644 --- a/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs +++ b/HDL_ON/UI/UI1-Login/ForgetPasswordPageBLL.cs @@ -78,7 +78,7 @@ { etAccount.TextChangeEventHandler += (sender, e) => { - Regex reg = new Regex(@"^[1]+\d{9}"); + Regex reg = new Regex(@"^[1]+\d{10}"); var mFalg = reg.Match(etAccount.Text.Trim()); if (!mFalg.Success || (btnGlobalRoaming.Text == "+86" && etAccount.Text.Trim().Length != 11)) { @@ -86,7 +86,10 @@ } else { - btnGetVerificationCode.IsSelected = true; + if (btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode)) + { + btnGetVerificationCode.IsSelected = true; + } } }; } @@ -128,7 +131,10 @@ } else { - btnGetVerificationCode.IsSelected = true; + if (btnGetVerificationCode.Text == Language.StringByID( StringId.GetVerificationCode)) + { + btnGetVerificationCode.IsSelected = true; + } LoadMothed_EnableResetButton(); } } @@ -150,7 +156,10 @@ } else { - btnGetVerificationCode.IsSelected = true; + if (btnGetVerificationCode.Text == Language.StringByID(StringId.GetVerificationCode)) + { + btnGetVerificationCode.IsSelected = true; + } LoadMothed_EnableResetButton(); } } @@ -176,7 +185,7 @@ { CloseTime = 3, Direction = AMPopTipDirection.None, - Text = Language.StringByID(StringId.IncorrectRepeatPassword) + Text = Language.StringByID(StringId.PasswordIsUnqualified) }.Show(bodyView); } } @@ -260,6 +269,7 @@ { btnGetVerificationCode.MouseUpEventHandler += (sender, e) => { + var account = etAccount.Text.Trim(); if (btnGetVerificationCode.IsSelected) { //鐭俊鍙戦�侀棿闅�60s @@ -277,18 +287,18 @@ }); Thread.Sleep(1000); } + Application.RunOnMainThread(() => + { + //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢 + btnGetVerificationCode.IsSelected = true; + btnGetVerificationCode.TextID = StringId.GetVerificationCode; + }); }){ IsBackground = true}.Start(); new Thread(() => { - var result = pm.SendSms(etAccount.Text.Trim()); - if (result.StateCode == "Success") + var result = pm.SendSms(account); + if (result.StateCode.ToUpper() == "SUCCESS") { - Application.RunOnMainThread(() => - { - //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢 - btnGetVerificationCode.IsSelected = true; - btnGetVerificationCode.TextID = StringId.GetVerificationCode; - }); } else { @@ -361,10 +371,10 @@ return new Thread(() => { var verResult = pm.ValidatorCode(account, verCode, countryIndex); - if (verResult.StateCode == "Success") + if (verResult.StateCode.ToUpper() == "SUCCESS") { var resetResult = pm.ResetPassword(account, password, repeatPassword, countryIndex); - if (resetResult.StateCode == "Success") + if (resetResult.StateCode.ToUpper() == "SUCCESS") { Application.RunOnMainThread(() => { @@ -483,7 +493,7 @@ TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.TextFontSize, - Text = "s鏄敓鐢熶笘涓�", + //Text = "s鏄敓鐢熶笘涓�", }; frame.AddChidren(btnAccountText); @@ -509,7 +519,7 @@ TextSize = CSS_FontSize.PromptFontSize_FirstLevel, TextID = StringId.AutomaticallyLogin, }; - frame.AddChidren(btnAutoLoginTip); + //frame.AddChidren(btnAutoLoginTip); Button btnHeadImage = new Button() { @@ -531,6 +541,7 @@ Thread.Sleep(1500); Application.RunOnMainThread(() => { + dialog.Close(); this.Close(); }); }) -- Gitblit v1.8.0