From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Common/Form/PswSecondarySecurityForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
similarity index 83%
rename from ZigbeeApp/Shared/Phone/Common/Form/PswSecondarySecurityForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
index b79f62b..024a7a4 100644
--- a/ZigbeeApp/Shared/Phone/Common/Form/PswSecondarySecurityForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/PswSecondarySecurityForm.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone
+namespace Shared.Phone.UserCenter
{
/// <summary>
/// 浜屾瀵嗙爜楠岃瘉鐣岄潰
@@ -62,15 +62,15 @@
};
pswControl.FinishInputEvent += (strPsw) =>
{
- if (HdlUserCenterResourse.AccountOption.PswAuthentication != strPsw)
+ if (UserCenterResourse.AccountOption.PswAuthentication != strPsw)
{
- HdlUserCenterResourse.AccountOption.PasswordInputCount--;
- if (HdlUserCenterResourse.AccountOption.PasswordInputCount <= 0)
+ UserCenterResourse.AccountOption.PasswordInputCount--;
+ if (UserCenterResourse.AccountOption.PasswordInputCount <= 0)
{
//绠＄悊鍛樿韩浠介獙璇佸け璐�,璇烽噸鏂扮櫥褰�
string msg2 = Language.StringByID(R.MyInternationalizationString.uCheckAdministratorFailAndReload);
this.ShowMassage(ShowMsgType.Tip, msg2);
- HdlAccountLogic.Current.ReLoginAgain(Common.Config.Instance.Account);
+ UserCenterLogic.ReLoginAgain(Common.Config.Instance.Account);
return;
}
//瀵嗙爜閿欒锛岃閲嶆柊杈撳叆
@@ -78,7 +78,7 @@
return;
}
//閲嶇疆鍓╀綑瀵嗙爜娆℃暟
- HdlUserCenterResourse.AccountOption.ResetPasswordCount();
+ UserCenterResourse.AccountOption.ResetPasswordCount();
//鐣岄潰鍏抽棴
this.CloseForm();
SuccessAction?.Invoke();
@@ -89,7 +89,7 @@
var btnGesture = new BottomLeftClickButton(frameBack.Width / 2, Application.GetRealHeight(127));
frameBack.AddChidren(btnGesture);
btnGesture.InitControl(i_GestureText);
- if (string.IsNullOrEmpty(HdlUserCenterResourse.AccountOption.GestureAuthentication) == true)
+ if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == true)
{
//娌℃湁鍚敤鎵嬪娍寮�閿�
btnGesture.CanClick = false;
@@ -98,14 +98,14 @@
btnGesture.ButtonClickEvent += (sender, e) =>
{
var form = new PswGestureSecirityForm();
- this.AddFormAndCloseNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
+ this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
};
//Touch ID寮�閿�
var btnTouch = new BottomRightClickButton(frameBack.Width - btnGesture.Width, btnGesture.Height);
frameBack.AddChidren(btnTouch);
btnTouch.InitControl(i_TouchText);
- if (HdlUserCenterResourse.AccountOption.FingerprintAuthentication == false)
+ if (UserCenterResourse.AccountOption.FingerprintAuthentication == false)
{
//娌℃湁鍚敤Touch ID
btnTouch.CanClick = false;
@@ -138,16 +138,16 @@
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = null;
//瀵嗙爜楠岃瘉
- if (string.IsNullOrEmpty(HdlUserCenterResourse.AccountOption.PswAuthentication) == false)
+ if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.PswAuthentication) == false)
{
var form = new PswSecondarySecurityForm();
- this.AddFormAndCloseNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
+ this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
}
//鎵嬪娍楠岃瘉
- else if (string.IsNullOrEmpty(HdlUserCenterResourse.AccountOption.GestureAuthentication) == false)
+ else if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
{
var form = new PswGestureSecirityForm();
- this.AddFormAndCloseNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
+ this.AddFromAndRemoveNowForm(form, i_TouchText, i_PasswordText, i_GestureText, SuccessAction);
}
else
{
--
Gitblit v1.8.0