From c9a987ced5454cfc6b9363eadcad038191706f5b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十二月 2020 16:37:09 +0800
Subject: [PATCH] 2020-12-12 1.解锁设置优化
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs | 430 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 296 insertions(+), 134 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
index 495f3fd..8a8391b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -5,10 +5,17 @@
namespace HDL_ON.UI
{
+ /// <summary>
+ /// 瀵嗙爜瑙ｉ攣
+ /// </summary>
public partial class AppUnlockPasswordPage : FrameLayout
{
FrameLayout bodyView;
EditText etPassword;
+ /// <summary>
+ ///
+ /// </summary>
+ Button btnTipError;
string passwrod = "";
string oldPasswrod = "";
@@ -121,7 +128,7 @@
bodyView.AddChidren(btnTipIcon4);
- Button btnTipError = new Button()
+ btnTipError = new Button()
{
Y = Application.GetRealWidth(258),
Height = Application.GetRealWidth(40),
@@ -191,144 +198,156 @@
}
else
{
- if (optionType == "2")
- {
- //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
- this.RemoveFromParent();
- var page = new AppUnlockPasswordPage("", backAction);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage("1");
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- return;
- }
-
- if (optionType == "7")
- {
- if (passwrod == oldPasswrod)
- {
- //MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- this.RemoveFromParent();
- backAction();
- return;
- }
- else
- {
- btnTipError.TextID = StringId.AuthenticationFailedPasswordError;
- etPassword.Text = "";
- btnTipError.Visible = true;
- }
- return;
- }
- if (optionType == "3"|| optionType == "4")
- {
- if (passwrod == oldPasswrod)
- {
- if(optionType == "4")
- {
- backAction();
- this.RemoveFromParent();
- return;
- }
- if (UserInfo.Current.appUnlockType.Contains("1"))
- {
- UserInfo.Current.appUnlockType =new System.Collections.Generic.List<string>();//.Remove("1");
- UserInfo.Current.appUnlockPasswrod = "";
- UserInfo.Current.SaveUserInfo();
- this.RemoveFromParent();
- backAction();
- }
- }
- else
- {
- btnTipError.TextID = StringId.AuthenticationFailedPasswordError;
- etPassword.Text = "";
- btnTipError.Visible = true;
- }
- return;
- }
- //鍏抽棴/寮�鍚寚绾规垨鑰呴潰瀹�
- if (optionType == "5" || optionType == "6")//|| optionType == "8" || optionType == "9")
- {
- if (passwrod == oldPasswrod)
- {
- if (optionType == "5")
- {
- if (UserInfo.Current.appUnlockType.Contains("3"))
- UserInfo.Current.appUnlockType.Remove("3");
- else
- UserInfo.Current.appUnlockType.Add("3");
-
- UserInfo.Current.SaveUserInfo();
- this.RemoveFromParent();
- }
- if (optionType == "6")
- {
- if (UserInfo.Current.appUnlockType.Contains("4"))
- UserInfo.Current.appUnlockType.Remove("4");
- else
- UserInfo.Current.appUnlockType.Add("4");
-
- UserInfo.Current.SaveUserInfo();
- this.RemoveFromParent();
- }
- backAction();
- }
- else
- {
- btnTipError.TextID = StringId.AuthenticationFailedPasswordError;
- etPassword.Text = "";
- btnTipError.Visible = true;
- }
- return;
- }
+ //2020-12-11 瀵嗙爜鏍￠獙
if (passwrod == oldPasswrod)
{
- this.RemoveFromParent();
- var page = new OperationResultDisPalyPage();
- page.Show();
-
- page.LoadPage(true, Language.StringByID(StringId.SetSuccessfully), Language.StringByID(StringId.SetSuccessfully), "");
- string tipMsg = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? Language.StringByID(StringId.TurnOnFingerprintUnlocking) :
- Language.StringByID(StringId.TurnOnFaceIdUnlocking);
-
- if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
- {
- var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
- Action<bool> action = (result) =>
- {
- if (result)
- {
- if (!UserInfo.Current.appUnlockType.Contains(unlockType))
- {
- UserInfo.Current.appUnlockType.Add(unlockType);
- }
- }
- else
- {
- if (UserInfo.Current.appUnlockType.Contains(unlockType))
- {
- UserInfo.Current.appUnlockType.Remove(unlockType);
- }
- }
- backAction();
- UserInfo.Current.SaveUserInfo();
- };
- page.AdditionalOperations(tipMsg, action);
- }
- if (!UserInfo.Current.appUnlockType.Contains("1"))
- {
- UserInfo.Current.appUnlockType.Add("1");
- }
- UserInfo.Current.appUnlockPasswrod = passwrod;
- UserInfo.Current.SaveUserInfo();
- backAction();
+ //瀵嗙爜楠岃瘉閫氳繃
+ PasswordInputPassed(optionType);
}
else
{
- btnTipError.TextID = StringId.IncorrectRepeatPassword;
- etPassword.Text = "";
- btnTipError.Visible = true;
+ //瀵嗙爜楠岃瘉澶辫触
+ PasswordInputError(optionType);
}
+
+ //if (optionType == "2")
+ //{
+ // //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+ // this.RemoveFromParent();
+ // var page = new AppUnlockPasswordPage("", backAction);
+ // MainPage.BasePageView.AddChidren(page);
+ // page.LoadPage("1");
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ // return;
+ //}
+
+ //if (optionType == "7")
+ //{
+ // if (passwrod == oldPasswrod)
+ // {
+ // //MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
+ // this.RemoveFromParent();
+ // backAction();
+ // return;
+ // }
+ // else
+ // {
+ // btnTipError.TextID = StringId.AuthenticationFailedPasswordError;
+ // etPassword.Text = "";
+ // btnTipError.Visible = true;
+ // }
+ // return;
+ //}
+ //if (optionType == "3"|| optionType == "4")
+ //{
+ // if (passwrod == oldPasswrod)
+ // {
+ // if(optionType == "4")
+ // {
+ // backAction();
+ // this.RemoveFromParent();
+ // return;
+ // }
+ // if (UserInfo.Current.appUnlockType.Contains("1"))
+ // {
+ // UserInfo.Current.appUnlockType =new System.Collections.Generic.List<string>();//.Remove("1");
+ // UserInfo.Current.appUnlockPasswrod = "";
+ // UserInfo.Current.SaveUserInfo();
+ // this.RemoveFromParent();
+ // backAction();
+ // }
+ // }
+ // else
+ // {
+ // btnTipError.TextID = StringId.AuthenticationFailedPasswordError;
+ // etPassword.Text = "";
+ // btnTipError.Visible = true;
+ // }
+ // return;
+ //}
+ ////鍏抽棴/寮�鍚寚绾规垨鑰呴潰瀹�
+ //if (optionType == "5" || optionType == "6")//|| optionType == "8" || optionType == "9")
+ //{
+ // if (passwrod == oldPasswrod)
+ // {
+ // if (optionType == "5")
+ // {
+ // if (UserInfo.Current.appUnlockType.Contains("3"))
+ // UserInfo.Current.appUnlockType.Remove("3");
+ // else
+ // UserInfo.Current.appUnlockType.Add("3");
+
+ // UserInfo.Current.SaveUserInfo();
+ // this.RemoveFromParent();
+ // }
+ // if (optionType == "6")
+ // {
+ // if (UserInfo.Current.appUnlockType.Contains("4"))
+ // UserInfo.Current.appUnlockType.Remove("4");
+ // else
+ // UserInfo.Current.appUnlockType.Add("4");
+
+ // UserInfo.Current.SaveUserInfo();
+ // this.RemoveFromParent();
+ // }
+ // backAction();
+ // }
+ // else
+ // {
+ // btnTipError.TextID = StringId.AuthenticationFailedPasswordError;
+ // etPassword.Text = "";
+ // btnTipError.Visible = true;
+ // }
+ // return;
+ //}
+ //if (passwrod == oldPasswrod)
+ //{
+ // this.RemoveFromParent();
+ // var page = new OperationResultDisPalyPage();
+ // page.Show();
+
+ // page.LoadPage(true, Language.StringByID(StringId.SetSuccessfully), Language.StringByID(StringId.SetSuccessfully), "");
+ // string tipMsg = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? Language.StringByID(StringId.TurnOnFingerprintUnlocking) :
+ // Language.StringByID(StringId.TurnOnFaceIdUnlocking);
+
+ // if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
+ // {
+ // var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
+ // Action<bool> action = (result) =>
+ // {
+ // if (result)
+ // {
+ // if (!UserInfo.Current.appUnlockType.Contains(unlockType))
+ // {
+ // UserInfo.Current.appUnlockType.Add(unlockType);
+ // }
+ // }
+ // else
+ // {
+ // if (UserInfo.Current.appUnlockType.Contains(unlockType))
+ // {
+ // UserInfo.Current.appUnlockType.Remove(unlockType);
+ // }
+ // }
+ // backAction();
+ // UserInfo.Current.SaveUserInfo();
+ // };
+ // page.AdditionalOperations(tipMsg, action);
+ // }
+ // if (!UserInfo.Current.appUnlockType.Contains("1"))
+ // {
+ // UserInfo.Current.appUnlockType.Add("1");
+ // }
+ // UserInfo.Current.appUnlockPasswrod = passwrod;
+ // UserInfo.Current.SaveUserInfo();
+ // backAction();
+ //}
+ //else
+ //{
+ // btnTipError.TextID = StringId.IncorrectRepeatPassword;
+ // etPassword.Text = "";
+ // btnTipError.Visible = true;
+ //}
}
break;
}
@@ -363,7 +382,9 @@
{
if (optionType == "7")
{
- MainPage.GoLoginPage( UserInfo.Current);
+ //MainPage.GoLoginPage( UserInfo.Current);
+ //2020-12-12 閫�鍑虹櫥褰�
+ HDLCommon.Current.Logout();
}
else
{
@@ -390,5 +411,146 @@
}
}
+
+
+ /// <summary>
+ /// 瀵嗙爜杈撳叆閿欒鏄剧ず閿欒淇℃伅
+ /// </summary>
+ /// <param name="optionType">1:璁剧疆瀵嗙爜锛�2:楠岃瘉瀵嗙爜;3:鍏抽棴瀵嗙爜;4:鍏抽棴瑙ｉ攣璁剧疆;5:鎸囩汗ID寮�鍏筹紱6:闈㈠ID寮�鍏�;7:瑙ｉ攣楠岃瘉</param>
+ void PasswordInputError(string optionType)
+ {
+ int errorTextID = 0;
+ if (optionType == "1")
+ {
+ //涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷达紝璇烽噸鏂拌緭鍏�
+ errorTextID = StringId.IncorrectRepeatPassword;
+ }
+ else
+ {
+ //楠岃瘉澶辫触锛屽瘑鐮侀敊璇�.
+ errorTextID = StringId.AuthenticationFailedPasswordError;
+ }
+
+ btnTipError.TextID = errorTextID;
+ etPassword.Text = "";
+ btnTipError.Visible = true;
+ }
+
+
+
+ /// <summary>
+ /// 瀵嗙爜楠岃瘉閫氳繃鍚庣殑鎿嶄綔
+ /// </summary>
+ /// <param name="optionType">1:璁剧疆瀵嗙爜锛�2:楠岃瘉瀵嗙爜;3:鍏抽棴瀵嗙爜;4:鍏抽棴瑙ｉ攣璁剧疆;5:鎸囩汗ID寮�鍏筹紱6:闈㈠ID寮�鍏�;7:瑙ｉ攣楠岃瘉</param>
+ void PasswordInputPassed(string optionType)
+ {
+ if (optionType == "1")
+ {
+ //璁剧疆瀵嗙爜 楠岃瘉閫氳繃
+ this.RemoveFromParent();
+ var page = new OperationResultDisPalyPage();
+ page.Show();
+
+ page.LoadPage(true, Language.StringByID(StringId.SetSuccessfully), Language.StringByID(StringId.SetSuccessfully), "");
+ string tipMsg = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? Language.StringByID(StringId.TurnOnFingerprintUnlocking) :
+ Language.StringByID(StringId.TurnOnFaceIdUnlocking);
+
+ if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
+ {
+ var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
+ Action<bool> action = (result) =>
+ {
+ if (result)
+ {
+ if (!UserInfo.Current.appUnlockType.Contains(unlockType))
+ {
+ UserInfo.Current.appUnlockType.Add(unlockType);
+ }
+ }
+ else
+ {
+ if (UserInfo.Current.appUnlockType.Contains(unlockType))
+ {
+ UserInfo.Current.appUnlockType.Remove(unlockType);
+ }
+ }
+ backAction();
+ UserInfo.Current.SaveUserInfo();
+ };
+ page.AdditionalOperations(tipMsg, action);
+ }
+ if (!UserInfo.Current.appUnlockType.Contains("1"))
+ {
+ UserInfo.Current.appUnlockType.Add("1");
+ }
+ UserInfo.Current.appUnlockPasswrod = passwrod;
+ UserInfo.Current.SaveUserInfo();
+ backAction();
+ }
+ else if (optionType == "2")
+ {
+ //楠岃瘉瀵嗙爜閫氳繃
+ //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+ this.RemoveFromParent();
+ var page = new AppUnlockPasswordPage("", backAction);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage("1");
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ }
+ else if (optionType == "3" || optionType == "4")
+ {
+ //3:鍏抽棴瀵嗙爜;4:鍏抽棴瑙ｉ攣璁剧疆 閫氳繃
+ if (optionType == "4")
+ {
+ backAction();
+ this.RemoveFromParent();
+ return;
+ }
+ if (UserInfo.Current.appUnlockType.Contains("1"))
+ {
+ UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();//.Remove("1");
+ UserInfo.Current.appUnlockPasswrod = "";
+ UserInfo.Current.SaveUserInfo();
+ this.RemoveFromParent();
+ backAction();
+ }
+ }
+ else if (optionType == "5")
+ {
+ //5:鎸囩汗ID寮�鍏� 閫氳繃
+ if (UserInfo.Current.appUnlockType.Contains("3"))
+ {
+ UserInfo.Current.appUnlockType.Remove("3");
+ }
+ else
+ {
+ UserInfo.Current.appUnlockType.Add("3");
+ }
+ UserInfo.Current.SaveUserInfo();
+ this.RemoveFromParent();
+ backAction();
+ }
+ else if (optionType == "6")
+ {
+ //6:闈㈠ID寮�鍏� 閫氳繃
+ if (UserInfo.Current.appUnlockType.Contains("4"))
+ {
+ UserInfo.Current.appUnlockType.Remove("4");
+ }
+ else
+ {
+ UserInfo.Current.appUnlockType.Add("4");
+ }
+ UserInfo.Current.SaveUserInfo();
+ this.RemoveFromParent();
+ backAction();
+ }
+ else if (optionType == "7")
+ {
+ //7:瑙ｉ攣楠岃瘉 閫氳繃
+ this.RemoveFromParent();
+ backAction();
+ }
+ }
}
}
--
Gitblit v1.8.0