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/AppUnlockGesturePage.cs | 444 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 300 insertions(+), 144 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index af371d7..ccdee88 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -5,9 +5,19 @@
namespace HDL_ON.UI
{
+ /// <summary>
+ /// 鎵嬪娍瑙ｉ攣
+ /// </summary>
public class AppUnlockGesturePage : FrameLayout
{
+ /// <summary>
+ ///
+ /// </summary>
FrameLayout bodyView;
+ /// <summary>
+ /// 閿欒鎻愮ず鎸夐挳
+ /// </summary>
+ Button btnTipMsg;
string passwrod = "";
string oldPasswrod = "";
@@ -60,7 +70,7 @@
};
bodyView.AddChidren(btnTipTitle);
- Button btnTipMsg = new Button()
+ btnTipMsg = new Button()
{
Y = btnTipTitle.Bottom,
TextAlignment = TextAlignment.Center,
@@ -114,150 +124,161 @@
}
else
{
- if (optionType == "2")
- {
- //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
- this.RemoveFromParent();
- var page = new AppUnlockGesturePage("", backAction);
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage("1");
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- return;
- }
- if(optionType == "7")
- {
- if (passwrod == oldPasswrod)
- {
- this.RemoveFromParent();
- backAction();
- }
- else
- {
- btnTipMsg.TextID = StringId.AuthenticationFailedGestureError;
- btnTipMsg.IsSelected = true;
- btnTipMsg.Visible = true;
- }
- return;
- }
- if (optionType == "3" || optionType == "4")
- {
- if (passwrod == oldPasswrod)
- {
- if (optionType == "4")
- {
- backAction();
- this.RemoveFromParent();
- return;
- }
- if (UserInfo.Current.appUnlockType.Contains("2"))
- {
- UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
- UserInfo.Current.appUnlockPasswrod = "";
- UserInfo.Current.SaveUserInfo();
- this.RemoveFromParent();
- backAction();
- }
- }
- else
- {
- btnTipMsg.TextID = StringId.AuthenticationFailedGestureError;
- btnTipMsg.IsSelected = true;
- btnTipMsg.Visible = true;
- }
- return;
- }
- if (optionType == "5" || optionType == "6"|| optionType == "8" || optionType == "9")
- {
- if (passwrod == oldPasswrod)
- {
- if (optionType == "5" )//&& UserInfo.Current.appUnlockType.Contains("3"))
- {
- 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();
- }
- if (optionType == "8" && !UserInfo.Current.appUnlockType.Contains("3"))
- {
- UserInfo.Current.appUnlockType.Add("3");
- UserInfo.Current.SaveUserInfo();
- this.RemoveFromParent();
- }
- if (!UserInfo.Current.appUnlockType.Contains("4") && optionType == "9")
- {
- UserInfo.Current.appUnlockType.Remove("4");
- UserInfo.Current.SaveUserInfo();
- this.RemoveFromParent();
- }
- backAction();
- }
- else
- {
- btnTipMsg.TextID = StringId.AuthenticationFailedGestureError;
- btnTipMsg.IsSelected = true;
- btnTipMsg.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), "");
- //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)
- {
- Action<bool> action = (result) =>
- {
- var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
- 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);
- }
- }
- UserInfo.Current.SaveUserInfo();
- backAction();
- };
- page.AdditionalOperations(tipMsg, action);
- }
- if (!UserInfo.Current.appUnlockType.Contains("2"))
- {
- UserInfo.Current.appUnlockType.Add("2");
- }
- UserInfo.Current.appUnlockPasswrod = passwrod;
- UserInfo.Current.SaveUserInfo();
- backAction();
+ //瀵嗙爜楠岃瘉閫氳繃
+ PasswordInputPassed(optionType);
}
else
{
- btnTipMsg.Text = Language.StringByID(StringId.DrawingInconsistencyError);
- btnTipMsg.IsSelected = true;
+ //瀵嗙爜楠岃瘉澶辫触
+ PasswordInputError(optionType);
}
+ //if (optionType == "2")
+ //{
+ // //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+ // this.RemoveFromParent();
+ // var page = new AppUnlockGesturePage("", backAction);
+ // MainPage.BasePageView.AddChidren(page);
+ // page.LoadPage("1");
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ // return;
+ //}
+ //if(optionType == "7")
+ //{
+ // if (passwrod == oldPasswrod)
+ // {
+ // this.RemoveFromParent();
+ // backAction();
+ // }
+ // else
+ // {
+ // btnTipMsg.TextID = StringId.AuthenticationFailedGestureError;
+ // btnTipMsg.IsSelected = true;
+ // btnTipMsg.Visible = true;
+ // }
+ // return;
+ //}
+ //if (optionType == "3" || optionType == "4")
+ //{
+ // if (passwrod == oldPasswrod)
+ // {
+ // if (optionType == "4")
+ // {
+ // backAction();
+ // this.RemoveFromParent();
+ // return;
+ // }
+ // if (UserInfo.Current.appUnlockType.Contains("2"))
+ // {
+ // UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
+ // UserInfo.Current.appUnlockPasswrod = "";
+ // UserInfo.Current.SaveUserInfo();
+ // this.RemoveFromParent();
+ // backAction();
+ // }
+ // }
+ // else
+ // {
+ // btnTipMsg.TextID = StringId.AuthenticationFailedGestureError;
+ // btnTipMsg.IsSelected = true;
+ // btnTipMsg.Visible = true;
+ // }
+ // return;
+ //}
+ //if (optionType == "5" || optionType == "6"|| optionType == "8" || optionType == "9")
+ //{
+ // if (passwrod == oldPasswrod)
+ // {
+ // if (optionType == "5" )//&& UserInfo.Current.appUnlockType.Contains("3"))
+ // {
+ // 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();
+ // }
+ // if (optionType == "8" && !UserInfo.Current.appUnlockType.Contains("3"))
+ // {
+ // UserInfo.Current.appUnlockType.Add("3");
+ // UserInfo.Current.SaveUserInfo();
+ // this.RemoveFromParent();
+ // }
+ // if (!UserInfo.Current.appUnlockType.Contains("4") && optionType == "9")
+ // {
+ // UserInfo.Current.appUnlockType.Remove("4");
+ // UserInfo.Current.SaveUserInfo();
+ // this.RemoveFromParent();
+ // }
+ // backAction();
+ // }
+ // else
+ // {
+ // btnTipMsg.TextID = StringId.AuthenticationFailedGestureError;
+ // btnTipMsg.IsSelected = true;
+ // btnTipMsg.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), "");
+ // //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)
+ // {
+ // Action<bool> action = (result) =>
+ // {
+ // var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
+ // 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);
+ // }
+ // }
+ // UserInfo.Current.SaveUserInfo();
+ // backAction();
+ // };
+ // page.AdditionalOperations(tipMsg, action);
+ // }
+ // if (!UserInfo.Current.appUnlockType.Contains("2"))
+ // {
+ // UserInfo.Current.appUnlockType.Add("2");
+ // }
+ // UserInfo.Current.appUnlockPasswrod = passwrod;
+ // UserInfo.Current.SaveUserInfo();
+ // backAction();
+ //}
+ //else
+ //{
+ // btnTipMsg.Text = Language.StringByID(StringId.DrawingInconsistencyError);
+ // btnTipMsg.IsSelected = true;
+ //}
}
};
@@ -267,7 +288,7 @@
Button btnLoginAccountVerify = new Button()
{
Y = Application.GetRealHeight(517),
- Height =Application.GetRealHeight(60),
+ Height = Application.GetRealHeight(60),
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.TextFontSize,
TextColor = CSS_Color.MainColor,
@@ -279,12 +300,13 @@
{
if (optionType == "7")
{
- MainPage.GoLoginPage( UserInfo.Current);
+ MainPage.GoLoginPage(UserInfo.Current);
}
else
{
- Action<string> action = (pw) => {
- var resultObj = new HttpServerRequest().LoginByPassword( UserInfo.Current.AccountString, pw);
+ Action<string> action = (pw) =>
+ {
+ var resultObj = new HttpServerRequest().LoginByPassword(UserInfo.Current.AccountString, pw);
if (resultObj.Code == StateCode.SUCCESS)
{
UserInfo.Current.appUnlockPasswrod = "";
@@ -300,10 +322,144 @@
}
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action,StringId.PlsEntryPassword,0,new System.Collections.Generic.List<string>(),true);
+ new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
}
};
}
}
+
+ /// <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")
+ {
+ //2娆＄粯鍒剁偣鍥炬涓嶄竴鑷达紝璇烽噸鏂扮粯鍒�
+ errorTextID = StringId.DrawingInconsistencyError;
+ }
+ else
+ {
+ //楠岃瘉澶辫触锛屽瘑鐮侀敊璇�.
+ errorTextID = StringId.AuthenticationFailedPasswordError;
+ }
+
+ btnTipMsg.TextID = errorTextID;
+ btnTipMsg.IsSelected = true;
+ btnTipMsg.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), "");
+ //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)
+ {
+ Action<bool> action = (result) =>
+ {
+ var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
+ 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);
+ }
+ }
+ UserInfo.Current.SaveUserInfo();
+ backAction();
+ };
+ page.AdditionalOperations(tipMsg, action);
+ }
+ if (!UserInfo.Current.appUnlockType.Contains("2"))
+ {
+ UserInfo.Current.appUnlockType.Add("2");
+ }
+ UserInfo.Current.appUnlockPasswrod = passwrod;
+ UserInfo.Current.SaveUserInfo();
+ backAction();
+ }
+ else if (optionType == "2")
+ {
+ //楠岃瘉瀵嗙爜閫氳繃
+ //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+ this.RemoveFromParent();
+ var page = new AppUnlockGesturePage("", 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("2"))
+ {
+ UserInfo.Current.appUnlockType = new System.Collections.Generic.List<string>();
+ 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();
+
+ }
+ else if (optionType == "7")
+ {
+ //7:瑙ｉ攣楠岃瘉 閫氳繃
+ this.RemoveFromParent();
+ backAction();
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.8.0