From d6fb0646531172f23648441c224cdcccd721b894 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期一, 14 十二月 2020 09:59:01 +0800
Subject: [PATCH] 请合并代码，完成晾衣架最终功能。
---
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
index 3c21373..d4beb21 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
@@ -86,7 +86,11 @@
btnCodeControl.FinishInputEvent += (value) =>
{
//鏍￠獙楠岃瘉鐮�
- this.CheckVerificationCode(value);
+ if (this.CheckVerificationCode(value) == false)
+ {
+ //娓呯┖楠岃瘉鐮�
+ btnCodeControl.ClearInputValue();
+ }
};
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
@@ -95,6 +99,7 @@
btnErrorMsg.TextAlignment = TextAlignment.Center;
btnErrorMsg.TextColor = 0xfff75858;
btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
+ btnErrorMsg.IsBold = true;
bodyFrameLayout.AddChidren(btnErrorMsg);
btnErrorMsg.Visible = false;
@@ -105,6 +110,8 @@
bodyFrameLayout.AddChidren(btnNext);
btnNext.ButtonClickEvent += (sender, e) =>
{
+ //娓呯┖杈撳叆鐨勫��
+ btnCodeControl.ClearInputValue();
//鍙戦�侀獙璇佺爜鍒伴偖绠�
this.SendCodeToEmail(btnNext);
};
@@ -117,11 +124,11 @@
/// <summary>
/// 鍙戦�侀獙璇佺爜鍒伴偖绠�
/// </summary>
- private async void SendCodeToEmail(BottomClickButton btnNext)
+ private void SendCodeToEmail(BottomClickButton btnNext)
{
var sendCodePra = new SendCodePra();
- bool falge = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);
+ bool falge = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);
if (falge == false)
{
return;
@@ -133,11 +140,11 @@
btnNext.CanClick = false;
//?s鍚庨噸鍙�
string repeat = Language.StringByID(R.MyInternationalizationString.RepeatSend1);
- //鏈夋晥鏃堕棿300绉�
- int waitime = 300;
+ //鏈夋晥鏃堕棿60绉�
+ int waitime = 60;
btnNext.Text = waitime + "s" + repeat;
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
while (this.Parent != null)
{
@@ -145,8 +152,7 @@
System.Threading.Thread.Sleep(1000);
if (waitime == 0)
{
- this.canCheckCode = false;
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (btnNext != null)
{
@@ -158,16 +164,15 @@
});
break;
}
- Application.RunOnMainThread(() =>
+ HdlThreadLogic.Current.RunMain(() =>
{
if (btnNext != null)
{
btnNext.Text = waitime + "s" + repeat;
}
- });
+ }, ShowErrorMode.NO);
}
- })
- { IsBackground = true }.Start();
+ });
}
#endregion
@@ -178,27 +183,29 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private async void CheckVerificationCode(string code)
+ private bool CheckVerificationCode(string code)
{
if (this.canCheckCode == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
- return;
+ return false;
}
var checkCodePra = new CheckCodePra();
checkCodePra.Code = code;
- bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+ bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
if (flage == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
- return;
+ return false;
}
var from = new CheckNewEmailForm();
base.AddFromAndRemoveNowForm(from);
+
+ return true;
}
#endregion
--
Gitblit v1.8.0