From e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 09 十二月 2020 18:50:14 +0800
Subject: [PATCH] 2020-12-09 1.信息中心，增加下划线和点击Alter提醒详情。
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs | 159 ++++++++++++++++++++++++++---------------------------
1 files changed, 78 insertions(+), 81 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..a32e3b5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
@@ -14,10 +14,10 @@
refreshAction = () =>
{
LoadView_UnlockView();
- //fingerprintUnlockDiv.Visible = sTouchID && (MainPage.LoginUser.appUnlockType.Contains("1") || MainPage.LoginUser.appUnlockType.Contains("2"));
- //faceIdUnlockDiv.Visible = sFaceID && (MainPage.LoginUser.appUnlockType.Contains("1") || MainPage.LoginUser.appUnlockType.Contains("2"));
- //btnFingerprintUnlockSwtichIcon.IsSelected = MainPage.LoginUser.appUnlockType.Contains("3");
- //btnFaceIdUnlockSwtichIcon.IsSelected = MainPage.LoginUser.appUnlockType.Contains("4");
+ //fingerprintUnlockDiv.Visible = sTouchID && (OnAppConfig.Instance.appUnlockType.Contains("1") || OnAppConfig.Instance.appUnlockType.Contains("2"));
+ //faceIdUnlockDiv.Visible = sFaceID && (OnAppConfig.Instance.appUnlockType.Contains("1") || OnAppConfig.Instance.appUnlockType.Contains("2"));
+ //btnFingerprintUnlockSwtichIcon.IsSelected = OnAppConfig.Instance.appUnlockType.Contains("3");
+ //btnFaceIdUnlockSwtichIcon.IsSelected = OnAppConfig.Instance.appUnlockType.Contains("4");
};
}
@@ -36,12 +36,11 @@
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>();
- MainPage.LoginUser.appUnlockPasswrod = "";
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockPage = new System.Collections.Generic.List<string>();
+ OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
+ OnAppConfig.Instance.appUnlockPasswrod = "";
+ OnAppConfig.Instance.SaveUserConfig();
unlockOptionView.Visible = false;
refreshAction();
};
@@ -49,7 +48,7 @@
if (!btnUnprotectedBg.IsSelected)
{
//1:楠岃瘉鎸囩汗
- if (MainPage.LoginUser.appUnlockType.Contains("3"))
+ if (OnAppConfig.Instance.appUnlockType.Contains("3"))
{
TouchIDUtils.Instance.showTouchIDWithDescribe(null, Language.StringByID(StringId.PleaseVerifyTheFingerprint));
TouchIDUtils.Instance.OnHDLTouchIDStateBackEvent = (sender1, e) =>
@@ -66,16 +65,16 @@
else if (e == TouchIDUtils.TouchIDState.InputPassword || e == TouchIDUtils.TouchIDState.TouchIDLockout)
{
MainPage.Log("KK:鐢ㄦ埛閫夋嫨鎵嬪姩杈撳叆瀵嗙爜");
- if (MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (OnAppConfig.Instance.appUnlockType.Contains("1"))
{
- var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
+ var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("4");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
- else if (MainPage.LoginUser.appUnlockType.Contains("1"))
+ else if (OnAppConfig.Instance.appUnlockType.Contains("1"))
{
- var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
+ var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("4");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -83,21 +82,21 @@
}
};
}
- else if (MainPage.LoginUser.appUnlockType.Contains("4"))
+ else if (OnAppConfig.Instance.appUnlockType.Contains("4"))
{
//Face ID楠岃瘉
//
}
- else if (MainPage.LoginUser.appUnlockType.Contains("1"))
+ else if (OnAppConfig.Instance.appUnlockType.Contains("1"))
{
- var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
+ var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("4");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
- else if (MainPage.LoginUser.appUnlockType.Contains("2"))
+ else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
{
- var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
+ var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("4");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -105,7 +104,7 @@
}
};
- if (MainPage.LoginUser.appUnlockPasswrod != "")
+ if (OnAppConfig.Instance.appUnlockPasswrod != "")
{
new PublicAssmebly().TipMsg(StringId.Tip, StringId.TipTurnOffUnlockingSetting, action1);
}
@@ -118,47 +117,43 @@
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;
- if (!MainPage.LoginUser.appUnlockPage.Contains("1"))
+ if (!OnAppConfig.Instance.appUnlockPage.Contains("1"))
{
- MainPage.LoginUser.appUnlockPage.Add("1");
- if (MainPage.LoginUser.appUnlockPasswrod != "")
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockPage.Add("1");
+ if (OnAppConfig.Instance.appUnlockPasswrod != "")
+ OnAppConfig.Instance.SaveUserConfig();
}
unlockOptionView.Visible = true;
-
}
else
{
- if (MainPage.LoginUser.appUnlockPage.Contains("1"))
+ if (OnAppConfig.Instance.appUnlockPage.Contains("1"))
{
- MainPage.LoginUser.appUnlockPage.Remove("1");
+ OnAppConfig.Instance.appUnlockPage.Remove("1");
}
- if (MainPage.LoginUser.appUnlockPage.Count == 0)
+ if (OnAppConfig.Instance.appUnlockPage.Count == 0)
{
btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true;
btnTipMsg.TextID = StringId.UnprotectedTipMsg;
- MainPage.LoginUser.appUnlockPasswrod = "";
+ OnAppConfig.Instance.appUnlockPasswrod = "";
unlockOptionView.Visible = false;
refreshAction();
}
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.SaveUserConfig();
}
};
btnStartupBg.MouseUpEventHandler = eventHandler2;
btnStartupSelectionIcon.MouseUpEventHandler = eventHandler2;
btnStartupSelectionTip.MouseUpEventHandler = eventHandler2;
-
EventHandler<MouseEventArgs> eventHandler3 = (sender, e) =>
{
@@ -166,40 +161,38 @@
btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = result;
btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
- btnTipMsg.Visible = true;
if (result)
{
btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = false;
- if (!MainPage.LoginUser.appUnlockPage.Contains("2"))
+ if (!OnAppConfig.Instance.appUnlockPage.Contains("2"))
{
- MainPage.LoginUser.appUnlockPage.Add("2");
- if (MainPage.LoginUser.appUnlockPasswrod != "")
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockPage.Add("2");
+ if (OnAppConfig.Instance.appUnlockPasswrod != "")
+ OnAppConfig.Instance.SaveUserConfig();
}
unlockOptionView.Visible = true;
}
else
{
- if (MainPage.LoginUser.appUnlockPage.Contains("2"))
+ if (OnAppConfig.Instance.appUnlockPage.Contains("2"))
{
- MainPage.LoginUser.appUnlockPage.Remove("2");
+ OnAppConfig.Instance.appUnlockPage.Remove("2");
}
- if (MainPage.LoginUser.appUnlockPage.Count == 0)
+ if (OnAppConfig.Instance.appUnlockPage.Count == 0)
{
btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = result;
btnTipMsg.TextID = StringId.UnprotectedTipMsg;
- MainPage.LoginUser.appUnlockPasswrod = "";
+ OnAppConfig.Instance.appUnlockPasswrod = "";
unlockOptionView.Visible = false;
refreshAction();
}
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.SaveUserConfig();
}
};
btnSecurityBg.MouseUpEventHandler = eventHandler3;
btnSecuritySelectionIcon.MouseUpEventHandler = eventHandler3;
btnSecuritySelectionTip.MouseUpEventHandler = eventHandler3;
-
EventHandler<MouseEventArgs> eventHandler4 = (sender, e) =>
{
@@ -207,41 +200,37 @@
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;
- if (!MainPage.LoginUser.appUnlockPage.Contains("3"))
+ if (!OnAppConfig.Instance.appUnlockPage.Contains("3"))
{
- MainPage.LoginUser.appUnlockPage.Add("3");
- if (MainPage.LoginUser.appUnlockPasswrod != "")
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockPage.Add("3");
+ if (OnAppConfig.Instance.appUnlockPasswrod != "")
+ OnAppConfig.Instance.SaveUserConfig();
}
unlockOptionView.Visible = true;
}
else
{
- if (MainPage.LoginUser.appUnlockPage.Contains("3"))
+ if (OnAppConfig.Instance.appUnlockPage.Contains("3"))
{
- MainPage.LoginUser.appUnlockPage.Remove("3");
+ OnAppConfig.Instance.appUnlockPage.Remove("3");
}
- if (MainPage.LoginUser.appUnlockPage.Count == 0)
+ if (OnAppConfig.Instance.appUnlockPage.Count == 0)
{
btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true;
btnTipMsg.TextID = StringId.UnprotectedTipMsg;
- MainPage.LoginUser.appUnlockPasswrod = "";
+ OnAppConfig.Instance.appUnlockPasswrod = "";
unlockOptionView.Visible = false;
refreshAction();
}
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.SaveUserConfig();
}
};
btnDoorlockBg.MouseUpEventHandler = eventHandler4;
btnDoorlockSelectionIcon.MouseUpEventHandler = eventHandler4;
btnDoorlockSelectionTip.MouseUpEventHandler = eventHandler4;
-
-
-
}
/// <summary>
@@ -249,23 +238,26 @@
/// </summary>
void LoadEvent_InitOptionState()
{
- if (MainPage.LoginUser.appUnlockPage.Count == 0)
+ if (OnAppConfig.Instance.appUnlockPage.Count == 0)
{
btnUnprotectedBg.IsSelected = btnUnprotectedSelectionIcon.IsSelected = btnUnprotectedSelectionTip.IsSelected = true;
}
else
{
- if (MainPage.LoginUser.appUnlockPage.Contains("1"))
+ if (OnAppConfig.Instance.appUnlockPage.Contains("1"))
{
btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = true;
+ btnTipMsg.Text = Language.StringByID(StringId.AtStartupTipMsg);
}
- if (MainPage.LoginUser.appUnlockPage.Contains("2"))
+ if (OnAppConfig.Instance.appUnlockPage.Contains("2"))
{
btnSecurityBg.IsSelected = btnSecuritySelectionIcon.IsSelected = btnSecuritySelectionTip.IsSelected = true;
+ btnTipMsg.Text = Language.StringByID(StringId.DefenseAndUndefenseTipMsg);
}
- if (MainPage.LoginUser.appUnlockPage.Contains("3"))
+ if (OnAppConfig.Instance.appUnlockPage.Contains("3"))
{
btnDoorlockBg.IsSelected = btnDoorlockSelectionIcon.IsSelected = btnDoorlockSelectionTip.IsSelected = true;
+ btnTipMsg.Text = Language.StringByID(StringId.RemoteUnlockingTipMsg);
}
}
}
@@ -275,19 +267,17 @@
/// </summary>
void LoadEvet_SkipEventList()
{
-
-
btnPasswordUnlockTitle.MouseUpEventHandler = (sender, e) =>
{
- var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, refreshAction);
+ var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, refreshAction);
MainPage.BasePageView.AddChidren(page);
- page.LoadPage(MainPage.LoginUser.appUnlockType.Contains("1") ? "3" : "1");
+ page.LoadPage(OnAppConfig.Instance.appUnlockType.Contains("1") ? "3" : "1");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
btnResetPasswordTitle.MouseUpEventHandler = (sender, e) =>
{
- var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, refreshAction);
+ var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, refreshAction);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("2");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -295,16 +285,16 @@
btnGestureUnlockTitle.MouseUpEventHandler = (sender, e) =>
{
- var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, refreshAction);
+ var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, refreshAction);
MainPage.BasePageView.AddChidren(page);
- page.LoadPage(MainPage.LoginUser.appUnlockType.Contains("2") ? "3" : "1");
+ page.LoadPage(OnAppConfig.Instance.appUnlockType.Contains("2") ? "3" : "1");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
btnResetGestureTitle.MouseUpEventHandler = (sender, e) =>
{
- var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, refreshAction);
+ var page = new AppUnlockGesturePage(OnAppConfig.Instance.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) =>
@@ -321,35 +316,37 @@
var result = btnFingerprintUnlockSwtichIcon.IsSelected = !btnFingerprintUnlockSwtichIcon.IsSelected;
if (result)
{
- if (!MainPage.LoginUser.appUnlockType.Contains("3"))
+ if (!OnAppConfig.Instance.appUnlockType.Contains("3"))
{
- MainPage.LoginUser.appUnlockType.Add("3");
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockType.Add("3");
+ OnAppConfig.Instance.SaveUserConfig();
}
}
else
{
- if (MainPage.LoginUser.appUnlockType.Contains("3"))
+ if (OnAppConfig.Instance.appUnlockType.Contains("3"))
{
- MainPage.LoginUser.appUnlockType.Remove("3");
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockType.Remove("3");
+ OnAppConfig.Instance.SaveUserConfig();
}
}
+ //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)
{
- if (MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (OnAppConfig.Instance.appUnlockType.Contains("1"))
{
- var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, refreshAction);
+ var page = new AppUnlockPasswordPage(OnAppConfig.Instance.appUnlockPasswrod, refreshAction);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("5");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
- else if (MainPage.LoginUser.appUnlockType.Contains("2"))
+ else if (OnAppConfig.Instance.appUnlockType.Contains("2"))
{
- var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, refreshAction);
+ var page = new AppUnlockGesturePage(OnAppConfig.Instance.appUnlockPasswrod, refreshAction);
MainPage.BasePageView.AddChidren(page);
- page.LoadPage("6");
+ page.LoadPage("5");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
}
}
--
Gitblit v1.8.0