From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3

---
 ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs |   85 +++++++++---------------------------------
 1 files changed, 19 insertions(+), 66 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
index 16ba490..15e127c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
@@ -58,7 +58,7 @@
             btnEmail.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnEmail.TextAlignment = TextAlignment.Center;
             btnEmail.TextSize = 16;
-            btnEmail.Text = UserCenterResourse.UserInfo.Email;
+            btnEmail.Text = HdlUserCenterResourse.UserInfo.UserEmail;
             btnEmail.Y = btnMsg1.Bottom + Application.GetRealHeight(12);
             bodyFrameLayout.AddChidren(btnEmail);
 
@@ -86,7 +86,11 @@
             btnCodeControl.FinishInputEvent += (value) =>
             {
                 //鏍￠獙楠岃瘉鐮�
-                this.CheckVerificationCode(value);
+                if (this.CheckVerificationCode(value) == false)
+                {
+                    //娓呯┖楠岃瘉鐮�
+                    btnCodeControl.ClearInputValue();
+                }
             };
 
             //楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
@@ -122,11 +126,10 @@
         /// </summary>
         private void SendCodeToEmail(BottomClickButton btnNext)
         {
-            var sendCodePra = new SendCodePra();
-
-            bool falge = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);
-            if (falge == false)
+            var errorMsg = HdlAccountLogic.Current.SendVeriCodeToEmail(HdlUserCenterResourse.UserInfo.UserEmail, VerCodeType.A鍏朵粬);
+            if (errorMsg != null)
             {
+                HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, errorMsg);
                 return;
             }
 
@@ -148,7 +151,7 @@
                     System.Threading.Thread.Sleep(1000);
                     if (waitime == 0)
                     {
-                        Application.RunOnMainThread(() =>
+                        HdlThreadLogic.Current.RunMain(() =>
                         {
                             if (btnNext != null)
                             {
@@ -160,13 +163,13 @@
                         });
                         break;
                     }
-                    Application.RunOnMainThread(() =>
+                    HdlThreadLogic.Current.RunMain(() =>
                     {
                         if (btnNext != null)
                         {
                             btnNext.Text = waitime + "s" + repeat;
                         }
-                    });
+                    }, ShowErrorMode.NO);
                 }
             });
         }
@@ -179,77 +182,27 @@
         /// 楠岃瘉楠岃瘉鐮�
         /// </summary>
         /// <returns></returns>
-        private void CheckVerificationCode(string code)
+        private bool CheckVerificationCode(string code)
         {
             if (this.canCheckCode == false)
             {
                 //楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
                 this.btnErrorMsg.Visible = true;
-                return;
+                return false;
             }
-            var checkCodePra = new CheckCodePra();
-            checkCodePra.Code = code;
 
-            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
-            if (flage == false)
+            var result = HdlAccountLogic.Current.CheckVeriCode(HdlUserCenterResourse.UserInfo.UserEmail, VerCodeType.A鍏朵粬, code);
+            if (result == false)
             {
                 //楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
                 this.btnErrorMsg.Visible = true;
-                return;
+                return false;
             }
 
             var from = new CheckNewEmailForm();
-            base.AddFromAndRemoveNowForm(from);
-        }
+            base.AddFormAndCloseNowForm(from);
 
-        #endregion
-
-        #region 鈻� 缁撴瀯浣揰____________________________
-
-        /// <summary>
-        /// 鍙戦�侀獙璇佺爜鐨勫惎鍔ㄥ弬鏁�
-        /// </summary>
-        private class SendCodePra
-        {
-            /// <summary>
-            /// 鐢ㄦ埛璐﹀彿
-            /// </summary>
-            public string Account = UserCenterResourse.UserInfo.Email;
-            /// <summary>
-            /// 鍏徃缂栧彿,鍥藉唴浣跨敤鎵嬫満鐭俊楠岃瘉鐮佹椂锛屾瀛楁濉叆0锛屽浗澶栨墜鏈虹煭淇￠獙璇佺爜锛屾瀛楁濉叆4 
-            /// </summary>
-            public int Company = Common.CommonPage.PhoneZoneStr == "86" ? 0 : 4;
-            /// <summary>
-            /// 璇█
-            /// </summary>
-            public string Language = Shared.Language.CurrentLanguage;
-            /// <summary>
-            /// 鍥藉鍦板尯浠ｇ爜锛屾墜鏈哄彿鍙戦�侀獙璇佺爜鏃朵娇鐢�
-            /// </summary>
-            public int AreaCode = 0;
-        }
-
-        /// <summary>
-        /// 鍙戦�侀獙璇佺爜鐨勫惎鍔ㄥ弬鏁�
-        /// </summary>
-        private class CheckCodePra
-        {
-            /// <summary>
-            /// 鐢ㄦ埛璐﹀彿
-            /// </summary>
-            public string Account = UserCenterResourse.UserInfo.Email;
-            /// <summary>
-            /// 楠岃瘉鐮�
-            /// </summary>
-            public string Code = "0";
-            /// <summary>
-            /// 璇█
-            /// </summary>
-            public string Language = Shared.Language.CurrentLanguage;
-            /// <summary>
-            /// 鍥藉鍦板尯浠ｇ爜锛屾墜鏈哄彿鍙戦�侀獙璇佺爜鏃朵娇鐢�
-            /// </summary>
-            public int AreaCode = 0;
+            return true;
         }
 
         #endregion

--
Gitblit v1.8.0