From a2927467ebfa938a420f392deb6882b35570fd33 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 16:48:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs | 104 +++++++++++++++++++---------------------------------
1 files changed, 38 insertions(+), 66 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index 5a26092..0ed1e8d 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -1,6 +1,8 @@
锘縰sing System;
using HDL_ON.UI.CSS;
using Shared;
+using HDL_ON.DAL.Server;
+
namespace HDL_ON.UI
{
public class AppUnlockGesturePage : FrameLayout
@@ -147,11 +149,11 @@
this.RemoveFromParent();
return;
}
- if (MainPage.LoginUser.appUnlockType.Contains("2"))
+ if (OnAppConfig.Instance.appUnlockType.Contains("2"))
{
- MainPage.LoginUser.appUnlockType = new System.Collections.Generic.List<string>();
- MainPage.LoginUser.appUnlockPasswrod = "";
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
+ OnAppConfig.Instance.appUnlockPasswrod = "";
+ OnAppConfig.Instance.SaveUserConfig();
this.RemoveFromParent();
backAction();
}
@@ -168,36 +170,36 @@
{
if (passwrod == oldPasswrod)
{
- if (optionType == "5" )//&& MainPage.LoginUser.appUnlockType.Contains("3"))
+ if (optionType == "5" )//&& OnAppConfig.Instance.appUnlockType.Contains("3"))
{
- 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();
}
- if (optionType == "8" && !MainPage.LoginUser.appUnlockType.Contains("3"))
+ if (optionType == "8" && !OnAppConfig.Instance.appUnlockType.Contains("3"))
{
- MainPage.LoginUser.appUnlockType.Add("3");
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockType.Add("3");
+ OnAppConfig.Instance.SaveUserConfig();
this.RemoveFromParent();
}
- if (!MainPage.LoginUser.appUnlockType.Contains("4") && optionType == "9")
+ if (!OnAppConfig.Instance.appUnlockType.Contains("4") && optionType == "9")
{
- MainPage.LoginUser.appUnlockType.Remove("4");
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockType.Remove("4");
+ OnAppConfig.Instance.SaveUserConfig();
this.RemoveFromParent();
}
backAction();
@@ -226,29 +228,29 @@
var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
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);
}
}
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.SaveUserConfig();
backAction();
};
page.AdditionalOperations(tipMsg, action);
}
- if (!MainPage.LoginUser.appUnlockType.Contains("2"))
+ if (!OnAppConfig.Instance.appUnlockType.Contains("2"))
{
- MainPage.LoginUser.appUnlockType.Add("2");
+ OnAppConfig.Instance.appUnlockType.Add("2");
}
- MainPage.LoginUser.appUnlockPasswrod = passwrod;
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockPasswrod = passwrod;
+ OnAppConfig.Instance.SaveUserConfig();
backAction();
}
else
@@ -277,54 +279,24 @@
{
if (optionType == "7")
{
- MainPage.GoLoginPage(MainPage.LoginUser.accountString);
+ MainPage.GoLoginPage( UserInfo.Current);
}
else
{
Action<string> action = (pw) => {
- var loginResult = new DAL.Server.HttpServerRequest().LoginByPassword(MainPage.LoginUser.accountString, pw);
- if (loginResult.StateCode.ToUpper() == "SUCCESS")
+ var resultObj = new HttpServerRequest().LoginByPassword( UserInfo.Current.AccountString, pw);
+ if (resultObj.Code == StateCode.SUCCESS)
{
- MainPage.LoginUser.appUnlockPasswrod = "";
- MainPage.LoginUser.appUnlockType = new System.Collections.Generic.List<string>();
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockPasswrod = "";
+ OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
+ OnAppConfig.Instance.SaveUserConfig();
this.RemoveFromParent();
backAction();
}
- //鐧诲綍澶辫触
else
{
- string tipStr = "Sever erorr";
- switch (loginResult.StateCode)
- {
- case "ValidCodeAndPhoneNoEqual":
- tipStr = Language.StringByID(StringId.VerificationCodeError);
- break;
- case "USERNAMEORPWDERROR":
- tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
- break;
- case "ACCOUNTNOEXISTS":
- tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
- break;
- case "NoRecord":
- tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
- break;
- case "Self:Net_Error":
- tipStr = Language.StringByID(StringId.NetworkAnomaly);
- break;
- }
- //璐﹀彿鎴栬�呭瘑鐮侀敊璇�
- Application.RunOnMainThread(() =>
- {
- //鎻愮ず鍘熷洜
- var tip = new Tip()
- {
- Text = tipStr,
- CloseTime = 3,
- Direction = AMPopTipDirection.None
- };
- tip.Show(bodyView);
- });
+ //鐧诲綍澶辫触
+ IMessageCommon.Current.ShowErrorInfoAlter(resultObj.Code);
}
};
--
Gitblit v1.8.0