From dcf60777c9346ff058f06298d03173f0c53d1902 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 十二月 2020 20:42:15 +0800
Subject: [PATCH] 20201216-4
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs | 283 +++++++++++++++++++++++++++++--------------------------
1 files changed, 149 insertions(+), 134 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
index 496648d..0594119 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
@@ -32,8 +32,10 @@
{
btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true;
btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = false;
- btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = false;
- btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = false;
+ #region F3闃舵
+ //btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = false;
+ //btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = false;
+ #endregion
btnTipMsg.TextID = StringId.UnprotectedTipMsg;
@@ -131,94 +133,93 @@
btnStartupSelectionIcon.MouseUpEventHandler = eventHandler2;
btnStartupSelectionTip.MouseUpEventHandler = eventHandler2;
- EventHandler<MouseEventArgs> eventHandler3 = (sender, e) =>
- {
- bool result = !btnSecurityBg.IsSelected;
- if (!result)
- {
- //濡傛灉鍙墿甯冮槻/鎾ら槻涓�绉� 涓嶈兘鍙栨秷甯冮槻/鎾ら槻
- if (!CheckIfCanDeselect("2")) return;
- }
+ #region F3闃舵
+ //EventHandler<MouseEventArgs> eventHandler3 = (sender, e) =>
+ //{
+ // bool result = !btnSecurityBg.IsSelected;
+ // if (!result)
+ // {
+ // //濡傛灉鍙墿甯冮槻/鎾ら槻涓�绉� 涓嶈兘鍙栨秷甯冮槻/鎾ら槻
+ // if (!CheckIfCanDeselect("2")) return;
+ // }
+ // btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = result;
+ // btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
+ // if (result)
+ // {
+ // btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
+ // if (!UserInfo.Current.appUnlockPage.Contains("2"))
+ // {
+ // UserInfo.Current.appUnlockPage.Add("2");
+ // if (UserInfo.Current.appUnlockPasswrod != "")
+ // UserInfo.Current.SaveUserInfo();
+ // }
+ // unlockOptionView.Visible = true;
+ // }
+ // else
+ // {
+ // if (UserInfo.Current.appUnlockPage.Contains("2"))
+ // {
+ // UserInfo.Current.appUnlockPage.Remove("2");
+ // }
+ // if (UserInfo.Current.appUnlockPage.Count == 0)
+ // {
+ // btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = result;
+ // btnTipMsg.TextID = StringId.UnprotectedTipMsg;
+ // UserInfo.Current.appUnlockPasswrod = "";
+ // unlockOptionView.Visible = false;
+ // refreshAction();
+ // }
+ // UserInfo.Current.SaveUserInfo();
+ // }
+ //};
+ //btnSecurityBg.MouseUpEventHandler = eventHandler3;
+ //btnSecuritySelectionIcon.MouseUpEventHandler = eventHandler3;
+ //btnSecuritySelectionTip.MouseUpEventHandler = eventHandler3;
- btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = result;
+ //EventHandler<MouseEventArgs> eventHandler4 = (sender, e) =>
+ //{
+ // bool result = !btnDoorlockBg.IsSelected;
+ // if (!result)
+ // {
+ // //濡傛灉鍙墿杩滅▼寮�閿佷笉鑳藉彇娑堣繙绋嬪紑閿�
+ // if (!CheckIfCanDeselect("3")) return;
+ // }
- btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
+ // btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = result;
- if (result)
- {
- btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
- if (!UserInfo.Current.appUnlockPage.Contains("2"))
- {
- UserInfo.Current.appUnlockPage.Add("2");
- if (UserInfo.Current.appUnlockPasswrod != "")
- UserInfo.Current.SaveUserInfo();
- }
- unlockOptionView.Visible = true;
- }
- else
- {
- if (UserInfo.Current.appUnlockPage.Contains("2"))
- {
- UserInfo.Current.appUnlockPage.Remove("2");
- }
- if (UserInfo.Current.appUnlockPage.Count == 0)
- {
- btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = result;
- btnTipMsg.TextID = StringId.UnprotectedTipMsg;
- UserInfo.Current.appUnlockPasswrod = "";
- unlockOptionView.Visible = false;
- refreshAction();
- }
- UserInfo.Current.SaveUserInfo();
- }
- };
- btnSecurityBg.MouseUpEventHandler = eventHandler3;
- btnSecuritySelectionIcon.MouseUpEventHandler = eventHandler3;
- btnSecuritySelectionTip.MouseUpEventHandler = eventHandler3;
-
- EventHandler<MouseEventArgs> eventHandler4 = (sender, e) =>
- {
- bool result = !btnDoorlockBg.IsSelected;
- if (!result)
- {
- //濡傛灉鍙墿杩滅▼寮�閿佷笉鑳藉彇娑堣繙绋嬪紑閿�
- if (!CheckIfCanDeselect("3")) return;
- }
-
- btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = result;
-
- btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
- if (result)
- {
- btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
- if (!UserInfo.Current.appUnlockPage.Contains("3"))
- {
- UserInfo.Current.appUnlockPage.Add("3");
- if (UserInfo.Current.appUnlockPasswrod != "")
- UserInfo.Current.SaveUserInfo();
- }
- unlockOptionView.Visible = true;
- }
- else
- {
- if (UserInfo.Current.appUnlockPage.Contains("3"))
- {
- UserInfo.Current.appUnlockPage.Remove("3");
- }
- if (UserInfo.Current.appUnlockPage.Count == 0)
- {
- btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true;
- btnTipMsg.TextID = StringId.UnprotectedTipMsg;
- UserInfo.Current.appUnlockPasswrod = "";
- unlockOptionView.Visible = false;
- refreshAction();
- }
- UserInfo.Current.SaveUserInfo();
- }
- };
- btnDoorlockBg.MouseUpEventHandler = eventHandler4;
- btnDoorlockSelectionIcon.MouseUpEventHandler = eventHandler4;
- btnDoorlockSelectionTip.MouseUpEventHandler = eventHandler4;
+ // btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
+ // if (result)
+ // {
+ // btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
+ // if (!UserInfo.Current.appUnlockPage.Contains("3"))
+ // {
+ // UserInfo.Current.appUnlockPage.Add("3");
+ // if (UserInfo.Current.appUnlockPasswrod != "")
+ // UserInfo.Current.SaveUserInfo();
+ // }
+ // unlockOptionView.Visible = true;
+ // }
+ // else
+ // {
+ // if (UserInfo.Current.appUnlockPage.Contains("3"))
+ // {
+ // UserInfo.Current.appUnlockPage.Remove("3");
+ // }
+ // if (UserInfo.Current.appUnlockPage.Count == 0)
+ // {
+ // btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true;
+ // btnTipMsg.TextID = StringId.UnprotectedTipMsg;
+ // UserInfo.Current.appUnlockPasswrod = "";
+ // unlockOptionView.Visible = false;
+ // refreshAction();
+ // }
+ // UserInfo.Current.SaveUserInfo();
+ // }
+ //};
+ //btnDoorlockBg.MouseUpEventHandler = eventHandler4;
+ //btnDoorlockSelectionIcon.MouseUpEventHandler = eventHandler4;
+ //btnDoorlockSelectionTip.MouseUpEventHandler = eventHandler4;
+ #endregion
}
/// <summary>
@@ -237,16 +238,18 @@
btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = true;
btnTipMsg.Text = Language.StringByID(StringId.AtStartupTipMsg);
}
- if (UserInfo.Current.appUnlockPage.Contains("2"))
- {
- btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = true;
- btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
- }
- if (UserInfo.Current.appUnlockPage.Contains("3"))
- {
- btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = true;
- btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
- }
+ #region F3闃舵
+ //if (UserInfo.Current.appUnlockPage.Contains("2"))
+ //{
+ // btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = true;
+ // btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
+ //}
+ //if (UserInfo.Current.appUnlockPage.Contains("3"))
+ //{
+ // btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = true;
+ // btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
+ //}
+ #endregion
}
}
@@ -327,11 +330,33 @@
//4:闈㈠ID
string faceIDUnlockType = "4";
+ //鎴愬姛浜嬩欢
+ Action successAction = () =>
+ {
+ var result = btnFaceIdUnlockSwtichIcon.IsSelected = !btnFaceIdUnlockSwtichIcon.IsSelected;
+ if (result)
+ {
+ if (!UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
+ {
+ UserInfo.Current.appUnlockType.Add(faceIDUnlockType);
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ else
+ {
+ if (UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
+ {
+ UserInfo.Current.appUnlockType.Remove(faceIDUnlockType);
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ };
+
Action fingerAction = () =>
{
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
};
- new AppUnlockPage().LoadFaceIDGesturePage(optionType, fingerAction);
+ new AppUnlockPage().LoadFaceIDGesturePage(optionType, fingerAction, successAction);
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.VerifyFaceID));
@@ -339,24 +364,7 @@
{
if (e == TouchIDUtils.TouchIDState.Success)
{
- var result = btnFaceIdUnlockSwtichIcon.IsSelected = !btnFaceIdUnlockSwtichIcon.IsSelected;
- if (result)
- {
- if (!UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
- {
- UserInfo.Current.appUnlockType.Add(faceIDUnlockType);
- UserInfo.Current.SaveUserInfo();
- }
- }
- else
- {
- if (UserInfo.Current.appUnlockType.Contains(faceIDUnlockType))
- {
- UserInfo.Current.appUnlockType.Remove(faceIDUnlockType);
- UserInfo.Current.SaveUserInfo();
- }
- }
- //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
+ successAction?.Invoke();
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
}
else// if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)
@@ -410,12 +418,34 @@
{
//5:鎸囩汗ID寮�鍏�
string optionType = "5";
+ //鎴愬姛浜嬩欢
+ Action successAction = () =>
+ {
+ var result = btnFingerprintUnlockSwtichIcon.IsSelected = !btnFingerprintUnlockSwtichIcon.IsSelected;
+ if (result)
+ {
+ if (!UserInfo.Current.appUnlockType.Contains("3"))
+ {
+ UserInfo.Current.appUnlockType.Add("3");
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ else
+ {
+ if (UserInfo.Current.appUnlockType.Contains("3"))
+ {
+ UserInfo.Current.appUnlockType.Remove("3");
+ UserInfo.Current.SaveUserInfo();
+ }
+ }
+ };
+
Action fingerAction = () =>
{
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
};
- new AppUnlockPage().LoadGesturePage(optionType, fingerAction);
+ new AppUnlockPage().LoadGesturePage(optionType, fingerAction, successAction);
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
@@ -423,23 +453,8 @@
{
if (e == TouchIDUtils.TouchIDState.Success)
{
- var result = btnFingerprintUnlockSwtichIcon.IsSelected = !btnFingerprintUnlockSwtichIcon.IsSelected;
- if (result)
- {
- if (!UserInfo.Current.appUnlockType.Contains("3"))
- {
- UserInfo.Current.appUnlockType.Add("3");
- UserInfo.Current.SaveUserInfo();
- }
- }
- else
- {
- if (UserInfo.Current.appUnlockType.Contains("3"))
- {
- UserInfo.Current.appUnlockType.Remove("3");
- UserInfo.Current.SaveUserInfo();
- }
- }
+ successAction?.Invoke();
+
MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
}
else// if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)
--
Gitblit v1.8.0