From 22fcd0d263770c8371bd03ca53f097a6ec1678f7 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 24 十二月 2020 12:06:26 +0800
Subject: [PATCH] 20201224-2
---
HDL_ON/Common/ApiUtlis.cs | 104 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 24eac42..8b144ce 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -19,7 +19,7 @@
{
get
{
- if(apiUtlis == null)
+ if (apiUtlis == null)
{
apiUtlis = new ApiUtlis();
}
@@ -33,7 +33,7 @@
{
get
{
- if(httpRequest == null)
+ if (httpRequest == null)
{
httpRequest = new HttpServerRequest();
}
@@ -47,7 +47,7 @@
{
bool result = DB_ResidenceData.Instance.HomeGateway.gatewayStatus;
- if(!result)
+ if (!result)
{
}
@@ -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,12 +132,17 @@
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)
+ if (revData == null)
{
- SpatialInfo.CurrentSpatial.UpdateSpatialList(revData.list, OptionType.Cover);
+ revData = new SpatialApiPack();
}
+ {
+ SpatialInfo.CurrentSpatial.UpdateSpatialList(revData.list);
+ }
+ endTime = DateTime.Now.AddSeconds(5);
}
else
{
@@ -144,9 +152,13 @@
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)
+ if (deviceList == null)
+ {
+ deviceList = new DevcieApiPack();
+ }
{
if (FunctionList.List.GetDeviceFunctionList().Count > 0)
{
@@ -169,12 +181,13 @@
i++;
if (localFunction.modifyTime != newFunction.modifyTime)
{
+ //鍙紭鍖�
localFunction.name = newFunction.name;
localFunction.collect = newFunction.collect;
localFunction.modifyTime = newFunction.modifyTime;
localFunction.roomIds = newFunction.roomIds;
localFunction.bus = newFunction.bus;
- localFunction.SaveFunctionData(false);
+ localFunction.SaveFunctionFile();
}
deviceList.list.Remove(newFunction);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
}
@@ -183,10 +196,11 @@
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
foreach (var newFunction in deviceList.list)
{
- newFunction.SaveFunctionData(false);
+ newFunction.SaveFunctionFile();
FunctionList.List.IniFunctionList(newFunction.savePath);
}
}
+ endTime = DateTime.Now.AddSeconds(5);
}
else
{
@@ -197,10 +211,12 @@
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)
+ if (sceneList == null)
{
+ sceneList = new List<Scene>();
for (int i = 0; i < FunctionList.List.scenes.Count;)
{
var localScene = FunctionList.List.scenes[i];
@@ -223,7 +239,7 @@
localScene.collect = newScene.collect;
localScene.modifyTime = newScene.modifyTime;
localScene.roomIds = newScene.roomIds;
- localScene.SaveSceneData(false);
+ localScene.SaveSceneFile();
}
sceneList.Remove(newScene);//鎿嶄綔瀹岀殑鏁版嵁娓呯悊鎺夛紝鍓╀笅鐨勫氨鏄柊澧炵殑鍔熻兘
}
@@ -231,10 +247,38 @@
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
foreach (var newScene in sceneList)
{
- newScene.SaveSceneData(false);
+ newScene.SaveSceneFile();
FunctionList.List.scenes.Add(newScene);
}
}
+ //濡傛灉鏄竴绔彛闇�瑕佹彁鍓嶄笅杞藉満鏅暟鎹紝鍚﹀垯鎺у埗涓嶄簡涓�绔彛鍦烘櫙
+ if (DB_ResidenceData.Instance.GatewayType == 0)
+ {
+ var sceneIds = new List<string>();
+ foreach (var tempScene in FunctionList.List.scenes)
+ {
+ sceneIds.Add(tempScene.userSceneId);
+ }
+ var packInfo = HttpRequest.GetSceneListInfo(sceneIds);
+ if (packInfo.Code == StateCode.SUCCESS)
+ {
+ var serverTempList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(packInfo.Data.ToString());
+ foreach (var localScene in FunctionList.List.scenes)
+ {
+ var serverTemp = serverTempList.Find((obj) => obj.userSceneId == localScene.userSceneId);
+ if (serverTemp != null)
+ {
+ localScene.functions = serverTemp.functions;
+ localScene.SaveSceneFile();
+ }
+ }
+ }
+ else
+ {
+ IMessageCommon.Current.ShowErrorInfoAlter(packInfo.Code);
+ }
+ }
+ endTime = DateTime.Now.AddSeconds(5);
}
else
{
@@ -305,4 +349,4 @@
{ IsBackground = true }.Start();
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0