From 5d6626e390f7bccbbfbc0df1e95f8fb86a53af58 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 15 十二月 2020 18:25:47 +0800
Subject: [PATCH] Merge branch 'NewFilePath' into CJL
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
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),
--
Gitblit v1.8.0