From 18b93d511dc764b469d7c4a7e755f7274f89cdb4 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 27 四月 2020 17:55:14 +0800
Subject: [PATCH] 2020-4-27-1
---
ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs | 81 +++++++++++++++-------------------------
1 files changed, 30 insertions(+), 51 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs b/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs
index 432436e..0ae4177 100755
--- a/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/PhoneEmailForm.cs
@@ -1042,7 +1042,7 @@
/// <summary>
/// sendCode
/// </summary>
- public Button SendCodeBtn;
+ public NormalViewControl SendCodeBtn;
/// <summary>
/// VerificationCodeET
/// </summary>
@@ -1105,20 +1105,15 @@
};
codeFL.AddChidren(VerificationCodeET);
- SendCodeBtn = new Button()
+ SendCodeBtn = new NormalViewControl(300, 127, true)
{
X = Application.GetRealWidth(CommonFormResouce.Row_Width - 300),
- Width = Application.GetRealWidth(300),
- Height = Application.GetRealHeight(127),
Gravity = Gravity.CenterVertical,
TextID = R.MyInternationalizationString.SendVerificationCode,
TextColor = ZigbeeColor.Current.GXCTextWhiteColor,
- SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
TextAlignment = TextAlignment.Center,
- BackgroundColor = ZigbeeColor.Current.GXCButtonDisableColor,
- SelectedBackgroundColor=ZigbeeColor.Current.GXCButtonSelectedColor,
- Enable = false,
- IsSelected = false,
+ BackgroundColor = 0xFFFEBCA9,
+ CanClick = false,
Radius=(uint)Application.GetRealHeight(12),
IsBold=true,
TextSize=CommonFormResouce.TextSize
@@ -1158,51 +1153,35 @@
}
/// <summary>
- /// TimeOut
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void TimeOut(object sender, System.Timers.ElapsedEventArgs e)
- {
- var span = DateTime.Now - dateBegin;
- if (span.TotalSeconds <= 61)
- {
- Application.RunOnMainThread(() =>
- {
- SendCodeBtn.Text = Convert.ToInt16(60 - span.TotalSeconds) + "s" + Language.StringByID(R.MyInternationalizationString.SendVerificationCodeAgain);
- SendCodeBtn.Enable = SendCodeBtn.IsSelected = false;
- SendCodeBtn.BackgroundColor = ZigbeeColor.Current.GXCClearColor;
- SendCodeBtn.SelectedBackgroundColor= ZigbeeColor.Current.GXCClearColor;
- SendCodeBtn.TextColor = ZigbeeColor.Current.GXCTextBlackColor;
- });
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- SendCodeBtn.TextID = R.MyInternationalizationString.SendVerificationCode;
- SendCodeBtn.BackgroundColor = ZigbeeColor.Current.GXCButtonDisableColor;
- SendCodeBtn.SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor;
- SendCodeBtn.TextColor = ZigbeeColor.Current.GXCTextWhiteColor;
- SendCodeBtn.Enable = SendCodeBtn.IsSelected = true;
- t.Stop();
- t.Close();
- });
- }
- }
-
- /// <summary>
/// TimeBegin
/// </summary>
public void TimeBegin()
- {
- t.Interval = 1000;
- t.AutoReset = true;
- t.Enabled = true;
- t.Elapsed += TimeOut;
- //鍚姩璁℃椂鍣ㄥ�掕鏃�-60s
- t.Start();
- dateBegin = DateTime.Now;
+ {
+ SendCodeBtn.BackgroundColor = UserCenterColor.Current.White;
+ SendCodeBtn.TextColor = ZigbeeColor.Current.GXCTextBlackColor;
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鍚庨噸鍙�
+ string txtValue = Language.StringByID(R.MyInternationalizationString.SendVerificationCodeAgain);
+ int timeOut = 60;
+ while (timeOut > 0 && SendCodeBtn.Parent != null)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ SendCodeBtn.Text = timeOut + "s" + txtValue;
+ });
+ timeOut--;
+ System.Threading.Thread.Sleep(1000);
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ SendCodeBtn.TextID = R.MyInternationalizationString.SendVerificationCode;
+ SendCodeBtn.BackgroundColor = 0xFFFC744B;
+ SendCodeBtn.TextColor = ZigbeeColor.Current.GXCTextWhiteColor;
+ SendCodeBtn.CanClick = true;
+ });
+ });
}
/// <summary>
--
Gitblit v1.8.0