From 7f233a10afa6882b4d9531185af60e8843bc1af2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 11 五月 2020 09:21:36 +0800
Subject: [PATCH] 20200511
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs | 343 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 278 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
index 204bf93..a27a316 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs
@@ -8,6 +8,16 @@
{
#region 鎺т欢鍒楄〃
FrameLayout bodyView;
+
+ /// <summary>
+ /// 涓婇儴鍒嗘樉绀哄尯鍩�
+ /// </summary>
+ FrameLayout topContentView;
+ /// <summary>
+ /// 瑙ｉ攣椤甸潰閫夋嫨鍒楄〃view
+ /// </summary>
+ HorizontalScrolViewLayout optionView;
+
/// <summary>
/// 鏃犱繚鎶ら�夐」鎻愮ず
/// </summary>
@@ -70,13 +80,62 @@
Button btnTipMsg;
/// <summary>
+ /// 瑙ｉ攣鏂瑰紡鍖哄煙view
+ /// </summary>
+ VerticalScrolViewLayout unlockOptionView;
+
+ /// <summary>
/// 瀵嗙爜璁剧疆鏂囨湰
/// 浜嬩欢璺宠浆鎸夐挳
/// </summary>
Button btnPasswordUnlockTitle;
+ /// <summary>
+ /// 淇敼瀵嗙爜鏂囨湰
+ /// 浜嬩欢璺宠浆鎸夐挳
+ /// </summary>
+ Button btnResetPasswordTitle;
+
+ /// <summary>
+ /// 鎵嬪娍璁剧疆鏂囨湰
+ /// 浜嬩欢璺宠浆鎸夐挳
+ /// </summary>
+ Button btnGestureUnlockTitle;
+ /// <summary>
+ /// 淇敼鎵嬪娍瀵嗙爜
+ /// 浜嬩欢璺宠浆鎸夐挳
+ /// </summary>
+ Button btnResetGestureTitle;
+
+ /// <summary>
+ /// 鎸囩汗璁剧疆鏂囨湰
+ /// 浜嬩欢璺宠浆鎸夐挳
+ /// </summary>
+ Button btnFingerprintUnlockSwtichIcon;
+ /// <summary>
+ /// 闈㈠ID璁剧疆鏂囨湰
+ /// 浜嬩欢璺宠浆鎸夐挳
+ /// </summary>
+ Button btnFaceIdUnlockSwtichIcon;
+ /// <summary>
+ /// 鎸囩汗瑙ｉ攣鏂瑰紡Row
+ /// </summary>
+ FrameLayout fingerprintUnlockDiv;
+ /// <summary>
+ /// 闈㈠瑙ｉ攣鏂瑰紡Row
+ /// </summary>
+ FrameLayout faceIdUnlockDiv;
#endregion
+
+ /// <summary>
+ /// 鏄惁鏀寔鎸囩汗瑙ｉ攣
+ /// </summary>
+ bool sTouchID = false;
+ /// <summary>
+ /// 鏄惁鏀寔闈㈠瑙ｉ攣
+ /// </summary>
+ bool sFaceID = false;
public AppUnlockSettingsPage()
{
@@ -86,9 +145,17 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.InterpretationSettings)).LoadTopView();
+ //濡傛灉鐢ㄦ埛閰嶇疆浜嗛渶瑕佽В閿佺殑鐣岄潰浣嗘槸娌℃湁璁剧疆瀵嗙爜锛屽垯鍦ㄨ繑鍥炴椂娓呯┖闇�瑕佽В閿佺殑鐣岄潰
+ Action action = () => {
+ if(MainPage.LoginUser.appUnlockPage.Count > 0&& MainPage.LoginUser.appUnlockPasswrod == "")
+ {
+ MainPage.LoginUser.appUnlockPage = new System.Collections.Generic.List<string>();
+ MainPage.LoginUser.SaveUserInfo();
+ }
+ };
+ new TopViewDiv(bodyView, Language.StringByID(StringId.InterpretationSettings)).LoadTopView(action);
- FrameLayout topContentView = new FrameLayout()
+ topContentView = new FrameLayout()
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealWidth(332),
@@ -98,7 +165,7 @@
Button btnTip1 = new Button()
{
- Y = Application.GetRealHeight( 8),
+ Y = Application.GetRealHeight(8),
Height = Application.GetRealHeight(30),
TextAlignment = TextAlignment.Center,
IsBold = true,
@@ -122,15 +189,15 @@
topContentView.AddChidren(btnTip2);
- var optionView = new HorizontalScrolViewLayout()
+ optionView = new HorizontalScrolViewLayout()
{
- Y = Application.GetRealWidth(143-64),
+ Y = Application.GetRealWidth(143 - 64),
Height = Application.GetRealWidth(209),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
topContentView.AddChidren(optionView);
- LoadView_OptionView(optionView);
+ LoadView_OptionView();
btnTipMsg = new Button()
{
@@ -151,16 +218,13 @@
LoadEventList();
- if(MainPage.LoginUser.appUnlock.Count!=0)
- {
- LoadView_UnlockView();
- }
+ LoadView_UnlockView();
}
/// <summary>
/// 鍔犺浇閫夐」鍗�
/// </summary>
- void LoadView_OptionView(HorizontalScrolViewLayout optionView)
+ void LoadView_OptionView()
{
#region Unprotected
optionView.AddChidren(new Button() { Width = Application.GetRealWidth(24) });
@@ -344,19 +408,24 @@
/// </summary>
void LoadView_UnlockView()
{
- var unlockOptionView = new VerticalScrolViewLayout()
+ if(unlockOptionView!= null)
{
- Y = Application.GetRealWidth(340+64),
- Height = Application.GetRealWidth(260),
+ unlockOptionView.RemoveAll();
+ }
+ unlockOptionView = new VerticalScrolViewLayout()
+ {
+ Y = topContentView.Bottom + Application.GetRealHeight(8),
+ Height = Application.GetRealHeight(260),
BackgroundColor = CSS_Color.MainBackgroundColor,
ScrollEnabled = false,
+ Visible = MainPage.LoginUser.appUnlockPage.Count > 0
};
bodyView.AddChidren(unlockOptionView);
#region 鏍囬鏍�
var unlockTitleDiv = new FrameLayout()
{
- Height = Application.GetRealWidth(59),
+ Height = Application.GetRealHeight(59),
};
unlockOptionView.AddChidren(unlockTitleDiv);
@@ -387,8 +456,9 @@
};
unlockTitleDiv.AddChidren(btnUnlockTitleTip);
- unlockOptionView.AddChidren(new Button() {
- X = Application.GetRealWidth(16),
+ unlockOptionView.AddChidren(new Button()
+ {
+ X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(359),
Height = 1,
BackgroundColor = CSS_Color.BackgroundColor,
@@ -398,9 +468,12 @@
#region 瀵嗙爜瑙ｉ攣
var passwordUnlockDiv = new FrameLayout()
{
- Height = Application.GetRealWidth(50),
+ Height = Application.GetRealHeight(50),
};
- unlockOptionView.AddChidren(passwordUnlockDiv);
+ if ( !MainPage.LoginUser.appUnlockType.Contains("2"))
+ {
+ unlockOptionView.AddChidren(passwordUnlockDiv);
+ }
var btnPasswordUnlockIcon = new Button()
{
@@ -412,15 +485,28 @@
};
passwordUnlockDiv.AddChidren(btnPasswordUnlockIcon);
- var btnPasswordUnlockRightIcon = new Button()
+ //var btnPasswordUnlockRightIcon = new Button()
+ //{
+ // X = Application.GetRealWidth(339),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/Right.png",
+ //};
+ //passwordUnlockDiv.AddChidren(btnPasswordUnlockRightIcon);
+
+
+ var btnPasswordUnlockkSwtichIcon = new Button()
{
- X = Application.GetRealWidth(339),
+ X = Application.GetRealWidth(322),
Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
+ Width = Application.GetMinRealAverage(38),
+ Height = Application.GetMinRealAverage(38),
+ UnSelectedImagePath = "Public/Switch_2.png",
+ SelectedImagePath = "Public/SwitchOn_2.png",
+ IsSelected = MainPage.LoginUser.appUnlockType.Contains("1")
};
- passwordUnlockDiv.AddChidren(btnPasswordUnlockRightIcon);
+ passwordUnlockDiv.AddChidren(btnPasswordUnlockkSwtichIcon);
btnPasswordUnlockTitle = new Button()
{
@@ -431,23 +517,67 @@
TextID = StringId.PasswordUnlock,
};
passwordUnlockDiv.AddChidren(btnPasswordUnlockTitle);
-
- unlockOptionView.AddChidren(new Button() {
- X = Application.GetRealWidth(16),
+
+ unlockOptionView.AddChidren(new Button()
+ {
+ X = Application.GetRealWidth(16),
Width = Application.GetRealWidth(343),
Height = 1,
BackgroundColor = CSS_Color.BackgroundColor,
});
#endregion
+ #region 淇敼瀵嗙爜
+ var resetPasswordDiv = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ };
+ if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("1"))
+ {
+ unlockOptionView.AddChidren(resetPasswordDiv);
+ }
+ var btnPasswordUnlockRightIcon = new Button()
+ {
+ X = Application.GetRealWidth(339),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ resetPasswordDiv.AddChidren(btnPasswordUnlockRightIcon);
+
+
+ btnResetPasswordTitle = new Button()
+ {
+ X = Application.GetRealWidth(66),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.ResetDigitalPassword,
+ };
+ resetPasswordDiv.AddChidren(btnResetPasswordTitle);
+
+ if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("1"))
+ {
+ unlockOptionView.AddChidren(new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(343),
+ Height = 1,
+ BackgroundColor = CSS_Color.BackgroundColor,
+ });
+ }
+ #endregion
#region 鎵嬪娍瑙ｉ攣
var gestureUnlockDiv = new FrameLayout()
{
- Height = Application.GetRealWidth(50),
+ Height = Application.GetRealHeight(50),
};
- unlockOptionView.AddChidren(gestureUnlockDiv);
-
+ if (!MainPage.LoginUser.appUnlockType.Contains("1"))
+ {
+ unlockOptionView.AddChidren(gestureUnlockDiv);
+ }
var btnGestureUnlockIcon = new Button()
{
X = Application.GetRealWidth(16),
@@ -458,7 +588,62 @@
};
gestureUnlockDiv.AddChidren(btnGestureUnlockIcon);
- var btnGestureUnlockRightIcon = new Button()
+ //var btnGestureUnlockRightIcon = new Button()
+ //{
+ // X = Application.GetRealWidth(339),
+ // Gravity = Gravity.CenterVertical,
+ // Width = Application.GetMinRealAverage(16),
+ // Height = Application.GetMinRealAverage(16),
+ // UnSelectedImagePath = "Public/Right.png",
+ //};
+ //gestureUnlockDiv.AddChidren(btnGestureUnlockRightIcon);
+
+ var btnGestureUnlockkSwtichIcon = new Button()
+ {
+ X = Application.GetRealWidth(322),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(38),
+ Height = Application.GetMinRealAverage(38),
+ UnSelectedImagePath = "Public/Switch_2.png",
+ SelectedImagePath = "Public/SwitchOn_2.png",
+ IsSelected = MainPage.LoginUser.appUnlockType.Contains("2")
+ };
+ gestureUnlockDiv.AddChidren(btnGestureUnlockkSwtichIcon);
+
+
+ btnGestureUnlockTitle = new Button()
+ {
+ X = Application.GetRealWidth(66),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextID = StringId.GestureUnlock,
+ };
+ gestureUnlockDiv.AddChidren(btnGestureUnlockTitle);
+
+ if (!MainPage.LoginUser.appUnlockType.Contains("1"))
+ {
+ unlockOptionView.AddChidren(new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(343),
+ Height = 1,
+ BackgroundColor = CSS_Color.BackgroundColor,
+ });
+ }
+ #endregion
+
+
+ #region 淇敼鎵嬪娍
+ var resetGestureDiv = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ };
+ if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("2"))
+ {
+ unlockOptionView.AddChidren(resetGestureDiv);
+ }
+ var btnGestureRightIcon = new Button()
{
X = Application.GetRealWidth(339),
Gravity = Gravity.CenterVertical,
@@ -466,34 +651,55 @@
Height = Application.GetMinRealAverage(16),
UnSelectedImagePath = "Public/Right.png",
};
- gestureUnlockDiv.AddChidren(btnGestureUnlockRightIcon);
+ resetGestureDiv.AddChidren(btnGestureRightIcon);
- var btnGestureUnlockTitle = new Button()
+
+ btnResetGestureTitle = new Button()
{
X = Application.GetRealWidth(66),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.PasswordUnlock,
+ TextID = StringId.ResetGesturePassword,
};
- gestureUnlockDiv.AddChidren(btnGestureUnlockTitle);
+ resetGestureDiv.AddChidren(btnResetGestureTitle);
- unlockOptionView.AddChidren(new Button() {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(343),
- Height = 1,
- BackgroundColor = CSS_Color.BackgroundColor,
- });
+ if (MainPage.LoginUser.appUnlockPasswrod != "" && MainPage.LoginUser.appUnlockType.Contains("2"))
+ {
+ unlockOptionView.AddChidren(new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(343),
+ Height = 1,
+ BackgroundColor = CSS_Color.BackgroundColor,
+ });
+ }
#endregion
+ #region 鏌ヨ璁惧鏄惁鏀寔闈㈠ID锛屾寚绾笽D
+ TouchIDUtils.TouchIDSupperType type = TouchIDUtils.getTouchIDSupperType();
+ if (type == TouchIDUtils.TouchIDSupperType.TouchID)
+ {
+ sTouchID = true;
+ MainPage.Log("KK锛氭敮鎸乀ouchID");
+ }
+ else if (type == TouchIDUtils.TouchIDSupperType.FaceID)
+ {
+ sFaceID = true;
+ MainPage.Log("KK锛氭敮鎸丗aceID");
+ }
+ #endregion
#region 鎸囩汗瑙ｉ攣
- var fingerprintUnlockDiv = new FrameLayout()
+ fingerprintUnlockDiv = new FrameLayout()
{
- Height = Application.GetRealWidth(50),
+ Height = Application.GetRealHeight(51),
};
- unlockOptionView.AddChidren(fingerprintUnlockDiv);
+ if (sTouchID && MainPage.LoginUser.appUnlockPasswrod != ""&&!MainPage.LoginUser.appUnlockType.Contains("4"))
+ {
+ unlockOptionView.AddChidren(fingerprintUnlockDiv);
+ }
var btnFingerprintUnlockIcon = new Button()
{
@@ -515,34 +721,39 @@
};
fingerprintUnlockDiv.AddChidren(btnFingerprintUnlockTitle);
- var btnFingerprintUnlockSwtichIcon = new Button()
+ btnFingerprintUnlockSwtichIcon = new Button()
{
X = Application.GetRealWidth(322),
- Y = Application.GetRealHeight(4),
- Width = Application.GetMinRealAverage(48),
- Height = Application.GetMinRealAverage(36),
- UnSelectedImagePath = "Public/Switch.png",
- SelectedImagePath = "Public/SwitchOn.png",
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(38),
+ Height = Application.GetMinRealAverage(38),
+ UnSelectedImagePath = "Public/Switch_2.png",
+ SelectedImagePath = "Public/SwitchOn_2.png",
+ IsSelected = MainPage.LoginUser.appUnlockType.Contains("3")
};
fingerprintUnlockDiv.AddChidren(btnFingerprintUnlockSwtichIcon);
-
- unlockOptionView.AddChidren(new Button() {
- X = Application.GetRealWidth(16),
+
+ fingerprintUnlockDiv.AddChidren(new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(50),
Width = Application.GetRealWidth(343),
Height = 1,
BackgroundColor = CSS_Color.BackgroundColor,
+ //Visible = sFaceID
});
#endregion
-
#region 闈㈠ID瑙ｉ攣
- var faceIdUnlockDiv = new FrameLayout()
+ faceIdUnlockDiv = new FrameLayout()
{
- Height = Application.GetRealWidth(50),
+ Height = Application.GetRealHeight(50),
};
- unlockOptionView.AddChidren(faceIdUnlockDiv);
-
+ if (sFaceID && MainPage.LoginUser.appUnlockPasswrod != "" && !MainPage.LoginUser.appUnlockType.Contains("4"))
+ {
+ unlockOptionView.AddChidren(faceIdUnlockDiv);
+ }
var btnFaceIdUnlockIcon = new Button()
{
X = Application.GetRealWidth(16),
@@ -563,19 +774,21 @@
};
faceIdUnlockDiv.AddChidren(btnFaceIdUnlockTitle);
- var btnFaceIdUnlockSwtichIcon = new Button()
+ btnFaceIdUnlockSwtichIcon = new Button()
{
X = Application.GetRealWidth(322),
- Y = Application.GetRealHeight(4),
- Width = Application.GetMinRealAverage(48),
- Height = Application.GetMinRealAverage(36),
- UnSelectedImagePath = "Public/Switch.png",
- SelectedImagePath = "Public/SwitchOn.png",
+ Gravity= Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(38),
+ Height = Application.GetMinRealAverage(38),
+ UnSelectedImagePath = "Public/Switch_2.png",
+ SelectedImagePath = "Public/SwitchOn_2.png",
+ IsSelected = MainPage.LoginUser.appUnlockType.Contains("4")
};
faceIdUnlockDiv.AddChidren(btnFaceIdUnlockSwtichIcon);
#endregion
+
LoadEvet_SkipEventList();
}
--
Gitblit v1.8.0