From 767e3abed9c1e9a831a90357ee046a24b3a161b9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 14 七月 2020 17:21:49 +0800
Subject: [PATCH] 2020-07-14-3
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
index 7321820..56fc6e1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -135,12 +135,14 @@
var etPassword = new EditText()
{
Y = Application.GetRealWidth(100),
- Height = Application.GetRealWidth(10),
+ Height = Application.GetRealWidth(0),
Foucs = true,
- Visible = false,
+ //Visible = false,
IsNumberKeyboardType = true,
};
bodyView.AddChidren(etPassword);
+
+ //etPassword.MouseUpEventHandler = (sender, e) => { };
etPassword.TextChangeEventHandler = (sender, e) => {
passwrod = etPassword.Text.Trim();
@@ -176,25 +178,26 @@
btnTipIcon2.IsSelected = true;
btnTipIcon3.IsSelected = true;
btnTipIcon4.IsSelected = true;
+ Application.HideSoftInput();
if (string.IsNullOrEmpty(oldPasswrod))
{
+ //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+ this.RemoveFromParent();
var page = new AppUnlockPasswordPage(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")
+ if (optionType == "2")
{
+ //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+ this.RemoveFromParent();
var page = new AppUnlockPasswordPage("", backAction);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("1");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
- MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 2);
return;
}
@@ -204,6 +207,7 @@
{
this.RemoveFromParent();
backAction();
+ return;
}
else
{
@@ -280,30 +284,35 @@
this.RemoveFromParent();
var page = new OperationResultDisPalyPage();
page.Show();
+
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))
+ 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);
+ }
}
- }
- backAction();
- MainPage.LoginUser.SaveUserInfo();
- };
- page.AdditionalOperations(tipMsg, action);
+ backAction();
+ MainPage.LoginUser.SaveUserInfo();
+ };
+ page.AdditionalOperations(tipMsg, action);
+ }
if (!MainPage.LoginUser.appUnlockType.Contains("1"))
{
MainPage.LoginUser.appUnlockType.Add("1");
@@ -331,6 +340,8 @@
btnTipIcon2.MouseUpEventHandler = eventHandler;
btnTipIcon3.MouseUpEventHandler = eventHandler;
btnTipIcon4.MouseUpEventHandler = eventHandler;
+
+ etPassword.Foucs = true;
}
}
}
--
Gitblit v1.8.0