From 10b78a1626106f18a6b2f68bd2b8cafd2a99683c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 12 八月 2020 11:31:59 +0800
Subject: [PATCH] 2020-08-12 4.喜爱页面，增加房间场景添加支持。 5.Alexa,添加设备页面增加修改备注功能，点击OK后，增加设备备注名字不匹配然后自动更新操作。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
index 759706c..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,
@@ -265,7 +265,7 @@
var detectionAccountObj = new DetectionAccountObj () { Account = account };
var postJson = Newtonsoft.Json.JsonConvert.SerializeObject (detectionAccountObj);
- var isExistingAccountObj = MainPage.RequestHttps (API.DetectionAccount, postJson, false);
+ var isExistingAccountObj = MainPage.RequestHttps (API.DetectionAccount, postJson);
if (isExistingAccountObj.StateCode == "AccountExists") {
string sssd = "杩欎釜璐﹀彿宸茬粡娉ㄥ唽銆�";
if (Language.CurrentLanguage == "English")
@@ -277,7 +277,7 @@
} else {
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 (API.YdRegisterAccount, requestJson, false);
+ 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 ();
@@ -340,11 +340,12 @@
//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 (() => {
--
Gitblit v1.8.0