From f441a3c49f8b5cedee3e4def6fbb448ef40eb9cb Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 10 六月 2020 14:46:58 +0800
Subject: [PATCH] Crabtree-ON 2020-06-10 基于最新HDL ON 优化问题，Crabtree-ONAPP部分功能同步修改优化调整 1. 增加大图片大文件上传处理. 2.远程连接交互提示，由原来的Loading修改成顶部Tip提示。 3.灯光全开、全关和场景控制多线程发送，和HDLON同样加锁处理。 4.Android ，判断移动网络失败，网络监测修复方法修改，后台前台切换优化。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 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..1e7b07b 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,29 @@
};
}
+
+
+ void ShowErrorInfo (string stateCodeStr)
+ {
+ string mes = "";
+ //2020-01-06 浠ｈˉ鍏�
+ if (stateCodeStr == "AccountExists") {
+ mes = "This account has been registered.";
+ } else if (stateCodeStr == "AccountYesRegisterNoIsverify") {
+ mes = ErrorCode.AccountYesRegisterNoIsverify;
+ } 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