From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs | 93 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 70 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
index 56fc6e1..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,7 +133,7 @@
bodyView.AddChidren(btnTipError);
- var etPassword = new EditText()
+ etPassword = new EditText()
{
Y = Application.GetRealWidth(100),
Height = Application.GetRealWidth(0),
@@ -205,6 +206,7 @@
{
if (passwrod == oldPasswrod)
{
+ //MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
this.RemoveFromParent();
backAction();
return;
@@ -227,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();
}
@@ -251,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();
@@ -296,29 +298,29 @@
{
if (result)
{
- if (!MainPage.LoginUser.appUnlockType.Contains(unlockType))
+ if (!OnAppConfig.Instance.appUnlockType.Contains(unlockType))
{
- MainPage.LoginUser.appUnlockType.Add(unlockType);
+ OnAppConfig.Instance.appUnlockType.Add(unlockType);
}
}
else
{
- if (MainPage.LoginUser.appUnlockType.Contains(unlockType))
+ if (OnAppConfig.Instance.appUnlockType.Contains(unlockType))
{
- MainPage.LoginUser.appUnlockType.Remove(unlockType);
+ OnAppConfig.Instance.appUnlockType.Remove(unlockType);
}
}
backAction();
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.SaveUserConfig();
};
page.AdditionalOperations(tipMsg, action);
}
- if (!MainPage.LoginUser.appUnlockType.Contains("1"))
+ if (!OnAppConfig.Instance.appUnlockType.Contains("1"))
{
- MainPage.LoginUser.appUnlockType.Add("1");
+ OnAppConfig.Instance.appUnlockType.Add("1");
}
- MainPage.LoginUser.appUnlockPasswrod = passwrod;
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockPasswrod = passwrod;
+ OnAppConfig.Instance.SaveUserConfig();
backAction();
}
else
@@ -342,6 +344,51 @@
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