From bbc74a6dae2e90a811b2507c5896fe89aa29ccc0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 08 一月 2020 11:30:46 +0800
Subject: [PATCH] 2020-01-08 1.替换新服务器接口。

---
 Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs |   41 +++++++++++++++++++++++++++++++++++------
 1 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
index def27ec..759706c 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
@@ -261,9 +261,12 @@
                         Application.RunOnMainThread (() => {
                             MainPage.Loading.Start ("Please wait...");
                         });
-                        string isExistingAccount = "{\"Account\":\"" + account + "\"}";
-                        var isExistingAccountObj = MainPage.RequestHttps ("IsExistingAccount", isExistingAccount, false);
-                        if (isExistingAccountObj.StateCode == "EXIST") {
+                        //string isExistingAccount = "{\"Account\":\"" + account + "\"}";
+                        var detectionAccountObj = new DetectionAccountObj () { Account = account };
+                        var postJson = Newtonsoft.Json.JsonConvert.SerializeObject (detectionAccountObj);
+                        
+                        var isExistingAccountObj = MainPage.RequestHttps (API.DetectionAccount, postJson, false);
+                        if (isExistingAccountObj.StateCode == "AccountExists") {
                             string sssd = "杩欎釜璐﹀彿宸茬粡娉ㄥ唽銆�";
                             if (Language.CurrentLanguage == "English")
                                 sssd = "This account has been registered.";
@@ -272,15 +275,18 @@
                             });
                             return;
                         } else {
-                            var requestObj = new SignInObj () { Account = account, Password = passwordText, Contact = userName, Language = Language.CurrentLanguage, Company = MainPage.SoftSmsType };
+                            var requestObj = new YdRegisterAccountObj () { Account = account, Password = passwordText, Contact = userName, Language = Language.CurrentLanguage, Company = MainPage.SoftSmsType };
                             var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
-                            var revertObj = MainPage.RequestHttps ("SignIn", requestJson, false);
-                            if (revertObj.StateCode == "SUCCESS") {
+                            var revertObj = MainPage.RequestHttps (API.YdRegisterAccount, requestJson, false);
+                            if (revertObj.StateCode.ToUpper() == "SUCCESS") {
                                 Application.RunOnMainThread (() => {
                                     new Alert ("", Language.StringByID (R.MyInternationalizationString.AuthenticationMail), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                                     Close ();
                                     new AccountLogin (account, passwordText).Show ();
                                 });
+                            } else {
+                                //娉ㄥ唽澶辫触鎻愮ず
+                                ShowErrorInfo (revertObj.StateCode);
                             }
                         }
                     } catch {
@@ -326,5 +332,28 @@
             };
         }
 
+
+
+        void ShowErrorInfo (string stateCodeStr)
+        {
+            string mes = "";
+            //2020-01-06 浠hˉ鍏�
+            if (stateCodeStr == "AccountExists") {
+                mes = "This account has been registered.";
+            } else if (stateCodeStr == ErrorCode.NetworkError) {
+                mes = ErrorCode.NetworkError;
+            } else {
+                mes = ErrorCode.OperationFailed + ErrorCode.Reason + stateCodeStr;
+
+            }
+            if (!string.IsNullOrEmpty (mes)) {
+                Application.RunOnMainThread (() => {
+                    new Alert ("", mes, Language.StringByID (R.MyInternationalizationString.Close)).Show ();
+                });
+            }
+
+
+        }
+
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0