From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 11 一月 2021 16:11:20 +0800 Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善 --- Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs index 54cd864..29af1dc 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/Databackup.cs @@ -311,7 +311,7 @@ //GetUserFolderObj requestObj = new GetUserFolderObj () { LevelID = UserConfig.Instance.CurrentRegion.Id }; var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj); var revertObj = MainPage.RequestHttps (API.GetHomeDataBackupPagger, requestJson, urlHead); - if (revertObj.StateCode.ToUpper () == "SUCCESS") { + if (revertObj.StateCode.ToUpper () == StateCode.SUCCESS) { var data = Newtonsoft.Json.JsonConvert.DeserializeObject<GetBackupListResult> (revertObj.ResponseData.ToString ()); //var list = new List<BackupListNameInfo> (); //foreach (var data2 in data.PageData) { @@ -479,7 +479,7 @@ //DeleteFolderDataObj requestObj = new DeleteFolderDataObj () { Id = folderID }; var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj); var revertObj = MainPage.RequestHttps (API.DelHomeAppGatewayName, requestJson, urlHead); - if (revertObj.StateCode.ToUpper () == "SUCCESS") { + if (revertObj.StateCode.ToUpper () == StateCode.SUCCESS) { Application.RunOnMainThread (() => { DatabackupShow (); }); @@ -522,7 +522,7 @@ //DeleteFolderDataObj requestObj = new DeleteFolderDataObj () { Id = folderID }; var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj); var revertObj = MainPage.RequestHttps (API.DelHomeAppGatewayName, requestJson, urlHead); - if (revertObj.StateCode.ToUpper () == "SUCCESS") { + if (revertObj.StateCode.ToUpper () == StateCode.SUCCESS) { //鍒犻櫎鎴愬姛 } else { //鍒犻櫎澶辫触 @@ -589,7 +589,7 @@ //if (string.IsNullOrEmpty (UserConfig.Instance.GatewayMAC)) return; //2020-01-11 娌$粦瀹歁AC涓嶅厑璁镐笂浼犲浠� - if (!UserConfig.Instance.CheckHomeGateways () || string.IsNullOrEmpty (UserConfig.Instance.CurrentRegion.HomeGateways [0].GatewayUniqueId)) { + if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty()) { MainPage.ShowAlertOnMainThread (ErrorCode.BindGatewayFirst); return; } @@ -609,7 +609,7 @@ //AddFolderObj requestObj = new AddFolderObj () { LevelID = UserConfig.Instance.CurrentRegion.Id ,Name = groupName }; var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj); var revertObj = MainPage.RequestHttps (API.AddHomeAppGatewayName, requestJson, urlHead); - if (revertObj.StateCode.ToUpper () == "SUCCESS") { + if (revertObj.StateCode.ToUpper () == StateCode.SUCCESS) { var DATA = Newtonsoft.Json.JsonConvert.DeserializeObject<AddBackupNameResult> (revertObj.ResponseData.ToString ()); var addFolderID = DATA.BackupClassId; //UpLoadBackupFileToDB (addFolderID); @@ -716,7 +716,7 @@ // //AddUserBackupObj requestObj2 = new AddUserBackupObj () { LevelID = Convert.ToInt32 (revertObj.ResponseData), Name = fileName, DetailByte = IO.FileUtils.ReadFile (fileName) }; // var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (upData); // var revertObj2 = MainPage.RequestHttps (API.UploadHomeAppGatewaySubFiles, requestJson2, urlHead); - // if (revertObj2.StateCode.ToUpper () == "SUCCESS") { + // if (revertObj2.StateCode.ToUpper () == StateCode.SUCCESS) { // //index++; // Application.RunOnMainThread (() => { // int pro = (int)(index * 1.0 / backuplist.Count * 100); @@ -786,7 +786,7 @@ //var requestObj2 = new UserBackupListObj () { LevelID = folderID }; var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj2); var revertObj2 = MainPage.RequestHttps (API.GetHomeDataBackupUploadListPagger, requestJson2, urlHead); - if (revertObj2.StateCode.ToUpper () == "SUCCESS") { + if (revertObj2.StateCode.ToUpper () == StateCode.SUCCESS) { var fileListData = Newtonsoft.Json.JsonConvert.DeserializeObject<LoadBackInfoResult> (revertObj2.ResponseData.ToString ()); var responseDataObj = fileListData.PageData; ////鑾峰彇鏂囦欢鍚嶅瓧 @@ -1061,7 +1061,7 @@ var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (mUpData); var revertObj2 = MainPage.RequestHttps (API.UploadHomeAppGatewaySubFiles, requestJson2, mUrlHead); - if (revertObj2.StateCode.ToUpper () == "SUCCESS") { + if (revertObj2.StateCode.ToUpper () == StateCode.SUCCESS) { return true; } else { //鎻愮ず閿欒 @@ -1193,7 +1193,7 @@ //var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (mUpData); //var revertObj2 = MainPage.RequestHttps (API.UploadHomeAppGatewaySubFiles, requestJson2, mUrlHead); - //if (revertObj2.StateCode.ToUpper () == "SUCCESS") { + //if (revertObj2.StateCode.ToUpper () == StateCode.SUCCESS) { // return true; //} else { // //鎻愮ず閿欒 @@ -1206,7 +1206,7 @@ while (errorCount < 3) { var requestJson2 = Newtonsoft.Json.JsonConvert.SerializeObject (mUpData); var revertObj2 = MainPage.RequestHttps (API.UploadHomeAppGatewaySubFiles, requestJson2, mUrlHead, MainPage.TIME_OUT_20); - if (revertObj2.StateCode.ToUpper () == "SUCCESS") { + if (revertObj2.StateCode.ToUpper () == StateCode.SUCCESS) { result = true; errorCount = 3; } else { -- Gitblit v1.8.0