From fe3b2466c68b5db70d38e78039703add3b8b1dfe Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 31 十二月 2020 19:29:43 +0800
Subject: [PATCH] 合并了代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs |   67 ++++++++++++++++++++++++++++++---
 1 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
index 15e127c..d4beb21 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 = HdlUserCenterResourse.UserInfo.UserEmail;
+            btnEmail.Text = UserCenterResourse.UserInfo.Email;
             btnEmail.Y = btnMsg1.Bottom + Application.GetRealHeight(12);
             bodyFrameLayout.AddChidren(btnEmail);
 
@@ -126,10 +126,11 @@
         /// </summary>
         private void SendCodeToEmail(BottomClickButton btnNext)
         {
-            var errorMsg = HdlAccountLogic.Current.SendVeriCodeToEmail(HdlUserCenterResourse.UserInfo.UserEmail, VerCodeType.A鍏朵粬);
-            if (errorMsg != null)
+            var sendCodePra = new SendCodePra();
+
+            bool falge = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);
+            if (falge == false)
             {
-                HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, errorMsg);
                 return;
             }
 
@@ -190,9 +191,11 @@
                 this.btnErrorMsg.Visible = true;
                 return false;
             }
+            var checkCodePra = new CheckCodePra();
+            checkCodePra.Code = code;
 
-            var result = HdlAccountLogic.Current.CheckVeriCode(HdlUserCenterResourse.UserInfo.UserEmail, VerCodeType.A鍏朵粬, code);
-            if (result == false)
+            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+            if (flage == false)
             {
                 //楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
                 this.btnErrorMsg.Visible = true;
@@ -200,11 +203,61 @@
             }
 
             var from = new CheckNewEmailForm();
-            base.AddFormAndCloseNowForm(from);
+            base.AddFromAndRemoveNowForm(from);
 
             return true;
         }
 
         #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;
+        }
+
+        #endregion
     }
 }

--
Gitblit v1.8.0