From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2

---
 HDL_ON/UI/UI1-Login/RegisterPageBLL.cs |  192 ++++++++++++++++++++++++++----------------------
 1 files changed, 104 insertions(+), 88 deletions(-)

diff --git a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
index 06d12ec..d997321 100644
--- a/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/RegisterPageBLL.cs
@@ -366,54 +366,74 @@
         void LoadEvent_GetVerificationCode()
         {
             EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
-            {
-                if ((sender as Button).IsSelected)
-                {
-                    (sender as Button).IsSelected = false;
-                    string account = etAccount.Text.Trim();
-                    //鐭俊鍙戦�侀棿闅�60s
-                    int time = 60;
-                    new Thread(() =>
-                    {
-                        while (time > 0)
-                        {
-                            time--;
-                            Application.RunOnMainThread(() =>
-                            {
-                                (sender as Button).Text = time.ToString() + "s";
-                            });
-                            Thread.Sleep(1000);
-                        }
-                        Application.RunOnMainThread(() =>
-                        {
+           {
+               if ((sender as Button).IsSelected)
+               {
+                   (sender as Button).IsSelected = false;
+                   string account = etAccount.Text.Trim();
+                   //鐭俊鍙戦�侀棿闅�60s
+                   int time = 60;
+                   new Thread(() =>
+                   {
+                       while (time > 0)
+                       {
+                           time--;
+                           Application.RunOnMainThread(() =>
+                           {
+                               (sender as Button).Text = time.ToString() + "s";
+                           });
+                           Thread.Sleep(1000);
+                       }
+                       Application.RunOnMainThread(() =>
+                       {
                            //鍥炲鑾峰彇鐭俊鎸夐挳浜嬩欢
                            (sender as Button).IsSelected = true;
-                            (sender as Button).TextID = StringId.GetVerificationCode;
-                        });
-                    })
-                    { IsBackground = true }.Start();
-                    new Thread(() =>
-                    {
-                        ResponsePackNew resultObj;
-                        // 鑾峰彇楠岃瘉鐮�
-                        if (registerType == 1)//閭
-                        {
-                             resultObj = pm.VerificationCodeSend(VerifyType.REGISTER, account);
-                        }
-                        else
-                        {
-                             resultObj = pm.VerificationCodeSend(VerifyType.REGISTER, account, true, phoneZoneCode);
-                        }
-
-                        if (resultObj.Code != HttpUtil.SUCCESS_CODE)
-                        {
-                           // 鎻愮ず閿欒
-                           IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Verification_Send, resultObj.Code);
-                        }
-                    })
-                    { IsBackground = true }.Start();
-                }
-            };
+                           (sender as Button).TextID = StringId.GetVerificationCode;
+                       });
+                   })
+                   { IsBackground = true }.Start();
+                   new Thread(() =>
+                   {
+                       //鑾峰彇楠岃瘉鐮�
+                       var result = pm.GetRegisterVerCode(account);
+                       if (result.StateCode.ToUpper() == "SUCCESS")
+                       {
+                       }
+                       else
+                       {
+                           string tipString = "Server error";
+                           switch (result.StateCode)
+                           {
+                               case "Exist":
+                                   tipString = Language.StringByID(StringId.AccountAlreadyUse);
+                                   break;
+                               case "SendFail":
+                                   tipString = Language.StringByID(StringId.FailedToSendVerificationCode);
+                                   break;
+                               case "Self:Net_Error":
+                                   tipString = Language.StringByID(StringId.NetworkAnomaly);
+                                   break;
+                               case "ParameterOrEmpty":
+                                   if (registerType == 0)
+                                       tipString = Language.StringByID(StringId.PlsEntryCorrectMobilNeumber);
+                                   else
+                                       tipString = Language.StringByID(StringId.PlsEntryCorrectEmailAddress);
+                                   break;
+                           }
+                           Application.RunOnMainThread(() =>
+                           {
+                               new Tip()
+                               {
+                                   CloseTime = 1,
+                                   Direction = AMPopTipDirection.None,
+                                   Text = tipString
+                               }.Show(bodyView);
+                           });
+                       }
+                   })
+                   { IsBackground = true }.Start();
+               }
+           };
 
             btnGetVerificationCode_Phone.MouseDownEventHandler = eventHandler;
             btnGetVerificationCode_Mail.MouseDownEventHandler = eventHandler;
@@ -457,10 +477,10 @@
             {
                 try
                 {
-                    //鏍¢獙楠岃瘉鐮佸苟娉ㄥ唽璐﹀彿
-                    var isPhone = registerType == 0;
-                    var validateSmsResult = pm.ValidataCodeAndRegister(account, password, verCode, isPhone);
-                    if (validateSmsResult.Code == HttpUtil.SUCCESS_CODE)
+                    //鏍¢獙楠岃瘉鐮�/娉ㄥ唽璐﹀彿
+                    var validateSmsResult = pm.ValidataCodeAndRegister(account, password, entryPassword, verCode, 86);
+                    //楠岃瘉鐮佹牎楠屾垚鍔�
+                    if (validateSmsResult.StateCode.ToUpper() == "SUCCESS")
                     {
                         //娉ㄥ唽鎴愬姛
                         //鎵ц鍥炶皟浜嬩欢
@@ -471,45 +491,41 @@
                             LoadEvent_AutoLogin(account, password);
                         });
                     }
-                    else// 娉ㄥ唽澶辫触
+                    else//娉ㄥ唽澶辫触
                     {
-                        // 鎻愮ず閿欒
-                        IMessageCommon.Current.ShowErrorInfoAlter(NewAPI.API_POST_Member_Register, validateSmsResult.Code);
-
-                        //2020-11-13 寰呬慨鏀�
-                        //string erorrInfo = "";
-                        //switch (validateSmsResult.StateCode)
-                        //{
-                        //    case "Exist":
-                        //        erorrInfo = Language.StringByID(StringId.AccountAlreadyUse);
-                        //        break;
-                        //    case "PwdNoConfirm":
-                        //        erorrInfo = Language.StringByID(StringId.IncorrectRepeatPassword);
-                        //        break;
-                        //    case "ValidCodeAndPhoneNoEqual":
-                        //        erorrInfo = Language.StringByID(StringId.VerificationCodeWrong);
-                        //        break;
-                        //    case "NoRecord":
-                        //        erorrInfo = Language.StringByID(StringId.PlsGetTheVerificationCode);
-                        //        Application.RunOnMainThread(() =>
-                        //        {
-                        //            btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
-                        //            btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(2);
-                        //        });
-                        //        break;
-                        //    default:
-                        //        erorrInfo = Language.StringByID(StringId.RegistrationFailedPleaseTryAgain);
-                        //        break;
-                        //}
-                        //Application.RunOnMainThread(() =>
-                        //{
-                        //    new Tip()
-                        //    {
-                        //        CloseTime = 1,
-                        //        Direction = AMPopTipDirection.None,
-                        //        Text = erorrInfo,
-                        //    }.Show(bodyView);
-                        //});
+                        string erorrInfo = "";
+                        switch (validateSmsResult.StateCode)
+                        {
+                            case "Exist":
+                                erorrInfo = Language.StringByID(StringId.AccountAlreadyUse);
+                                break;
+                            case "PwdNoConfirm":
+                                erorrInfo = Language.StringByID(StringId.IncorrectRepeatPassword);
+                                break;
+                            case "ValidCodeAndPhoneNoEqual":
+                                erorrInfo = Language.StringByID(StringId.VerificationCodeWrong);
+                                break;
+                            case "NoRecord":
+                                erorrInfo = Language.StringByID(StringId.PlsGetTheVerificationCode);
+                                Application.RunOnMainThread(() =>
+                                {
+                                    btnVerificationCodeViewBottomLine.BackgroundColor = CSS_Color.AuxiliaryColor2;
+                                    btnVerificationCodeViewBottomLine.Height = Application.GetRealHeight(2);
+                                });
+                                break;
+                            default:
+                                erorrInfo = Language.StringByID(StringId.RegistrationFailedPleaseTryAgain);
+                                break;
+                        }
+                        Application.RunOnMainThread(() =>
+                        {
+                            new Tip()
+                            {
+                                CloseTime = 1,
+                                Direction = AMPopTipDirection.None,
+                                Text = erorrInfo,
+                            }.Show(bodyView);
+                        });
                     }
                 }
                 catch (Exception ex)

--
Gitblit v1.8.0