From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs
index ff80da1..8dfcc30 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs
@@ -35,7 +35,7 @@
//璁剧疆澶撮儴淇℃伅
base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uGestureAuthentication));
- if (string.IsNullOrEmpty(HdlUserCenterResourse.AccountOption.GestureAuthentication) == false)
+ if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
{
formMode = FormMode.A楠岃瘉鍓嶅洖瀵嗙爜;
}
@@ -104,7 +104,7 @@
};
//搴曠嚎
int lineWidth = btnForgotPsw.GetRealWidthByText();
- var btnLine = new NormalViewControl(lineWidth, HdlControlResourse.BottomLineHeight, false);
+ var btnLine = new NormalViewControl(lineWidth, ControlCommonResourse.BottomLineHeight, false);
btnLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnLine.Gravity = Gravity.CenterHorizontal;
btnLine.Y = btnForgotPsw.Bottom - Application.GetRealHeight(8);
@@ -151,15 +151,15 @@
}
else if (formMode == FormMode.A楠岃瘉鍓嶅洖瀵嗙爜)
{
- if (HdlUserCenterResourse.AccountOption.GestureAuthentication != i_Psw)
+ if (UserCenterResourse.AccountOption.GestureAuthentication != i_Psw)
{
- HdlUserCenterResourse.AccountOption.PasswordGestureInputCount--;
- if (HdlUserCenterResourse.AccountOption.PasswordGestureInputCount <= 0)
+ UserCenterResourse.AccountOption.PasswordGestureInputCount--;
+ if (UserCenterResourse.AccountOption.PasswordGestureInputCount <= 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;
}
//鎵嬪娍閿欒锛岃閲嶆柊杈撳叆
@@ -167,14 +167,14 @@
return;
}
//閲嶇疆鍓╀綑瀵嗙爜娆℃暟
- HdlUserCenterResourse.AccountOption.ResetPasswordCount();
+ UserCenterResourse.AccountOption.ResetPasswordCount();
formMode = FormMode.A淇敼瀵嗙爜;
this.InitMiddleFrame();
}
else if (formMode == FormMode.A淇敼瀵嗙爜)
{
- if (i_Psw == HdlUserCenterResourse.AccountOption.GestureAuthentication)
+ if (i_Psw == UserCenterResourse.AccountOption.GestureAuthentication)
{
//鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷达紝璇烽噸鏂拌緭鍏�
pswControl.SetErrorMsg(Language.StringByID(R.MyInternationalizationString.uNewPswAndOldPswIsEqual));
@@ -233,8 +233,14 @@
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
-
- var result = HdlAccountLogic.Current.EditorNumberAndGesturePassword(null, psw);
+ var pra = new
+ {
+ RequestVersion = Common.CommonPage.RequestVersion,
+ LoginAccessToken = Common.Config.Instance.Token,
+ GesturePwd = psw,
+ StringPwd = UserCenterResourse.AccountOption.PswAuthentication
+ };
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatEexpandPwd", false, pra);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -242,13 +248,12 @@
{
if (result == false)
{
- //淇敼瀵嗙爜澶辫触
- contr.SetErrorMsg(Language.StringByID(R.MyInternationalizationString.uEditorPasswordFail));
+ contr.SetErrorMsg(string.Empty);
}
else
{
- HdlUserCenterResourse.AccountOption.GestureAuthentication = psw;
- HdlUserCenterResourse.AccountOption.Save();
+ UserCenterResourse.AccountOption.GestureAuthentication = psw;
+ UserCenterResourse.AccountOption.Save();
//鐣岄潰鍏抽棴
this.CloseForm();
}
--
Gitblit v1.8.0