From d8545fbd1b36a6766c57c987e5d89862b470fed9 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 03 九月 2020 09:46:29 +0800
Subject: [PATCH] 2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，Alexa 的场景同样增加通用开关的支持。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
index def27ec..63d65c5 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
@@ -146,8 +146,8 @@
Button btnShowPassword = new Button () {
X = etPasswrod.Right - Application.GetRealWidth (80),
Y = etPasswrod.Y + Application.GetRealHeight (12),
- Width = Application.GetRealWidth (73),
- Height = Application.GetRealHeight (60),
+ Width = Application.GetMinRealAverage (73),
+ Height = Application.GetMinRealAverage (60),
SelectedImagePath = "CrabtreeAdd/ShowPW.png",
UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
BorderColor = SkinStyle.Current.Transparent,
@@ -189,8 +189,8 @@
Button btnShowPassword2 = new Button () {
X = etPasswrod.Right - Application.GetRealWidth (80),
Y = etConfirmPassword.Y + Application.GetRealHeight (12),
- Width = Application.GetRealWidth (73),
- Height = Application.GetRealHeight (60),
+ Width = Application.GetMinRealAverage (73),
+ Height = Application.GetMinRealAverage (60),
SelectedImagePath = "CrabtreeAdd/ShowPW.png",
UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
BorderColor = SkinStyle.Current.Transparent,
@@ -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