From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码

---
 ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs |   42 ++++++++++++++++++++++++------------------
 1 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
index f85afd8..fa5caea 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
@@ -62,15 +62,16 @@
             btnArea.TextColor = UserCenterColor.Current.TextGrayColor3;
             btnArea.Gravity = Gravity.CenterVertical;
             frame.AddChidren(btnArea);
-            btnArea.ButtonClickEvent += (sender, e) =>
-            {
-                var form = new AreaCodeSelectForm();
-                form.AddForm();
-                form.FinishSelectEvent += (code) =>
-                {
-                    btnArea.Text = "+" + code;
-                };
-            };
+            //鐩墠鍙拡瀵�+86
+            //btnArea.ButtonClickEvent += (sender, e) =>
+            //{
+            //    var form = new AreaCodeSelectForm();
+            //    form.AddForm();
+            //    form.FinishSelectEvent += (code) =>
+            //    {
+            //        btnArea.Text = "+" + code;
+            //    };
+            //};
 
             //杈撳叆妗�
             var txtValue = new TextInputControl(Application.GetRealWidth(510), frame.Height - ControlCommonResourse.BottomLineHeight, false);
@@ -83,6 +84,8 @@
             btnLine.Y = txtValue.Bottom;
             btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
             frame.AddChidren(btnLine);
+            //鑱斿姩绾跨殑鐘舵��
+            txtValue.btnLine = btnLine;
 
             if (string.IsNullOrEmpty(UserCenterResourse.UserInfo.Phone) == false)
             {
@@ -119,6 +122,7 @@
             btnErrorMsg.Y = Application.GetRealHeight(677);
             btnErrorMsg.TextAlignment = TextAlignment.Center;
             btnErrorMsg.TextColor = 0xfff75858;
+            btnErrorMsg.IsBold = true;
             btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
             bodyFrameLayout.AddChidren(btnErrorMsg);
             btnErrorMsg.Visible = false;
@@ -131,6 +135,9 @@
             btnOk.CanClick = false;
             btnOk.ButtonClickEvent += (sender, e) =>
             {
+                //娓呯┖杈撳叆鐨勫��
+                btnCodeControl.ClearInputValue();
+
                 this.btnErrorMsg.Visible = false;
                 string areaCode = btnArea.Text.Substring(1);
                 //妫�娴嬫墜鏈哄彿鐮�
@@ -164,13 +171,13 @@
         /// <summary>
         /// 鍙戦�侀獙璇佺爜鍒版墜鏈�
         /// </summary>
-        private async void SendCodeToPhone(BottomClickButton btnNext,string areaCode, string phoneNum)
+        private void SendCodeToPhone(BottomClickButton btnNext,string areaCode, string phoneNum)
         {
             var sendCodePra = new SendCodePra();
             sendCodePra.Account = phoneNum;
             sendCodePra.AreaCode = Convert.ToInt32(areaCode);
 
-            bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/RegisterSendVerCode", false, sendCodePra);
+            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/RegisterSendVerCode", false, sendCodePra);
             if (flage == false)
             {
                 return;
@@ -184,8 +191,8 @@
             btnNext.CanClick = false;
             //?s鍚庨噸鍙�
             string repeat = Language.StringByID(R.MyInternationalizationString.RepeatSend1);
-            //鏈夋晥鏃堕棿300绉�
-            int waitime = 300;
+            //鏈夋晥鏃堕棿60绉�
+            int waitime = 60;
             btnNext.Text = waitime + "s" + repeat;
 
             HdlThreadLogic.Current.RunThread(() =>
@@ -196,7 +203,6 @@
                     System.Threading.Thread.Sleep(1000);
                     if (waitime == 0)
                     {
-                        this.canCheckCode = false;
                         Application.RunOnMainThread(() =>
                         {
                             if (btnNext != null)
@@ -228,7 +234,7 @@
         /// 楠岃瘉楠岃瘉鐮�
         /// </summary>
         /// <returns></returns>
-        private async void CheckVerificationCode(string code)
+        private void CheckVerificationCode(string code)
         {
             if (this.canCheckCode == false)
             {
@@ -241,7 +247,7 @@
             checkCodePra.Code = code;
             checkCodePra.Account = newPhone;
 
-            bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
+            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/ValidatorCode", false, checkCodePra);
             if (flage == false)
             {
                 //楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
@@ -257,12 +263,12 @@
         /// <summary>
         /// 鍙樻洿鎵嬫満鍙�
         /// </summary>
-        private async void SaveNewPhoneNumber()
+        private void SaveNewPhoneNumber()
         {
             var pra = new SaveNewPhoneNumPra();
             pra.Account = newPhone;
 
-            bool flage = await UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAccount", false, pra);
+            bool flage = UserCenterLogic.GetResultStatuByRequestHttps("ZigbeeUsers/BindAccount", false, pra);
             if (flage == false)
             {
                 //缁戝畾鎵嬫満澶辫触

--
Gitblit v1.8.0