From 43b6e3d6a3a96e7b759b396df4f141ab105fb6bb Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 11:31:58 +0800
Subject: [PATCH] 合并嘉乐代码并测试通过
---
HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
index 6afbed5..7fed444 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -153,18 +153,17 @@
};
-
- //鍔犺浇搴曢儴楠岃瘉鎸夐挳
- if (optionType == "5" || optionType == "6")
- {
- //杈撳叆鐧诲綍瀵嗙爜楠岃瘉 鎻愮ず鎸夐挳
- AddInputPasswordTipButton(optionType);
- }
- else if (optionType == "7")
+
+ if (optionType == "7")
{
//浣跨敤璐︽埛瀵嗙爜鐧诲綍鎸夐挳 鎻愮ず鎸夐挳
AddLoginTipButton();
}
+ else if (optionType != "1")
+ {
+ //杈撳叆鐧诲綍瀵嗙爜楠岃瘉 鎻愮ず鎸夐挳
+ AddInputPasswordTipButton(optionType);
+ }
//if (optionType == "5" || optionType == "6" || optionType == "7")
--
Gitblit v1.8.0