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