From 72be4f06a683de33ddd563c8447c39f7f17e5b7d Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 06 一月 2020 13:03:50 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
index 70369a2..983b93d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/ForgotSecondaryPasswordForm.cs
@@ -81,7 +81,7 @@
var btnCode = new NormalViewControl(302, 127, true);
btnCode.X = rowPhone.Right + Application.GetRealWidth(35);
btnCode.Y = Application.GetRealHeight(23);
- btnCode.Radius = (uint)Application.GetMinRealAverage(4);
+ btnCode.RadiusEx = 12;
btnCode.TextID = R.MyInternationalizationString.uGetVerificationCode;
btnCode.TextColor = UserCenterColor.Current.White;
btnCode.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
@@ -154,8 +154,6 @@
if (frameTran.Visible == false)
{
frameTran.Visible = true;
- //鍔ㄧ敾鏁堟灉
- frameAnimate.Animate = Animate.UpToDown;
}
};
}
@@ -187,11 +185,11 @@
btnCode.BackgroundColor = 0xfffebca9;
//?s鍚庨噸鍙�
string repeat = Language.StringByID(R.MyInternationalizationString.RepeatSend1);
- //鏈夋晥鏃堕棿300绉�
- int waitime = 300;
+ //鏈夋晥鏃堕棿60绉�
+ int waitime = 60;
btnCode.Text = waitime + "s" + repeat;
- new System.Threading.Thread(() =>
+ HdlThreadLogic.Current.RunThread(() =>
{
while (this.Parent != null)
{
@@ -199,7 +197,6 @@
System.Threading.Thread.Sleep(1000);
if (waitime == 0)
{
- this.canCheckCode = false;
Application.RunOnMainThread(() =>
{
if (btnCode != null)
@@ -221,8 +218,7 @@
}
});
}
- })
- { IsBackground = true }.Start();
+ });
}
#endregion
@@ -292,6 +288,7 @@
this.CloseForm();
//鎸囧畾鏂板缓瀵嗙爜妯″紡
this.LoadFormMethodByName("EditorSecondaryPasswordForm", "SetNewPasswordFormMode");
+ this.LoadFormMethodByName("EditorGesturePasswordForm", "SetNewPasswordFormMode");
}
#endregion
--
Gitblit v1.8.0