From b8e94316e41eba72d927d5ca7d931b26139ee8ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 15 六月 2020 09:12:53 +0800
Subject: [PATCH] 20200612

---
 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs |   50 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
index 7321820..f9d5e08 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -137,10 +137,12 @@
                 Y = Application.GetRealWidth(100),
                 Height = Application.GetRealWidth(10),
                 Foucs = true,
-                Visible = false,
+                //Visible = false,
                 IsNumberKeyboardType = true,
             };
             bodyView.AddChidren(etPassword);
+
+            //etPassword.MouseUpEventHandler = (sender, e) => { };
 
             etPassword.TextChangeEventHandler = (sender, e) => {
                 passwrod = etPassword.Text.Trim();
@@ -176,25 +178,26 @@
                         btnTipIcon2.IsSelected = true;
                         btnTipIcon3.IsSelected = true;
                         btnTipIcon4.IsSelected = true;
+                        Application.HideSoftInput();
                         if (string.IsNullOrEmpty(oldPasswrod))
                         {
+                            //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+                            this.RemoveFromParent();
                             var page = new AppUnlockPasswordPage(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")
+                            if (optionType == "2")
                             {
+                                //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
+                                this.RemoveFromParent();
                                 var page = new AppUnlockPasswordPage("", backAction);
                                 MainPage.BasePageView.AddChidren(page);
                                 page.LoadPage("1");
                                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-                                //绉婚櫎褰撳墠鐣岄潰锛屾瘡娆¤繑鍥為兘杩斿洖鍒版渶涓婄骇
-                                MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 2);
                                 return;
                             }
 
@@ -280,30 +283,35 @@
                                 this.RemoveFromParent();
                                 var page = new OperationResultDisPalyPage();
                                 page.Show();
+
                                 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))
+                                        if (result)
                                         {
-                                            MainPage.LoginUser.appUnlockType.Add(unlockType);
+                                            if (!MainPage.LoginUser.appUnlockType.Contains(unlockType))
+                                            {
+                                                MainPage.LoginUser.appUnlockType.Add(unlockType);
+                                            }
                                         }
-                                    }
-                                    else
-                                    {
-                                        if (MainPage.LoginUser.appUnlockType.Contains(unlockType))
+                                        else
                                         {
-                                            MainPage.LoginUser.appUnlockType.Remove(unlockType);
+                                            if (MainPage.LoginUser.appUnlockType.Contains(unlockType))
+                                            {
+                                                MainPage.LoginUser.appUnlockType.Remove(unlockType);
+                                            }
                                         }
-                                    }
-                                    backAction();
-                                    MainPage.LoginUser.SaveUserInfo();
-                                };
-                                page.AdditionalOperations(tipMsg, action);
+                                        backAction();
+                                        MainPage.LoginUser.SaveUserInfo();
+                                    };
+                                    page.AdditionalOperations(tipMsg, action);
+                                }
                                 if (!MainPage.LoginUser.appUnlockType.Contains("1"))
                                 {
                                     MainPage.LoginUser.appUnlockType.Add("1");
@@ -331,6 +339,8 @@
             btnTipIcon2.MouseUpEventHandler = eventHandler;
             btnTipIcon3.MouseUpEventHandler = eventHandler;
             btnTipIcon4.MouseUpEventHandler = eventHandler;
+
+            etPassword.Foucs = true;
         }
     }
 }

--
Gitblit v1.8.0