From b012a9acbe4f8c78a26973d67232cc2856380d71 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 24 十二月 2020 11:06:31 +0800
Subject: [PATCH] 20201224-1
---
HDL_ON/Common/ApiUtlis.cs | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 52a8ac9..c023d17 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -64,7 +64,7 @@
if (MainPage.InternetStatus == 0)
return;
//绾跨▼寮�濮嬫椂闂�
- var endTime = DateTime.Now.AddSeconds(6);
+ var endTime = DateTime.Now.AddSeconds(5);
MainPage.Log($"寮�濮嬪悓姝ヤ簯绔暟鎹�");
@@ -86,6 +86,7 @@
MainPage.Log($"鍒锋柊token澶辫触");
return;
}
+ endTime = DateTime.Now.AddSeconds(5);
MainPage.Log($"鍒锋柊token鎴愬姛");
//===================鍒锋柊浣忓畢淇℃伅=======================
code = Ins.HttpRequest.GetHomePager();
@@ -94,6 +95,7 @@
MainPage.Log($"鍒锋柊浣忓畢淇℃伅澶辫触");
return;
}
+ endTime = DateTime.Now.AddSeconds(5);
MainPage.Log($"鍒锋柊浣忓畢淇℃伅鎴愬姛");
//===================鍒锋柊涓汉淇℃伅=======================
code = Ins.HttpRequest.GetUserInfo();
@@ -102,25 +104,26 @@
MainPage.Log($"鍒锋柊涓汉淇℃伅澶辫触");
return;
}
+ endTime = DateTime.Now.AddSeconds(5);
MainPage.Log($"鍒锋柊涓汉淇℃伅鎴愬姛");
- int count = 0;
- while (count < 10)
- {
- if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
- {
- System.Threading.Thread.Sleep(200);
- }
- else
- {
- break;
- }
- count++;
- }
- if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
- {
- return;
- }
+ //int count = 0;
+ //while (count < 10)
+ //{
+ // if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
+ // {
+ // System.Threading.Thread.Sleep(200);
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // count++;
+ //}
+ //if (DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
+ //{
+ // return;
+ //}
try
@@ -129,6 +132,7 @@
var roomResult = Ins.HttpRequest.GetRoomList();
if (roomResult.Code == StateCode.SUCCESS)
{
+ endTime = DateTime.Now.AddSeconds(100);
MainPage.Log($"璇诲彇鎴块棿淇℃伅鎴愬姛");
var revData = Newtonsoft.Json.JsonConvert.DeserializeObject<SpatialApiPack>(roomResult.Data.ToString());
if (revData == null)
@@ -138,6 +142,7 @@
{
SpatialInfo.CurrentSpatial.UpdateSpatialList(revData.list);
}
+ endTime = DateTime.Now.AddSeconds(5);
}
else
{
@@ -147,6 +152,7 @@
var deviceResult = Ins.HttpRequest.GetDeviceList();
if (deviceResult.Code == StateCode.SUCCESS)
{
+ endTime = DateTime.Now.AddSeconds(100);
MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
if (deviceList == null)
@@ -194,6 +200,7 @@
FunctionList.List.IniFunctionList(newFunction.savePath);
}
}
+ endTime = DateTime.Now.AddSeconds(5);
}
else
{
@@ -204,6 +211,7 @@
var pack = Ins.HttpRequest.GetSceneList();
if (pack.Code == StateCode.SUCCESS)
{
+ endTime = DateTime.Now.AddSeconds(100);
MainPage.Log($"璇诲彇鍦烘櫙鏁版嵁鎴愬姛");
var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
if (sceneList == null)
@@ -233,7 +241,7 @@
localScene.collect = newScene.collect;
localScene.modifyTime = newScene.modifyTime;
localScene.roomIds = newScene.roomIds;
- localScene.SaveSceneData(false);
+ localScene.SaveSceneFile();
}
sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
}
@@ -241,10 +249,30 @@
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
foreach (var newScene in sceneList)
{
- newScene.SaveSceneData(false);
+ newScene.SaveSceneFile();
FunctionList.List.scenes.Add(newScene);
}
}
+ //濡傛灉鏄竴绔彛闇�瑕佹彁鍓嶄笅杞藉満鏅暟鎹紝鍚﹀垯鎺у埗涓嶄簡涓�绔彛鍦烘櫙
+ if (DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ foreach (var tempScene in FunctionList.List.scenes)
+ {
+ var pcak = HttpRequest.GetSceneInfo(tempScene.userSceneId);
+ if (pack.Code == StateCode.SUCCESS)
+ {
+ var serverTempList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
+ var serverTemp = serverTempList.Find((obj) => obj.userSceneId == tempScene.userSceneId);
+ tempScene.functions = serverTemp.functions;
+ tempScene.SaveSceneFile();
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(pack.Code);
+ }
+ }
+ }
+ endTime = DateTime.Now.AddSeconds(5);
}
else
{
--
Gitblit v1.8.0