From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs | 27 ++++++++++++---------------
1 files changed, 12 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
index 12935c0..31f34f9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
@@ -36,7 +36,6 @@
btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = false;
btnTipMsg.TextID = StringId.UnprotectedTipMsg;
- btnTipMsg.Visible = true;
MainPage.LoginUser.appUnlockPage = new System.Collections.Generic.List<string>();
MainPage.LoginUser.appUnlockType = new System.Collections.Generic.List<string>();
@@ -118,14 +117,12 @@
btnUnprotectedSelectionIcon.MouseUpEventHandler = eventHandler1;
btnUnprotectedSelectionTip.MouseUpEventHandler = eventHandler1;
-
EventHandler<MouseEventArgs> eventHandler2 = (sender, e) =>
{
bool result = !btnStartupBg.IsSelected;
btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = result;
btnTipMsg.Text = Language.StringByID(StringId.AtStartupTipMsg);
- btnTipMsg.Visible = true;
if (result)
{
btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
@@ -136,7 +133,6 @@
MainPage.LoginUser.SaveUserInfo();
}
unlockOptionView.Visible = true;
-
}
else
{
@@ -159,14 +155,12 @@
btnStartupSelectionIcon.MouseUpEventHandler = eventHandler2;
btnStartupSelectionTip.MouseUpEventHandler = eventHandler2;
-
EventHandler<MouseEventArgs> eventHandler3 = (sender, e) =>
{
bool result = !btnSecurityBg.IsSelected;
btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = result;
btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
- btnTipMsg.Visible = true;
if (result)
{
@@ -200,14 +194,12 @@
btnSecuritySelectionIcon.MouseUpEventHandler = eventHandler3;
btnSecuritySelectionTip.MouseUpEventHandler = eventHandler3;
-
EventHandler<MouseEventArgs> eventHandler4 = (sender, e) =>
{
bool result = !btnDoorlockBg.IsSelected;
btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = result;
btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
- btnTipMsg.Visible = true;
if (result)
{
btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
@@ -239,9 +231,6 @@
btnDoorlockBg.MouseUpEventHandler = eventHandler4;
btnDoorlockSelectionIcon.MouseUpEventHandler = eventHandler4;
btnDoorlockSelectionTip.MouseUpEventHandler = eventHandler4;
-
-
-
}
/// <summary>
@@ -258,14 +247,17 @@
if (MainPage.LoginUser.appUnlockPage.Contains("1"))
{
btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = true;
+ btnTipMsg.Text = Language.StringByID(StringId.AtStartupTipMsg);
}
if (MainPage.LoginUser.appUnlockPage.Contains("2"))
{
btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = true;
+ btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
}
if (MainPage.LoginUser.appUnlockPage.Contains("3"))
{
btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = true;
+ btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
}
}
}
@@ -275,8 +267,6 @@
/// </summary>
void LoadEvet_SkipEventList()
{
-
-
btnPasswordUnlockTitle.MouseUpEventHandler = (sender, e) =>
{
var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, refreshAction);
@@ -304,7 +294,7 @@
{
var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, refreshAction);
MainPage.BasePageView.AddChidren(page);
- page.LoadPage("2");
+ page.LoadPage("3");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
@@ -312,6 +302,11 @@
{
btnFingerprintUnlockSwtichIcon.MouseUpEventHandler = (sender, e1) =>
{
+ Action fingerAction = () => {
+ TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
+ };
+ new AppUnlockPage().LoadGesturePage("5",fingerAction);
+
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
@@ -335,6 +330,8 @@
MainPage.LoginUser.SaveUserInfo();
}
}
+ //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
+ MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
}
else// if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)
{
@@ -349,7 +346,7 @@
{
var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, refreshAction);
MainPage.BasePageView.AddChidren(page);
- page.LoadPage("6");
+ page.LoadPage("5");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
}
--
Gitblit v1.8.0