From 2774f5981a93cc6cc6aec22a6409f26889e925b4 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 03 七月 2020 16:36:56 +0800
Subject: [PATCH] 2020-07-03 1.修复修改红外TV模块修改备注出错问题。 2.如果搜索红外模块备注为空默认显示TV+回路号备注。 3.上传红外码指令，直接回路备注数据。4.网关配频模式时，开启自动搜索设备线程，定时3秒发送一次E548命令。
---
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
index 759706c..1e7b07b 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
@@ -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