From af1cb3ecd0f4b0589e00b28f7f9edccf39e6e12b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 10 九月 2020 16:15:11 +0800
Subject: [PATCH] 202009101

---
 HDL_ON/UI/UI0-Public/AppUnlockPage.cs |   25 +++++++++++--------------
 1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
index 13cff38..a36a036 100644
--- a/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
+++ b/HDL_ON/UI/UI0-Public/AppUnlockPage.cs
@@ -33,29 +33,27 @@
                     {
                         MainPage.Log("KK:TouchID楠岃瘉鎴愬姛");
                         unlockTime = DateTime.Now;
-                        //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
                         MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                     }
                     else
                     {
                         ///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
-                        //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
                         MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
-
                         if (MainPage.LoginUser.appUnlockType.Contains("1"))
                         {
                             var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
                             MainPage.BasePageView.AddChidren(page);
                             page.LoadPage("7");
-                            //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         }
                         else if (MainPage.LoginUser.appUnlockType.Contains("2"))
                         {
                             var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
                             MainPage.BasePageView.AddChidren(page);
                             page.LoadPage("7");
-                            //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                         }
+
                     }
                 };
             }
@@ -69,14 +67,12 @@
                 var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
                 MainPage.BasePageView.AddChidren(page);
                 page.LoadPage("7");
-                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             }
             else if (MainPage.LoginUser.appUnlockType.Contains("2"))
             {
                 var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
                 MainPage.BasePageView.AddChidren(page);
                 page.LoadPage("7");
-                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             }
 #if __ANDROID__
             new System.Threading.Thread(() =>
@@ -86,6 +82,7 @@
                 {
                     MainPage.Log($"鍊掕鏃讹細{i} sec");
                     System.Threading.Thread.Sleep(1000);
+                    i++;
                 }
                 Application.RunOnMainThread(() =>
                 {
@@ -94,7 +91,7 @@
             })
             { IsBackground = true }.Start();
 #else
-                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
 #endif
 
         }
@@ -123,7 +120,6 @@
                 BackgroundColor = CSS.CSS_Color.MainBackgroundColor
             };
             MainPage.BasePageView.AddChidren(bodyView);
-            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
 
             bodyView.AddChidren(new Button()
             {
@@ -163,16 +159,14 @@
                 TextAlignment = TextAlignment.Center,
                 TextColor = CSS.CSS_Color.MainColor,
                 TextSize = CSS.CSS_FontSize.TextFontSize,
-                TextID = MainPage.LoginUser.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword
+                TextID = MainPage.LoginUser.appUnlockType.Contains("1") ? StringId.VerifyDigitalPassword : StringId.VerifyGesturePassword,
             };
             bodyView.AddChidren(btnOtherVerify);
 
             btnOtherVerify.MouseUpEventHandler = (sender, e) =>
             {
                 ///灏嗛獙璇佹寚绾圭殑椤甸潰绉婚櫎
-                //MainPage.BasePageView.RemoveAt(MainPage.BasePageView.ChildrenCount - 1);
                 MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
-
                 Action action = () =>
                 {
                     unlockTime = DateTime.Now;
@@ -182,17 +176,20 @@
                     var page = new AppUnlockPasswordPage(MainPage.LoginUser.appUnlockPasswrod, action);
                     MainPage.BasePageView.AddChidren(page);
                     page.LoadPage(optionType);
-                    //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 }
                 else if (MainPage.LoginUser.appUnlockType.Contains("2"))
                 {
                     var page = new AppUnlockGesturePage(MainPage.LoginUser.appUnlockPasswrod, action);
                     MainPage.BasePageView.AddChidren(page);
                     page.LoadPage(optionType);
-                    //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                 }
+
             };
 
+            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
             //dialog.Show();
             Console.WriteLine("-0987654321");
         }

--
Gitblit v1.8.0