From 7d9e5d946d08f0b53ff25d1c25dcf83efb68b734 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 15 十二月 2020 09:08:59 +0800
Subject: [PATCH] 20201215-1
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
index 005603d..01125ba 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs
@@ -106,7 +106,7 @@
if (UserInfo.Current.appUnlockPasswrod != "")
{
- new PublicAssmebly().TipMsg(StringId.Tip, StringId.TipTurnOffUnlockingSetting, action1);
+ new PublicAssmebly().TipOptionMsg(StringId.Tip, StringId.TipTurnOffUnlockingSetting, action1);
}
else
{
@@ -120,6 +120,11 @@
EventHandler<MouseEventArgs> eventHandler2 = (sender, e) =>
{
bool result = !btnStartupBg.IsSelected;
+ if (!result)
+ {
+ //濡傛灉鍚姩瑙ｉ攣 涓嶈兘鍙栨秷鍚姩瑙ｉ攣
+ if (!CheckIfCanDeselect("1")) return;
+ }
btnStartupBg.IsSelected = btnStartupSelectionIcon.IsSelected = btnStartupSelectionTip.IsSelected = result;
btnTipMsg.Text = Language.StringByID(StringId.AtStartupTipMsg);
@@ -158,6 +163,12 @@
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);
@@ -197,6 +208,12 @@
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);
@@ -294,7 +311,7 @@
{
var page = new AppUnlockGesturePage(UserInfo.Current.appUnlockPasswrod, refreshAction);
MainPage.BasePageView.AddChidren(page);
- page.LoadPage("3");
+ page.LoadPage("2");//2020-12-11
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
@@ -363,5 +380,21 @@
};
}
}
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁鑳藉鍙栨秷锛屽鏋滃彧鍓╂渶鍚庝竴绉嶈В閿佹柟妗堢姝㈠彇娑�
+ /// </summary>
+ /// <param name="appUnlockPageType">1:鍚姩鏃� 2:甯冮槻鎾ら槻鏃� 3:杩滅▼寮�閿佹椂</param>
+ /// <returns></returns>
+ bool CheckIfCanDeselect(string appUnlockPageType)
+ {
+ if (UserInfo.Current.appUnlockPage.Count == 1 && UserInfo.Current.appUnlockPage.Contains(appUnlockPageType))
+ {
+ return false;
+ }
+
+ return true;
+ }
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0