From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1

---
 HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs |  135 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 111 insertions(+), 24 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..d6a421a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockPasswordPage.cs
@@ -7,6 +7,7 @@
     public partial class AppUnlockPasswordPage : FrameLayout
     {
         FrameLayout bodyView;
+        EditText etPassword;
 
         string passwrod = "";
         string oldPasswrod = "";
@@ -17,7 +18,6 @@
             oldPasswrod = pw;
             backAction = action;
         }
-
 
         /// <summary>
         /// 
@@ -132,15 +132,17 @@
             bodyView.AddChidren(btnTipError);
 
 
-            var etPassword = new EditText()
+            etPassword = new EditText()
             {
                 Y = Application.GetRealWidth(100),
-                Height = Application.GetRealWidth(10),
+                Height = Application.GetRealWidth(0),
                 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;
                             }
 
@@ -202,8 +205,10 @@
                             {
                                 if (passwrod == oldPasswrod)
                                 {
+                                    //MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
                                     this.RemoveFromParent();
                                     backAction();
+                                    return;
                                 }
                                 else
                                 {
@@ -225,7 +230,7 @@
                                     }
                                     if (MainPage.LoginUser.appUnlockType.Contains("1"))
                                     {
-                                        MainPage.LoginUser.appUnlockType.Remove("1");
+                                        MainPage.LoginUser.appUnlockType =new System.Collections.Generic.List<string>();//.Remove("1");
                                         MainPage.LoginUser.appUnlockPasswrod = "";
                                         MainPage.LoginUser.SaveUserInfo();
                                         this.RemoveFromParent();
@@ -280,30 +285,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 +341,83 @@
             btnTipIcon2.MouseUpEventHandler = eventHandler;
             btnTipIcon3.MouseUpEventHandler = eventHandler;
             btnTipIcon4.MouseUpEventHandler = eventHandler;
+
+            etPassword.Foucs = true;
+
+
+            if (optionType == "3" || optionType == "5" || optionType == "6" || optionType == "7")
+            {
+                Button btnLoginAccountVerify = new Button()
+                {
+                    Y = Application.GetRealHeight(517),
+                    Height = Application.GetRealHeight(60),
+                    TextAlignment = TextAlignment.Center,
+                    TextSize = CSS_FontSize.TextFontSize,
+                    TextColor = CSS_Color.MainColor,
+                    TextID = StringId.EnterLoginPasswordVerification,
+                };
+                bodyView.AddChidren(btnLoginAccountVerify);
+
+                btnLoginAccountVerify.MouseUpEventHandler = (sender, e) =>
+                {
+                    if (optionType == "7")
+                    {
+                        MainPage.GoLoginPage(MainPage.LoginUser.accountString);
+                    }
+                    else
+                    {
+                        Action<string> action = (pw) => {
+                            var loginResult = new DAL.Server.HttpServerRequest().LoginByPassword(MainPage.LoginUser.accountString, pw);
+                            if (loginResult.StateCode.ToUpper() == "SUCCESS")
+                            {
+                                MainPage.LoginUser.appUnlockPasswrod = "";
+                                MainPage.LoginUser.appUnlockType = new System.Collections.Generic.List<string>();
+                                MainPage.LoginUser.SaveUserInfo();
+                                this.RemoveFromParent();
+                                backAction();
+                            }
+                            //鐧诲綍澶辫触
+                            else
+                            {
+                                string tipStr = "Sever erorr";
+                                switch (loginResult.StateCode)
+                                {
+                                    case "ValidCodeAndPhoneNoEqual":
+                                        tipStr = Language.StringByID(StringId.VerificationCodeError);
+                                        break;
+                                    case "USERNAMEORPWDERROR":
+                                        tipStr = Language.StringByID(StringId.LoginFailed_AccountOrPasswordError);
+                                        break;
+                                    case "ACCOUNTNOEXISTS":
+                                        tipStr = Language.StringByID(StringId.ACCOUNTNOEXISTS);
+                                        break;
+                                    case "NoRecord":
+                                        tipStr = Language.StringByID(StringId.PlsGetTheVerificationCode);
+                                        break;
+                                    case "Self:Net_Error":
+                                        tipStr = Language.StringByID(StringId.NetworkAnomaly);
+                                        break;
+                                }
+                                //璐﹀彿鎴栬�呭瘑鐮侀敊璇�
+                                Application.RunOnMainThread(() =>
+                                {
+                                    //鎻愮ず鍘熷洜
+                                    var tip = new Tip()
+                                    {
+                                        Text = tipStr,
+                                        CloseTime = 3,
+                                        Direction = AMPopTipDirection.None
+                                    };
+                                    tip.Show(bodyView);
+                                });
+                            }
+
+                        };
+                        new PublicAssmebly().LoadDialog_EditParater(StringId.EnterLoginPasswordVerification, "", action, StringId.PlsEntryPassword, 0, new System.Collections.Generic.List<string>(), true);
+                    }
+                };
+            }
+
         }
     }
 }

--
Gitblit v1.8.0