From e87985ec1dcb69beedaf9f95e8e7aba14b7c08d6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 09 十二月 2020 18:50:14 +0800
Subject: [PATCH] 2020-12-09 1.信息中心，增加下划线和点击Alter提醒详情。
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs | 148 +++++++++++++++++++++++++++++++++----------------
1 files changed, 99 insertions(+), 49 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index 034b02e..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
@@ -42,7 +44,7 @@
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(64),
Height = Application.GetRealWidth(64),
- UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/GestureGrayIcon.png",
+ //UnSelectedImagePath = "PersonalCenter/AppUnlockSetting/GestureGrayIcon.png",
};
bodyView.AddChidren(btnGestureIcon);
@@ -54,7 +56,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 +69,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")
{
@@ -83,19 +84,17 @@
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(215),
Height = Application.GetRealWidth(215),
- //LockViewCorrectColor = 0xFF00FF00,//榛樿鍜屾纭� 鏃舵樉绀虹殑棰滆壊
- //LockViewErrorColor = 0xFFFF0000, //閿欒鏃� 鏄剧ず鐨勯鑹�
+ LockViewCorrectColor = CSS_Color.MainColor,//0xFF00FF00,//榛樿鍜屾纭� 鏃舵樉绀虹殑棰滆壊
+ LockViewErrorColor = 0xFFFF0000, //閿欒鏃� 鏄剧ず鐨勯鑹�
BackgroundColor = CSS_Color.BackgroundColor,
};
bodyView.AddChidren(mGestureLockView);
-
+ mGestureLockView.SetSolidType(true);
//婊戝姩缁撴潫 鍥炶皟瀵嗙爜缁撴灉鍜屽瘑鐮侀暱搴�
mGestureLockView.OnLockVerifyEvent += (selectNumStr, selectCount) =>
{
//鑷楠岃瘉瀵嗙爜锛屾彁绀烘纭垨鑰呴敊璇� false涓烘樉绀虹孩鑹查敊璇�, 鑷閫夋嫨璋冪敤鏃舵満
mGestureLockView.showCorrectStatus(false);
- Console.WriteLine("鎵嬪娍瀵嗙爜 : " + selectNumStr + " selectCount:" + selectCount);
-
if (selectCount < 4)
{
btnTipMsg.Text = Language.StringByID(StringId.DrawingLengthError);
@@ -107,23 +106,22 @@
if (string.IsNullOrEmpty(oldPasswrod))
{
+ this.RemoveFromParent();
var page = new AppUnlockGesturePage(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")
{
+ //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+ this.RemoveFromParent();
var page = new AppUnlockGesturePage("", backAction);
MainPage.BasePageView.AddChidren(page);
page.LoadPage("1");
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
- MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 2);
return;
}
if(optionType == "7")
@@ -151,11 +149,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();
}
@@ -172,28 +170,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();
@@ -215,33 +221,36 @@
//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))
+ var unlockType = TouchIDUtils.getTouchIDSupperType() == TouchIDUtils.TouchIDSupperType.TouchID ? "3" : "4";
+ 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);
+ }
}
- }
- MainPage.LoginUser.SaveUserInfo();
- backAction();
- };
- page.AdditionalOperations(tipMsg, action);
- if (!MainPage.LoginUser.appUnlockType.Contains("2"))
- {
- MainPage.LoginUser.appUnlockType.Add("2");
+ OnAppConfig.Instance.SaveUserConfig();
+ backAction();
+ };
+ page.AdditionalOperations(tipMsg, action);
}
- MainPage.LoginUser.appUnlockPasswrod = passwrod;
- MainPage.LoginUser.SaveUserInfo();
+ if (!OnAppConfig.Instance.appUnlockType.Contains("2"))
+ {
+ OnAppConfig.Instance.appUnlockType.Add("2");
+ }
+ OnAppConfig.Instance.appUnlockPasswrod = passwrod;
+ OnAppConfig.Instance.SaveUserConfig();
backAction();
}
else
@@ -253,7 +262,48 @@
};
+ 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( UserInfo.Current);
+ }
+ else
+ {
+ Action<string> action = (pw) => {
+ var resultObj = new HttpServerRequest().LoginByPassword( UserInfo.Current.AccountString, pw);
+ if (resultObj.Code == 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);
+ }
+ };
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.8.0