From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4

---
 ZigbeeApp/Shared/Phone/Login/AccountRegister.cs |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs b/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
index c610589..31ad343 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountRegister.cs
@@ -54,7 +54,7 @@
         /// <summary>
         /// 璐﹀彿
         /// </summary>
-        private string account;
+        private string account = string.Empty;
         /// <summary>
         /// OpenID
         /// </summary>
@@ -239,7 +239,7 @@
             codeRow = new CodeForRegisterRowForm();
             codeRow.Init(accountCodeFrameLayout, 29, 530);
             codeRow.VerificationCodeET.TextChangeEventHandler += Code_TextChange;
-            codeRow.SendCodeBtn.MouseUpEventHandler += SendCode_MouseUpEventAsync;
+            codeRow.SendCodeBtn.ButtonClickEvent += SendCode_MouseUpEventAsync;
         }
         #endregion
 
@@ -265,7 +265,7 @@
         ///  </summary>
         /// <param name="sender">Sender.</param>
         /// <param name="mouseEventArgs">The ${ParameterType} instance containing the event data.</param>
-        private async void Register(object sender, MouseEventArgs mouseEventArgs)
+        private void Register(object sender, MouseEventArgs mouseEventArgs)
         {
             if (CheckAccount(account) == false)
             {
@@ -297,7 +297,7 @@
                     AreaCode = int.Parse(CommonPage.PhoneZoneStr)
                 };
                 //楠岃瘉楠岃瘉鐮�
-                var requestRevertObj = await CommonFormResouce.Register(reqDto);
+                var requestRevertObj = CommonFormResouce.Register(reqDto);
                 if (requestRevertObj == null)
                 {
                     CommonPage.Instance.FailureToServer();
@@ -308,7 +308,7 @@
                 {
                     var registerSuccess = new AccountRegisterSuccess();
                     CommonPage.Instance.AddChidren(registerSuccess);
-                    registerSuccess.Show(account, pwdRow.PasswrodET.Text.Trim(), OpenID);
+                    registerSuccess.ShowForm(account, pwdRow.PasswrodET.Text.Trim(), OpenID);
                 }
                 else if (stateCodeStr == "EXIST")
                 {
@@ -375,11 +375,16 @@
             errorBtn.Text = string.Empty;
             if ((sender as EditText).Text.Trim().Length > 0)
             {
-                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
+                if (codeRow.SendCodeBtn.CanClick == false)
+                {
+                    codeRow.SendCodeBtn.CanClick = true;
+                    codeRow.SendCodeBtn.BackgroundColor = 0xFFFC744B;
+                }
             }
             else
             {
-                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
+                codeRow.SendCodeBtn.CanClick = false;
+                codeRow.SendCodeBtn.BackgroundColor = 0xFFFEBCA9;
             }
             account = (sender as EditText).Text.Trim();
         }
@@ -410,7 +415,7 @@
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="mouseEventArgs"></param>
-        private async void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
+        private void SendCode_MouseUpEventAsync(object sender, MouseEventArgs mouseEventArgs)
         {
             if (CheckAccount(account) == false)
             {
@@ -430,7 +435,7 @@
             }
 
             CommonPage.Loading.Start();
-            (sender as Button).Enable = (sender as Button).IsSelected = false;
+            (sender as UserCenter.NormalViewControl).CanClick = false;
             try
             {
                 int companyInt = 0;
@@ -449,10 +454,11 @@
                     AreaCode = int.Parse(CommonPage.PhoneZoneStr),
                     Language = CommonPage.ZigBeeLanguage
                 };
-                var requestRevertObj = await CommonFormResouce.RegisterSendVerCode(reqDto);
+                var requestRevertObj = CommonFormResouce.RegisterSendVerCode(reqDto);
                 if (requestRevertObj == null)
                 {
-                    CommonPage.Instance.FailureToServer();
+                    CommonPage.Instance.FailureToServer();
+                    (sender as UserCenter.NormalViewControl).CanClick = true;
                     return;
                 }
                 var stateCodeStr = requestRevertObj.StateCode.ToUpper();
@@ -461,35 +467,32 @@
                     codeRow.TimeBegin();
                     var alert = new Alert(Language.StringByID(R.MyInternationalizationString.TIP), Language.StringByID(R.MyInternationalizationString.SendVerificationCodeSuccess), Language.StringByID(R.MyInternationalizationString.Confrim));
                     alert.Show();
+                    return;
                 }
-                else if (stateCodeStr == "PARAMETEROREMPTY")
+
+                if (stateCodeStr == "PARAMETEROREMPTY")
                 {
                     //鎻愪緵鐨勫弬鏁伴敊璇�
                     errorBtn.TextID = R.MyInternationalizationString.PARAMETEROREMPTY;
-                    (sender as Button).Enable = (sender as Button).IsSelected = true;
                 }
                 else if (stateCodeStr == "SENDFAIL")
                 {
                     //楠岃瘉鐮佸彂閫佸け璐�
                     errorBtn.TextID = R.MyInternationalizationString.SENDFAIL;
-                    (sender as Button).Enable = (sender as Button).IsSelected = true;
                 }
                 else if (stateCodeStr == "EXIST")
                 {
                     //璐﹀彿瀛樺湪
                     errorBtn.TextID = R.MyInternationalizationString.AccountHasBeenRegistered;
-                    (sender as Button).Enable = (sender as Button).IsSelected = true;
                 }
                 else
                 {
                     errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
-                    (sender as Button).Enable = (sender as Button).IsSelected = true;
                 }
             }
             catch
             {
                 errorBtn.TextID = R.MyInternationalizationString.RequestServerFailed;
-                (sender as Button).Enable = (sender as Button).IsSelected = true;
             }
             finally
             {

--
Gitblit v1.8.0