From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs | 148 ++++++++++++++++++++++++++----------------------
1 files changed, 80 insertions(+), 68 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
index a27a316..6eb3d6b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
@@ -46,19 +46,19 @@
/// </summary>
Button btnStartupBg;
-
- /// <summary>
- /// 璁剧疆瀹夐槻閫夐」鎻愮ず
- /// </summary>
- Button btnSecuritySelectionTip;
- /// <summary>
- /// 璁剧疆瀹夐槻閫夐」閫変腑鍥炬爣
- /// </summary>
- Button btnSecuritySelectionIcon;
- /// <summary>
- /// 璁剧疆瀹夐槻閫夐」鑳屾櫙
- /// </summary>
- Button btnSecurityBg;
+ #region F3闃舵
+ ///// <summary>
+ ///// 璁剧疆瀹夐槻閫夐」鎻愮ず
+ ///// </summary>
+ //Button btnSecuritySelectionTip;
+ ///// <summary>
+ ///// 璁剧疆瀹夐槻閫夐」閫変腑鍥炬爣
+ ///// </summary>
+ //Button btnSecuritySelectionIcon;
+ ///// <summary>
+ ///// 璁剧疆瀹夐槻閫夐」鑳屾櫙
+ ///// </summary>
+ //Button btnSecurityBg;
/// <summary>
@@ -73,6 +73,7 @@
/// 璁剧疆闂ㄩ攣閫夐」鑳屾櫙
/// </summary>
Button btnDoorlockBg;
+ #endregion
/// <summary>
/// 瀵嗙爜浣跨敤閫夋嫨鐨勮缁嗗唴瀹规彁绀�
@@ -147,10 +148,10 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
//濡傛灉鐢ㄦ埛閰嶇疆浜嗛渶瑕佽В閿佺殑鐣岄潰浣嗘槸娌℃湁璁剧疆瀵嗙爜锛屽垯鍦ㄨ繑鍥炴椂娓呯┖闇�瑕佽В閿佺殑鐣岄潰
Action action = () => {
- if(MainPage.LoginUser.appUnlockPage.Count > 0&& MainPage.LoginUser.appUnlockPasswrod == "")
+ if(UserInfo.Current.appUnlockPage.Count > 0&& UserInfo.Current.appUnlockPasswrod == "")
{
- MainPage.LoginUser.appUnlockPage = new System.Collections.Generic.List<string>();
- MainPage.LoginUser.SaveUserInfo();
+ UserInfo.Current.appUnlockPage = new System.Collections.Generic.List<string>();
+ UserInfo.Current.SaveUserInfo();
}
};
new TopViewDiv(bodyView, Language.StringByID(StringId.InterpretationSettings)).LoadTopView(action);
@@ -185,8 +186,13 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
BackgroundColor = CSS_Color.MainBackgroundColor,
TextID = StringId.MultipleChoicesOfPagesYouNeedToProtect,
+ IsMoreLines = true,
};
topContentView.AddChidren(btnTip2);
+ if(Language.CurrentLanguage == "Engligh")
+ {
+ btnTip2.Height = Application.GetRealHeight(30);
+ }
optionView = new HorizontalScrolViewLayout()
@@ -212,9 +218,14 @@
BorderWidth = 1,
Radius = 1,
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
- Visible = false,
+ TextID = StringId.UnprotectedTipMsg,
};
topContentView.AddChidren(btnTipMsg);
+ if (Language.CurrentLanguage == "Engligh")
+ {
+ btnTip2.Height = Application.GetRealHeight(40);
+ topContentView.Height = Application.GetRealHeight(360);
+ }
LoadEventList();
@@ -312,48 +323,48 @@
startupDiv.AddChidren(btnStartupSelectionTip);
#endregion
-
+ #region F3闃舵
#region Security
- optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
+ //optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
- FrameLayout securityDiv = new FrameLayout()
- {
- Width = Application.GetRealWidth(94),
- };
- optionView.AddChidren(securityDiv);
+ //FrameLayout securityDiv = new FrameLayout()
+ //{
+ // Width = Application.GetRealWidth(94),
+ //};
+ //optionView.AddChidren(securityDiv);
- btnSecurityBg = new Button()
- {
- Height = Application.GetRealWidth(174),
- UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png",
- SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png"
- };
- securityDiv.AddChidren(btnSecurityBg);
+ //btnSecurityBg = new Button()
+ //{
+ // Height = Application.GetRealWidth(174),
+ // UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/3.png",
+ // SelectedImagePath = "PersonalCenter/AppUnlockSetting/3On.png"
+ //};
+ //securityDiv.AddChidren(btnSecurityBg);
- btnSecuritySelectionIcon = new Button()
- {
- X = Application.GetRealWidth(5),
- Y = Application.GetRealWidth(174),
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealWidth(30),
- UnSelectedImagePath = "Public/ChooseIcon.png",
- SelectedImagePath = "Public/ChooseOnIcon.png",
- };
- securityDiv.AddChidren(btnSecuritySelectionIcon);
+ //btnSecuritySelectionIcon = new Button()
+ //{
+ // X = Application.GetRealWidth(5),
+ // Y = Application.GetRealWidth(174),
+ // Width = Application.GetRealWidth(30),
+ // Height = Application.GetRealWidth(30),
+ // UnSelectedImagePath = "Public/ChooseIcon.png",
+ // SelectedImagePath = "Public/ChooseOnIcon.png",
+ //};
+ //securityDiv.AddChidren(btnSecuritySelectionIcon);
- btnSecuritySelectionTip = new Button()
- {
- X = Application.GetRealWidth(30),
- Y = Application.GetRealWidth(174),
- Width = Application.GetRealWidth(74),
- Height = Application.GetRealWidth(30),
- TextID = StringId.DefenseAndUndefense,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- SelectedTextColor = CSS_Color.MainColor,
- TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
- };
- securityDiv.AddChidren(btnSecuritySelectionTip);
+ //btnSecuritySelectionTip = new Button()
+ //{
+ // X = Application.GetRealWidth(30),
+ // Y = Application.GetRealWidth(174),
+ // Width = Application.GetRealWidth(74),
+ // Height = Application.GetRealWidth(30),
+ // TextID = StringId.DefenseAndUndefense,
+ // TextAlignment = TextAlignment.CenterLeft,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // SelectedTextColor = CSS_Color.MainColor,
+ // TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel
+ //};
+ //securityDiv.AddChidren(btnSecuritySelectionTip);
#endregion
@@ -399,6 +410,7 @@
};
doorlockDiv.AddChidren(btnDoorlockSelectionTip);
#endregion
+ #endregion
optionView.AddChidren(new Button() { Width = Application.GetRealWidth(16) });
}
@@ -418,7 +430,7 @@
Height = Application.GetRealHeight(260),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
- Visible = MainPage.LoginUser.appUnlockPage.Count > 0
+ Visible = UserInfo.Current.appUnlockPage.Count > 0
};
bodyView.AddChidren(unlockOptionView);
@@ -470,7 +482,7 @@
{
Height = Application.GetRealHeight(50),
};
- if ( !MainPage.LoginUser.appUnlockType.Contains("2"))
+ if ( !UserInfo.Current.appUnlockType.Contains("2"))
{
unlockOptionView.AddChidren(passwordUnlockDiv);
}
@@ -504,7 +516,7 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = MainPage.LoginUser.appUnlockType.Contains("1")
+ IsSelected = UserInfo.Current.appUnlockType.Contains("1")
};
passwordUnlockDiv.AddChidren(btnPasswordUnlockkSwtichIcon);
@@ -532,7 +544,7 @@
{
Height = Application.GetRealHeight(50),
};
- if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (UserInfo.Current.appUnlockPasswrod != "" && UserInfo.Current.appUnlockType.Contains("1"))
{
unlockOptionView.AddChidren(resetPasswordDiv);
}
@@ -557,7 +569,7 @@
};
resetPasswordDiv.AddChidren(btnResetPasswordTitle);
- if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (UserInfo.Current.appUnlockPasswrod != "" && UserInfo.Current.appUnlockType.Contains("1"))
{
unlockOptionView.AddChidren(new Button()
{
@@ -574,7 +586,7 @@
{
Height = Application.GetRealHeight(50),
};
- if (!MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (!UserInfo.Current.appUnlockType.Contains("1"))
{
unlockOptionView.AddChidren(gestureUnlockDiv);
}
@@ -606,7 +618,7 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = MainPage.LoginUser.appUnlockType.Contains("2")
+ IsSelected = UserInfo.Current.appUnlockType.Contains("2")
};
gestureUnlockDiv.AddChidren(btnGestureUnlockkSwtichIcon);
@@ -621,7 +633,7 @@
};
gestureUnlockDiv.AddChidren(btnGestureUnlockTitle);
- if (!MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (!UserInfo.Current.appUnlockType.Contains("1"))
{
unlockOptionView.AddChidren(new Button()
{
@@ -639,7 +651,7 @@
{
Height = Application.GetRealHeight(50),
};
- if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("2"))
+ if (UserInfo.Current.appUnlockPasswrod != "" && UserInfo.Current.appUnlockType.Contains("2"))
{
unlockOptionView.AddChidren(resetGestureDiv);
}
@@ -664,7 +676,7 @@
};
resetGestureDiv.AddChidren(btnResetGestureTitle);
- if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("2"))
+ if (UserInfo.Current.appUnlockPasswrod != "" && UserInfo.Current.appUnlockType.Contains("2"))
{
unlockOptionView.AddChidren(new Button()
{
@@ -696,7 +708,7 @@
{
Height = Application.GetRealHeight(51),
};
- if (sTouchID && MainPage.LoginUser.appUnlockPasswrod != ""&&!MainPage.LoginUser.appUnlockType.Contains("4"))
+ if (sTouchID && UserInfo.Current.appUnlockPasswrod != "" && !UserInfo.Current.appUnlockType.Contains("4"))
{
unlockOptionView.AddChidren(fingerprintUnlockDiv);
}
@@ -729,7 +741,7 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = MainPage.LoginUser.appUnlockType.Contains("3")
+ IsSelected = UserInfo.Current.appUnlockType.Contains("3")
};
fingerprintUnlockDiv.AddChidren(btnFingerprintUnlockSwtichIcon);
@@ -750,7 +762,7 @@
{
Height = Application.GetRealHeight(50),
};
- if (sFaceID && MainPage.LoginUser.appUnlockPasswrod != "" && !MainPage.LoginUser.appUnlockType.Contains("4"))
+ if (sFaceID && UserInfo.Current.appUnlockPasswrod != "" && !UserInfo.Current.appUnlockType.Contains("3"))
{
unlockOptionView.AddChidren(faceIdUnlockDiv);
}
@@ -782,7 +794,7 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = MainPage.LoginUser.appUnlockType.Contains("4")
+ IsSelected = UserInfo.Current.appUnlockType.Contains("4")
};
faceIdUnlockDiv.AddChidren(btnFaceIdUnlockSwtichIcon);
--
Gitblit v1.8.0