From 5e3150f8f603a90f29ab2f5a4b014a8bff564cb4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 19:26:37 +0800
Subject: [PATCH] 2020-12-14 1.解锁页面UI提示文字优化修改。
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs | 9 +++-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 31 ++++++++++++++-
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs | 21 ++++++++--
3 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index a651fcf..7630120 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,19 +1,45 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/Info.plist">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs">
<Files>
<File FileName="HDL-ON_iOS/Resources/zh-Hans.lproj/InfoPlist.strings" Line="6" Column="26" />
<File FileName="HDL-ON_iOS/Info.plist" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" Line="334" Column="33" />
+ <File FileName="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" Line="347" Column="31" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs" Line="57" Column="17" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs" Line="68" Column="68" />
+ <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="186" Column="5" />
+ <File FileName="HDL_ON/Common/R.cs" Line="222" Column="39" />
+ <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPage.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
+ <Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Server" expanded="True" />
+ </Node>
+ <Node name="Entity" expanded="True" />
+ <Node name="UI" expanded="True">
+ <Node name="UI0-Public" expanded="True" />
+ <Node name="UI2" expanded="True">
+ <Node name="4-PersonalCenter" expanded="True">
+ <Node name="MemberManagement" expanded="True" />
+ <Node name="UnlockSetting" expanded="True">
+ <Node name="AppUnlockGesturePage.cs" selected="True" />
+ </Node>
+ </Node>
+ </Node>
+ </Node>
+ </Node>
<Node name="HDL-ON_iOS" expanded="True">
<Node name="Resources" expanded="True">
<Node name="zh-Hans.lproj" expanded="True" />
</Node>
- <Node name="Info.plist" selected="True" />
</Node>
</Node>
</State>
@@ -31,6 +57,7 @@
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
<Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" relfile="HDL_ON/UI/UI1-Login/RegisterPageBLL.cs" line="579" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs" line="51" column="1" />
</BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index aa4ad3f..29cef83 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -66,7 +66,7 @@
IsBold = true,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_Secondary,
- TextID = optionType == "7" ? StringId.SetGesturePassword : StringId.VerifyGesturePassword,
+ TextID = StringId.VerifyGesturePassword,
};
bodyView.AddChidren(btnTipTitle);
@@ -79,15 +79,28 @@
TextColor = CSS_Color.TextualColor,
SelectedTextColor = CSS_Color.WarningColor,
TextSize = CSS_FontSize.TextFontSize,
- TextID = optionType == "2" ? StringId.DrawUnlockPatternAgain : StringId.DrawUnlockPattern,
+ TextID = StringId.DrawUnlockPattern,
};
bodyView.AddChidren(btnTipMsg);
- if (optionType == "7")
+ if (optionType == "1")
{
- btnTipTitle.TextID = StringId.DrawUnlockPattern;
+ btnTipMsg.TextID = string.IsNullOrEmpty(oldPasswrod) ? StringId.DrawUnlockPattern : StringId.DrawUnlockPatternAgain;
+ //璁剧疆鎵嬪娍瀵嗙爜
+ btnTipTitle.TextID = StringId.SetGesturePassword;
+ }else if(optionType == "2")
+ {
+ //璇疯緭鍏ュ師鎵嬪娍瀵嗙爜
+ btnTipTitle.TextID = StringId.PleaseDrawTheOriginalGesturePassword;
}
+ //if (optionType == "7")
+ //{
+ // //璇风粯鍒惰В閿佸浘妗�
+ // btnTipTitle.TextID = StringId.DrawUnlockPattern;
+ //}
+
+
GestureLockView mGestureLockView = new GestureLockView
{
Y = Application.GetRealHeight(260),
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
index 8107033..e94eb79 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -58,12 +58,15 @@
};
bodyView.AddChidren(btnTipTitle);
-
- if (optionType == "2" || optionType == "3")
+ if (optionType == "1")
+ {
+ btnTipTitle.TextID = string.IsNullOrEmpty(oldPasswrod) ? StringId.PlsEntryPassword : StringId.PlsRegisterRepeatPassword;
+ }
+ else if (optionType == "2")
{
btnTipTitle.TextID = StringId.PleaseEnterTheOriginalDigitalPassword;
}
- if (optionType == "7")
+ else
{
btnTipTitle.TextID = StringId.PlsEntryPassword;
}
--
Gitblit v1.8.0