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/CheckOldPhoneForm.cs |   78 +++++++++++++++++++++++++++++++++------
 1 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
index f85a69c..c17e6e2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
@@ -58,21 +58,21 @@
             btnPhone.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnPhone.TextAlignment = TextAlignment.Center;
             btnPhone.TextSize = 16;
-            btnPhone.Text = HdlUserCenterResourse.UserInfo.UserEmail;
+            btnPhone.Text = UserCenterResourse.UserInfo.Email;
             btnPhone.Y = btnMsg1.Bottom + Application.GetRealHeight(12);
             bodyFrameLayout.AddChidren(btnPhone);
-            if (HdlUserCenterResourse.UserInfo.UserPhone.Length >= 11)
+            if (UserCenterResourse.UserInfo.Phone.Length >= 11)
             {
-                var phone = HdlUserCenterResourse.UserInfo.UserPhone;
+                var phone = UserCenterResourse.UserInfo.Phone;
                 phone = phone.Substring(0, 3) + "".PadLeft(phone.Length - 7, '*') + phone.Substring(phone.Length - 4, 4);
-                btnPhone.Text = "+" + HdlUserCenterResourse.UserInfo.PhoneAreaCode + " " + phone;
+                btnPhone.Text = "+" + UserCenterResourse.UserInfo.AreaCode + " " + phone;
             }
             else
             {
                 //鎴栬杩欐槸鍥藉鐨勬墜鏈哄惂
-                var phone = HdlUserCenterResourse.UserInfo.UserPhone;
+                var phone = UserCenterResourse.UserInfo.Phone;
                 phone = phone.Substring(0, 3) + "".PadLeft(phone.Length - 5, '*') + phone.Substring(phone.Length - 2, 2);
-                btnPhone.Text = "+" + HdlUserCenterResourse.UserInfo.PhoneAreaCode + " " + phone;
+                btnPhone.Text = "+" + UserCenterResourse.UserInfo.AreaCode + " " + phone;
             }
 
             //淇敼鎵嬫満鍙峰墠锛岃杈撳叆楠岃瘉鐮佺‘璁ゆ偍鐨勮韩浠�
@@ -139,10 +139,11 @@
         /// </summary>
         private void SendCodeToPhone(BottomClickButton btnNext)
         {
-            var errorMsg = HdlAccountLogic.Current.SendVeriCodeToEmail(HdlUserCenterResourse.UserInfo.UserPhone, VerCodeType.A鍏朵粬);
-            if (errorMsg != null)
+            var sendCodePra = new SendCodePra();
+
+            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/LoginSendVerCode", false, sendCodePra);
+            if (flage == false)
             {
-                HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, errorMsg);
                 return;
             }
 
@@ -203,8 +204,11 @@
                 this.btnErrorMsg.Visible = true;
                 return false;
             }
-            var result = HdlAccountLogic.Current.CheckVeriCode(HdlUserCenterResourse.UserInfo.UserPhone, VerCodeType.A鍏朵粬, code);
-            if (result == false)
+            var checkCodePra = new CheckCodePra();
+            checkCodePra.Code = code;
+
+            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+            if (flage == false)
             {
                 //楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
                 this.btnErrorMsg.Visible = true;
@@ -212,11 +216,61 @@
             }
 
             var from = new CheckNewPhoneForm();
-            base.AddFormAndCloseNowForm(from);
+            base.AddFromAndRemoveNowForm(from);
 
             return true;
         }
 
         #endregion
+
+        #region 鈻� 缁撴瀯浣揰____________________________
+
+        /// <summary>
+        /// 鍙戦�侀獙璇佺爜鐨勫惎鍔ㄥ弬鏁�
+        /// </summary>
+        private class SendCodePra
+        {
+            /// <summary>
+            /// 鐢ㄦ埛璐﹀彿
+            /// </summary>
+            public string Account = UserCenterResourse.UserInfo.Phone;
+            /// <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.Phone;
+            /// <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