From 271faaf6664166dc368639b9f2e577f63f901be5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 22:23:57 +0800
Subject: [PATCH] 20201223-99
---
HDL_ON/Common/ApiUtlis.cs | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 24eac42..52a8ac9 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)
{
}
@@ -131,9 +131,12 @@
{
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);
}
}
else
@@ -146,7 +149,10 @@
{
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 +175,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,7 +190,7 @@
//澶勭悊鍓╀笅鐨勬柊澧炲姛鑳�
foreach (var newFunction in deviceList.list)
{
- newFunction.SaveFunctionData(false);
+ newFunction.SaveFunctionFile();
FunctionList.List.IniFunctionList(newFunction.savePath);
}
}
@@ -199,7 +206,10 @@
{
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;)
{
@@ -305,4 +315,4 @@
{ IsBackground = true }.Start();
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0