From 49add64d7f25448baa06ac5a9ebbeac0a3ae97e0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 13 一月 2020 13:50:29 +0800
Subject: [PATCH] Version 2.50113 1.优化更新。 2.第一次引导或者添加住宅，默认添加2个房间。编辑住宅不处理。 3.设备名超过20字节限制。 4.修复编辑住宅名字重复不提示问题。 5.优化添加住宅逻辑。
---
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..2e4baa7 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);
+ 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);
+ 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 浠ｈˉ鍏�
+ 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