From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SecondaryPswSecurityForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
similarity index 95%
rename from ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SecondaryPswSecurityForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
index 7237f1f..7017148 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/SecondaryPswSecurityForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 浜屾瀵嗙爜楠岃瘉鐣岄潰
/// </summary>
- public class SecondaryPswSecurityForm : DialogCommonForm
+ public class PswSecondarySecurityForm : DialogCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -43,7 +43,7 @@
frameBack.Width = Application.GetRealWidth(965);
frameBack.Height = Application.GetRealHeight(1711);
frameBack.BackgroundColor = UserCenterColor.Current.White;
- frameBack.Radius = (uint)Application.GetMinRealAverage(6);
+ frameBack.Radius = 6;
bodyFrameLayout.AddChidren(frameBack);
//瀵嗙爜杈撳叆鎺т欢
@@ -75,6 +75,7 @@
}
//瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
pswControl.SetErrorMsg(Language.StringByID(R.MyInternationalizationString.uOldPsswordIsError));
+ pswControl.ResetControlInfo(i_PasswordText, false);
return;
}
//閲嶇疆鍓╀綑瀵嗙爜娆℃暟
@@ -101,7 +102,7 @@
btnGesture.ButtonClickEvent += (sender, e) =>
{
- var form = new GesturePswSecirityForm();
+ var form = new PswGestureSecirityForm();
this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
};
@@ -148,13 +149,13 @@
//瀵嗙爜楠岃瘉
if (string.IsNullOrEmpty(UserCenterResourse.Option.PswAuthentication) == false)
{
- var form = new SecondaryPswSecurityForm();
+ var form = new PswSecondarySecurityForm();
this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
}
//鎵嬪娍楠岃瘉
else if (string.IsNullOrEmpty(UserCenterResourse.Option.GestureAuthentication) == false)
{
- var form = new GesturePswSecirityForm();
+ var form = new PswGestureSecirityForm();
this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
}
else
--
Gitblit v1.8.0