From 6ec12a036c96a200fc0a941967d6b4d07592f863 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:31:17 +0800
Subject: [PATCH] Merge branch 'tzy' into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs | 88 ++++++++++++--------------------------------
1 files changed, 24 insertions(+), 64 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
index 9ce773d..ab65eff 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -230,18 +230,16 @@
etPassword.Foucs = true;
- //鍔犺浇搴曢儴楠岃瘉鎸夐挳
- if (optionType == "3" || optionType == "5" || optionType == "6")
- {
- //杈撳叆鐧诲綍瀵嗙爜楠岃瘉 鎻愮ず鎸夐挳
- AddInputPasswordTipButton(optionType);
- }
- else if (optionType == "7")
+ if (optionType == "7")
{
//浣跨敤璐︽埛瀵嗙爜鐧诲綍鎸夐挳 鎻愮ず鎸夐挳
AddLoginTipButton();
}
-
+ else if (optionType != "1")
+ {
+ //杈撳叆鐧诲綍瀵嗙爜楠岃瘉 鎻愮ず鎸夐挳
+ AddInputPasswordTipButton(optionType);
+ }
}
@@ -437,68 +435,30 @@
//杈撳叆鐧诲綍瀵嗙爜楠岃瘉
Action<string> action = (pw) =>
{
- AuthenticationByLoginPassword(pw, optionType);
- //var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
- //if (resultObj.Code == StateCode.SUCCESS)
- //{
- // PasswordInputPassed(optionType);
- //}
- //else
- //{
- // Application.RunOnMainThread(() =>
- // {
- // Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
- // });
+ var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
+ if (resultObj.Code.ToUpper() == StateCode.SUCCESS)
+ {
+ //UserInfo.Current.appUnlockPasswrod = "";
+ //UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
+ //UserInfo.Current.SaveUserInfo();
+ //this.RemoveFromParent();
+ //backAction();
- //}
+ PasswordInputPassed(optionType);
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
+ });
+
+ }
};
new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
};
}
- /// <summary>
- /// 鐧诲綍瀵嗙爜楠岃瘉
- /// </summary>
- /// <param name="pw"></param>
- /// <param name="optionType"></param>
- void AuthenticationByLoginPassword(string pw, string optionType)
- {
- var waitPage = new Loading();
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
-
- new System.Threading.Thread(() =>
- {
- try
- {
- var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
- Application.RunOnMainThread(() =>
- {
- if (resultObj.Code == StateCode.SUCCESS)
- {
- PasswordInputPassed(optionType);
- }
- else
- {
- Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
- }
- });
- }
- catch { }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- if (waitPage != null)
- {
- waitPage.RemoveFromParent();
- waitPage = null;
- }
- });
- }
- })
- { IsBackground = true }.Start();
- }
}
}
--
Gitblit v1.8.0