From 9c16d3614d9b88c637f967518a329f239fcd3aaf Mon Sep 17 00:00:00 2001
From: lss <316519258@qq.com>
Date: 星期五, 12 六月 2020 09:22:04 +0800
Subject: [PATCH] 2020.06.12
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
index 0467e69..cfcdc6e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
@@ -43,7 +43,7 @@
frameBack.Width = Application.GetRealWidth(965);
frameBack.Height = Application.GetRealHeight(1711);
frameBack.BackgroundColor = UserCenterColor.Current.White;
- frameBack.Radius = 6;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frameBack);
//瀵嗙爜杈撳叆鎺т欢
@@ -62,10 +62,10 @@
};
pswControl.FinishInputEvent += (strPsw) =>
{
- if (UserCenterResourse.Option.PswAuthentication != strPsw)
+ if (UserCenterResourse.AccountOption.PswAuthentication != strPsw)
{
- UserCenterResourse.Option.PasswordInputCount--;
- if (UserCenterResourse.Option.PasswordInputCount <= 0)
+ UserCenterResourse.AccountOption.PasswordInputCount--;
+ if (UserCenterResourse.AccountOption.PasswordInputCount <= 0)
{
//绠＄悊鍛樿韩浠介獙璇佸け璐�,璇烽噸鏂扮櫥褰�
string msg2 = Language.StringByID(R.MyInternationalizationString.uCheckAdministratorFailAndReload);
@@ -78,7 +78,7 @@
return;
}
//閲嶇疆鍓╀綑瀵嗙爜娆℃暟
- UserCenterResourse.Option.ResetPasswordCount();
+ UserCenterResourse.AccountOption.ResetPasswordCount();
//鐣岄潰鍏抽棴
this.CloseForm();
SuccessAction?.Invoke();
@@ -86,14 +86,10 @@
};
//鎵嬪娍寮�閿�
- var btnGesture = new NormalClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
- btnGesture.oldBackgroundColor = 0xfff5f6fa;
- btnGesture.BackgroundColor = 0xfff5f6fa;
- btnGesture.Text = i_GestureText;
- btnGesture.TextColor = UserCenterColor.Current.TextColor1;
- btnGesture.Gravity = Gravity.BottomLeft;
+ var btnGesture = new BottomLeftClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
frameBack.AddChidren(btnGesture);
- if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == true)
+ btnGesture.InitControl(i_GestureText);
+ if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == true)
{
//娌℃湁鍚敤鎵嬪娍寮�閿�
btnGesture.CanClick = false;
@@ -106,14 +102,10 @@
};
//Touch ID寮�閿�
- var btnTouch = new NormalClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
- btnTouch.BackgroundColor = 0xff232323;
- btnTouch.oldBackgroundColor = 0xff232323;
- btnTouch.Text = i_TouchText;
- btnTouch.TextColor = UserCenterColor.Current.White;
- btnTouch.Gravity = Gravity.BottomRight;
+ var btnTouch = new BottomRightClickButton(frameBack.Width - btnGesture.Width, btnGesture.Height);
frameBack.AddChidren(btnTouch);
- if (UserCenterResourse.Option.FingerprintAuthentication == false)
+ btnTouch.InitControl(i_TouchText);
+ if (UserCenterResourse.AccountOption.FingerprintAuthentication == false)
{
//娌℃湁鍚敤Touch ID
btnTouch.CanClick = false;
@@ -146,13 +138,13 @@
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = null;
//瀵嗙爜楠岃瘉
- if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == false)
+ if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)
{
var form = new PswSecondarySecurityForm();
this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
}
//鎵嬪娍楠岃瘉
- else if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == false)
+ else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
{
var form = new PswGestureSecirityForm();
this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
@@ -172,12 +164,12 @@
#region 鈻� 鐣岄潰鍏抽棴___________________________
- public override void CloseForm()
+ public override void CloseFormBefore()
{
//鍙栨秷浜嬩欢
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = null;
- base.CloseForm();
+ base.CloseFormBefore();
}
#endregion
--
Gitblit v1.8.0