From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs | 77 +++++++++++++++++++++++---------------
1 files changed, 46 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
index 4934c6b..e94eb79 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -58,12 +58,15 @@
};
bodyView.AddChidren(btnTipTitle);
-
- if (optionType == "2" || optionType == "3")
+ if (optionType == "1")
+ {
+ btnTipTitle.TextID = string.IsNullOrEmpty(oldPasswrod) ? StringId.PlsEntryPassword : StringId.PlsRegisterRepeatPassword;
+ }
+ else if (optionType == "2")
{
btnTipTitle.TextID = StringId.PleaseEnterTheOriginalDigitalPassword;
}
- if (optionType == "7")
+ else
{
btnTipTitle.TextID = StringId.PlsEntryPassword;
}
@@ -152,7 +155,8 @@
//etPassword.MouseUpEventHandler = (sender, e) => { };
- etPassword.TextChangeEventHandler = (sender, e) => {
+ etPassword.TextChangeEventHandler = (sender, e) =>
+ {
passwrod = etPassword.Text.Trim();
switch (etPassword.Text.Trim().Length)
{
@@ -214,7 +218,8 @@
}
};
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
etPassword.Foucs = true;
};
bodyView.MouseUpEventHandler = eventHandler;
@@ -229,9 +234,9 @@
if (optionType == "3" || optionType == "5" || optionType == "6")
{
//杈撳叆鐧诲綍瀵嗙爜楠岃瘉 鎻愮ず鎸夐挳
- AddInputPasswordTipButton();
+ AddInputPasswordTipButton(optionType);
}
- else if(optionType == "7")
+ else if (optionType == "7")
{
//浣跨敤璐︽埛瀵嗙爜鐧诲綍鎸夐挳 鎻愮ず鎸夐挳
AddLoginTipButton();
@@ -285,26 +290,33 @@
if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
{
var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
- Action<bool> action = (result) =>
+
+ //濡傛灉涔嬪墠娌¤缃寚绾规垨鑰呴潰瀹笽D鎵嶆樉绀烘槸鍚﹀紑鍚�
+ if (!UserInfo.Current.appUnlockType.Contains(unlockType))
{
- if (result)
+ Action<bool> action = (result) =>
{
- if (!UserInfo.Current.appUnlockType.Contains(unlockType))
+ if (result)
{
- UserInfo.Current.appUnlockType.Add(unlockType);
+ if (!UserInfo.Current.appUnlockType.Contains(unlockType))
+ {
+ UserInfo.Current.appUnlockType.Add(unlockType);
+ }
}
- }
- else
- {
- if (UserInfo.Current.appUnlockType.Contains(unlockType))
+ else
{
- UserInfo.Current.appUnlockType.Remove(unlockType);
+ if (UserInfo.Current.appUnlockType.Contains(unlockType))
+ {
+ UserInfo.Current.appUnlockType.Remove(unlockType);
+ }
}
- }
- backAction();
- UserInfo.Current.SaveUserInfo();
- };
- page.AdditionalOperations(tipMsg, action);
+ backAction();
+ UserInfo.Current.SaveUserInfo();
+ };
+
+
+ page.AdditionalOperations(tipMsg, action);
+ }
}
if (!UserInfo.Current.appUnlockType.Contains("1"))
{
@@ -384,7 +396,8 @@
/// <summary>
/// 浣跨敤璐︽埛瀵嗙爜鐧诲綍鎸夐挳 鎻愮ず鎸夐挳
/// </summary>
- void AddLoginTipButton(){
+ void AddLoginTipButton()
+ {
Button btnLoginAccountVerify = new Button()
{
Y = Application.GetRealHeight(517),
@@ -406,7 +419,7 @@
/// <summary>
/// 杈撳叆鐧诲綍瀵嗙爜楠岃瘉 鎻愮ず鎸夐挳
/// </summary>
- void AddInputPasswordTipButton()
+ void AddInputPasswordTipButton(string optionType)
{
Button btnLoginAccountVerify = new Button()
{
@@ -422,15 +435,18 @@
btnLoginAccountVerify.MouseUpEventHandler = (sender, e) =>
{
//杈撳叆鐧诲綍瀵嗙爜楠岃瘉
- Action<string> action = (pw) => {
+ Action<string> action = (pw) =>
+ {
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();
+ //UserInfo.Current.appUnlockPasswrod = "";
+ //UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
+ //UserInfo.Current.SaveUserInfo();
+ //this.RemoveFromParent();
+ //backAction();
+
+ PasswordInputPassed(optionType);
}
else
{
@@ -438,8 +454,7 @@
{
Utlis.ShowTip(Language.StringByID(StringId.AuthenticationFailedPasswordError));
});
- ////鐧诲綍澶辫触
- //IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+
}
};
--
Gitblit v1.8.0