From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs | 138 ++++++++++++++++++++++++++++++++-------------
1 files changed, 98 insertions(+), 40 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..f64b708 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -1,12 +1,14 @@
锘縰sing System;
using Shared;
using HDL_ON.UI.CSS;
+using HDL_ON.DAL.Server;
namespace HDL_ON.UI
{
public partial class AppUnlockPasswordPage : FrameLayout
{
FrameLayout bodyView;
+ EditText etPassword;
string passwrod = "";
string oldPasswrod = "";
@@ -17,7 +19,6 @@
oldPasswrod = pw;
backAction = action;
}
-
/// <summary>
///
@@ -132,15 +133,17 @@
bodyView.AddChidren(btnTipError);
- var etPassword = new EditText()
+ 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 +179,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;
}
@@ -202,8 +206,10 @@
{
if (passwrod == oldPasswrod)
{
+ //MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
this.RemoveFromParent();
backAction();
+ return;
}
else
{
@@ -223,11 +229,11 @@
this.RemoveFromParent();
return;
}
- if (MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (OnAppConfig.Instance.appUnlockType.Contains("1"))
{
- MainPage.LoginUser.appUnlockType.Remove("1");
- MainPage.LoginUser.appUnlockPasswrod = "";
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockType =new System.Collections.Generic.List<string>();//.Remove("1");
+ OnAppConfig.Instance.appUnlockPasswrod = "";
+ OnAppConfig.Instance.SaveUserConfig();
this.RemoveFromParent();
backAction();
}
@@ -247,22 +253,22 @@
{
if (optionType == "5")
{
- if (MainPage.LoginUser.appUnlockType.Contains("3"))
- MainPage.LoginUser.appUnlockType.Remove("3");
+ if (OnAppConfig.Instance.appUnlockType.Contains("3"))
+ OnAppConfig.Instance.appUnlockType.Remove("3");
else
- MainPage.LoginUser.appUnlockType.Add("3");
+ OnAppConfig.Instance.appUnlockType.Add("3");
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.SaveUserConfig();
this.RemoveFromParent();
}
if (optionType == "6")
{
- if (MainPage.LoginUser.appUnlockType.Contains("4"))
- MainPage.LoginUser.appUnlockType.Remove("4");
+ if (OnAppConfig.Instance.appUnlockType.Contains("4"))
+ OnAppConfig.Instance.appUnlockType.Remove("4");
else
- MainPage.LoginUser.appUnlockType.Add("4");
+ OnAppConfig.Instance.appUnlockType.Add("4");
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.SaveUserConfig();
this.RemoveFromParent();
}
backAction();
@@ -280,36 +286,41 @@
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 (!OnAppConfig.Instance.appUnlockType.Contains(unlockType))
+ {
+ OnAppConfig.Instance.appUnlockType.Add(unlockType);
+ }
}
- }
- else
- {
- if (MainPage.LoginUser.appUnlockType.Contains(unlockType))
+ else
{
- MainPage.LoginUser.appUnlockType.Remove(unlockType);
+ if (OnAppConfig.Instance.appUnlockType.Contains(unlockType))
+ {
+ OnAppConfig.Instance.appUnlockType.Remove(unlockType);
+ }
}
- }
- backAction();
- MainPage.LoginUser.SaveUserInfo();
- };
- page.AdditionalOperations(tipMsg, action);
- if (!MainPage.LoginUser.appUnlockType.Contains("1"))
- {
- MainPage.LoginUser.appUnlockType.Add("1");
+ backAction();
+ OnAppConfig.Instance.SaveUserConfig();
+ };
+ page.AdditionalOperations(tipMsg, action);
}
- MainPage.LoginUser.appUnlockPasswrod = passwrod;
- MainPage.LoginUser.SaveUserInfo();
+ if (!OnAppConfig.Instance.appUnlockType.Contains("1"))
+ {
+ OnAppConfig.Instance.appUnlockType.Add("1");
+ }
+ OnAppConfig.Instance.appUnlockPasswrod = passwrod;
+ OnAppConfig.Instance.SaveUserConfig();
backAction();
}
else
@@ -331,6 +342,53 @@
btnTipIcon2.MouseUpEventHandler = eventHandler;
btnTipIcon3.MouseUpEventHandler = eventHandler;
btnTipIcon4.MouseUpEventHandler = eventHandler;
+
+ etPassword.Foucs = true;
+
+
+ if (optionType == "3" || optionType == "5" || optionType == "6" || optionType == "7")
+ {
+ Button btnLoginAccountVerify = new Button()
+ {
+ Y = Application.GetRealHeight(517),
+ Height = Application.GetRealHeight(60),
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.MainColor,
+ TextID = StringId.EnterLoginPasswordVerification,
+ };
+ bodyView.AddChidren(btnLoginAccountVerify);
+
+ btnLoginAccountVerify.MouseUpEventHandler = (sender, e) =>
+ {
+ if (optionType == "7")
+ {
+ MainPage.GoLoginPage( UserInfo.Current);
+ }
+ else
+ {
+ Action<string> action = (pw) => {
+ var resultObj = new HttpServerRequest().LoginByPassword( UserInfo.Current.AccountString, pw);
+ if (resultObj.Code.ToUpper() == StateCode.SUCCESS)
+ {
+ OnAppConfig.Instance.appUnlockPasswrod = "";
+ OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
+ OnAppConfig.Instance.SaveUserConfig();
+ this.RemoveFromParent();
+ backAction();
+ }
+ else
+ {
+ //鐧诲綍澶辫触
+ IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
+ }
+
+ };
+ new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
+ }
+ };
+ }
+
}
}
}
--
Gitblit v1.8.0