From b8e94316e41eba72d927d5ca7d931b26139ee8ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 六月 2020 09:12:53 +0800
Subject: [PATCH] 20200612
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index 034b02e..2c6bd92 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -42,7 +42,7 @@
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(64),
Height = Application.GetRealWidth(64),
- UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/GestureGrayIcon.png",
+ //UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/GestureGrayIcon.png",
};
bodyView.AddChidren(btnGestureIcon);
@@ -94,8 +94,6 @@
{
//鑷楠岃瘉瀵嗙爜锛屾彁绀烘纭垨鑰呴敊璇� false涓烘樉绀虹孩鑹查敊璇�, 鑷閫夋嫨璋冪敤鏃舵満
mGestureLockView.showCorrectStatus(false);
- Console.WriteLine("鎵嬪娍瀵嗙爜 : " + selectNumStr + " selectCount:" + selectCount);
-
if (selectCount < 4)
{
btnTipMsg.Text = Language.StringByID(StringId.DrawingLengthError);
@@ -107,23 +105,22 @@
if (string.IsNullOrEmpty(oldPasswrod))
{
+ this.RemoveFromParent();
var page = new AppUnlockGesturePage(passwrod, backAction);
MainPage.BasePageView.AddChidren(page);
page.LoadPage(optionType);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
- MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 2);
}
else
{
if (optionType == "2")
{
+ //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+ this.RemoveFromParent();
var page = new AppUnlockGesturePage("", backAction);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("1");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
- MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 2);
return;
}
if(optionType == "7")
@@ -215,27 +212,30 @@
//page.LoadPage(true, Language.StringByID(StringId.SetSuccessfully), Language.StringByID(StringId.SetSuccessfully), "");
string tipMsg = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? Language.StringByID(StringId.TurnOnFingerprintUnlocking) :
Language.StringByID(StringId.TurnOnFaceIdUnlocking);
- Action<bool> action = (result) =>
+ if (TouchIDUtils.getTouchIDSupperType() != TouchIDUtils.TouchIDSupperType.None)
{
- var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
- if (result)
+ Action<bool> action = (result) =>
{
- if (!MainPage.LoginUser.appUnlockType.Contains(unlockType))
+ var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
+ if (result)
{
- MainPage.LoginUser.appUnlockType.Add(unlockType);
+ if (!MainPage.LoginUser.appUnlockType.Contains(unlockType))
+ {
+ MainPage.LoginUser.appUnlockType.Add(unlockType);
+ }
}
- }
- else
- {
- if (MainPage.LoginUser.appUnlockType.Contains(unlockType))
+ else
{
- MainPage.LoginUser.appUnlockType.Remove(unlockType);
+ if (MainPage.LoginUser.appUnlockType.Contains(unlockType))
+ {
+ MainPage.LoginUser.appUnlockType.Remove(unlockType);
+ }
}
- }
- MainPage.LoginUser.SaveUserInfo();
- backAction();
- };
- page.AdditionalOperations(tipMsg, action);
+ MainPage.LoginUser.SaveUserInfo();
+ backAction();
+ };
+ page.AdditionalOperations(tipMsg, action);
+ }
if (!MainPage.LoginUser.appUnlockType.Contains("2"))
{
MainPage.LoginUser.appUnlockType.Add("2");
--
Gitblit v1.8.0