From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

---
 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs |   16 ++++++++--------
 1 files changed, 8 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..489d1a5 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockGesturePage.cs
@@ -25,6 +25,7 @@
         public AppUnlockGesturePage(string pw, Action action)
         {
             bodyView = this;
+            bodyView.Tag = "unlockpage";
             oldPasswrod = pw;
             backAction = action;
         }
@@ -153,18 +154,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