From 25429f085093d89d543a0b90e30d0d62d1b7dac9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 30 八月 2022 09:37:38 +0800
Subject: [PATCH] 合并了IOS的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/EditorGesturePasswordForm.cs
index b1138df..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(UserCenterResourse.Option.GestureAuthentication) == false)
+ if (string.IsNullOrEmpty(UserCenterResourse.AccountOption.GestureAuthentication) == false)
{
formMode = FormMode.A楠岃瘉鍓嶅洖瀵嗙爜;
}
@@ -151,10 +151,10 @@
}
else if (formMode == FormMode.A楠岃瘉鍓嶅洖瀵嗙爜)
{
- if (UserCenterResourse.Option.GestureAuthentication != i_Psw)
+ if (UserCenterResourse.AccountOption.GestureAuthentication != i_Psw)
{
- UserCenterResourse.Option.PasswordGestureInputCount--;
- if (UserCenterResourse.Option.PasswordGestureInputCount <= 0)
+ UserCenterResourse.AccountOption.PasswordGestureInputCount--;
+ if (UserCenterResourse.AccountOption.PasswordGestureInputCount <= 0)
{
//绠＄悊鍛樿韩浠介獙璇佸け璐�,璇烽噸鏂扮櫥褰�
string msg2 = Language.StringByID(R.MyInternationalizationString.uCheckAdministratorFailAndReload);
@@ -167,14 +167,14 @@
return;
}
//閲嶇疆鍓╀綑瀵嗙爜娆℃暟
- UserCenterResourse.Option.ResetPasswordCount();
+ UserCenterResourse.AccountOption.ResetPasswordCount();
formMode = FormMode.A淇敼瀵嗙爜;
this.InitMiddleFrame();
}
else if (formMode == FormMode.A淇敼瀵嗙爜)
{
- if (i_Psw == UserCenterResourse.Option.GestureAuthentication)
+ if (i_Psw == UserCenterResourse.AccountOption.GestureAuthentication)
{
//鏂板瘑鐮佸拰鍘熷瘑鐮佷竴鑷达紝璇烽噸鏂拌緭鍏�
pswControl.SetErrorMsg(Language.StringByID(R.MyInternationalizationString.uNewPswAndOldPswIsEqual));
@@ -229,7 +229,7 @@
/// <param name="psw">瀵嗙爜</param>
private void SaveSecondaryPassword(PswGestureInputControl contr, string psw)
{
- HdlThreadLogic.Current.RunThread(async () =>
+ HdlThreadLogic.Current.RunThread(() =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
@@ -238,27 +238,26 @@
RequestVersion = Common.CommonPage.RequestVersion,
LoginAccessToken = Common.Config.Instance.Token,
GesturePwd = psw,
- StringPwd = UserCenterResourse.Option.PswAuthentication
+ StringPwd = UserCenterResourse.AccountOption.PswAuthentication
};
- var result = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatEexpandPwd", false, pra);
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/UpdatEexpandPwd", false, pra);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
- if (result == false)
+ HdlThreadLogic.Current.RunMain(() =>
{
- contr.SetErrorMsg(string.Empty);
- }
- else
- {
- UserCenterResourse.Option.GestureAuthentication = psw;
- UserCenterResourse.Option.Save();
-
- HdlThreadLogic.Current.RunMain(() =>
+ if (result == false)
{
+ contr.SetErrorMsg(string.Empty);
+ }
+ else
+ {
+ UserCenterResourse.AccountOption.GestureAuthentication = psw;
+ UserCenterResourse.AccountOption.Save();
//鐣岄潰鍏抽棴
this.CloseForm();
- });
- }
+ }
+ });
});
}
--
Gitblit v1.8.0