From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs | 136 +++++++++++++++++++++++++++++++++++---------
1 files changed, 107 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index 5f7b43b..9fe56f4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -54,7 +54,7 @@
IsBold = true,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
- TextID = StringId.SetGesturePassword,
+ TextID = optionType == "7" ? StringId.SetGesturePassword : StringId.VerifyGesturePassword,
};
bodyView.AddChidren(btnTipTitle);
@@ -67,10 +67,9 @@
TextColor = CSS_Color.TextualColor,
SelectedTextColor = CSS_Color.WarningColor,
TextSize = CSS_FontSize.TextFontSize,
- TextID = string.IsNullOrEmpty(oldPasswrod) ? StringId.DrawUnlockPattern : StringId.DrawUnlockPatternAgain,
+ TextID = optionType == "2" ? StringId.DrawUnlockPatternAgain : StringId.DrawUnlockPattern,
};
bodyView.AddChidren(btnTipMsg);
-
if (optionType == "7")
{
@@ -88,7 +87,7 @@
BackgroundColor = CSS_Color.BackgroundColor,
};
bodyView.AddChidren(mGestureLockView);
-
+ mGestureLockView.SetSolidType(true);
//婊戝姩缁撴潫 鍥炶皟瀵嗙爜缁撴灉鍜屽瘑鐮侀暱搴�
mGestureLockView.OnLockVerifyEvent += (selectNumStr, selectCount) =>
{
@@ -148,11 +147,11 @@
this.RemoveFromParent();
return;
}
- if (MainPage.LoginUser.appUnlockType.Contains("2"))
+ if (OnAppConfig.Instance.appUnlockType.Contains("2"))
{
- MainPage.LoginUser.appUnlockType.Remove("2");
- MainPage.LoginUser.appUnlockPasswrod = "";
- MainPage.LoginUser.SaveUserInfo();
+ OnAppConfig.Instance.appUnlockType = new System.Collections.Generic.List<string>();
+ OnAppConfig.Instance.appUnlockPasswrod = "";
+ OnAppConfig.Instance.SaveUserConfig();
this.RemoveFromParent();
backAction();
}
@@ -169,28 +168,36 @@
{
if (passwrod == oldPasswrod)
{
- if (optionType == "5" && MainPage.LoginUser.appUnlockType.Contains("3"))
+ if (optionType == "5" )//&& OnAppConfig.Instance.appUnlockType.Contains("3"))
{
- MainPage.LoginUser.appUnlockType.Remove("3");
- MainPage.LoginUser.SaveUserInfo();
+ if (OnAppConfig.Instance.appUnlockType.Contains("3"))
+ OnAppConfig.Instance.appUnlockType.Remove("3");
+ else
+ OnAppConfig.Instance.appUnlockType.Add("3");
+
+ OnAppConfig.Instance.SaveUserConfig();
this.RemoveFromParent();
}
- if (MainPage.LoginUser.appUnlockType.Contains("4") && optionType == "6")
+ if ( optionType == "6")
{
- MainPage.LoginUser.appUnlockType.Remove("4");
- MainPage.LoginUser.SaveUserInfo();
+ if (OnAppConfig.Instance.appUnlockType.Contains("4"))
+ OnAppConfig.Instance.appUnlockType.Remove("4");
+ else
+ OnAppConfig.Instance.appUnlockType.Add("4");
+
+ 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();
@@ -219,29 +226,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
@@ -253,7 +260,78 @@
};
+ if (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(MainPage.LoginUser);
+ }
+ else
+ {
+ Action<string> action = (pw) => {
+ var loginResult = new DAL.Server.HttpServerRequest().LoginByPassword(MainPage.LoginUser.accountString, pw);
+ if (loginResult.StateCode.ToUpper() == "SUCCESS")
+ {
+ 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 = 1,
+ Direction = AMPopTipDirection.None
+ };
+ tip.Show(bodyView);
+ });
+ }
+
+ };
+ new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action,StringId.PlsEntryPassword,0,new System.Collections.Generic.List<string>(),true);
+ }
+ };
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0