From 488efb508eb0648773fe7b68e810e04bcd7ca075 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:15 +0800
Subject: [PATCH] 20201211
---
HDL_ON/Entity/FunctionList.cs | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 06fcf7a..fcc971a 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -18,7 +18,7 @@
{
_FunctionList = new FunctionList();
#region 鎭㈠鏁版嵁
- var filePathList = FileUtils.ReadFiles();
+ var filePathList = Common.FileUtlis.Files.ReadFiles();
foreach (var filePath in filePathList)
{
_FunctionList.IniFunctionList(filePath);
@@ -109,12 +109,12 @@
{
if (filePath.StartsWith("FunctionData_"))
{
- var functionDataBytes = FileUtils.ReadFile(filePath);
+ var functionDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
if (tempFunction == null)
{
- FileUtils.DeleteFile(filePath);
+ Common.FileUtlis.Files.DeleteFile(filePath);
return;
}
if (tempFunction.DeleteSign)
@@ -170,7 +170,7 @@
}
if (filePath.StartsWith("SceneData_"))
{
- var sceneDataBytes = FileUtils.ReadFile(filePath);
+ var sceneDataBytes = Common.FileUtlis.Files.ReadFile(filePath);
var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
List.scenes.Add(tempScene);
@@ -495,12 +495,12 @@
/// </summary>
public void DelAllFunctionData()
{
- var filePathList = FileUtils.ReadFiles();
+ var filePathList = Common.FileUtlis.Files.ReadFiles();
foreach (var filePath in filePathList)
{
if (filePath.StartsWith("FunctionData_") && filePath.Length == 13 + 28)
{
- FileUtils.DeleteFile(filePath);
+ Common.FileUtlis.Files.DeleteFile(filePath);
}
}
_FunctionList = new FunctionList();
@@ -516,7 +516,7 @@
var packCode = pm.DeleteScene(scene.userSceneId);
if (packCode == StateCode.SUCCESS)
{
- FileUtils.DeleteFile(scene.savePath);
+ Common.FileUtlis.Files.DeleteFile(scene.savePath);
List.scenes.Remove(scene);
}
else
@@ -526,7 +526,7 @@
}
else
{
- FileUtils.DeleteFile(scene.savePath);
+ Common.FileUtlis.Files.DeleteFile(scene.savePath);
List.scenes.Remove(scene);
}
}
@@ -573,7 +573,7 @@
_FunctionList.fans.Remove(_FunctionList.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
}
- FileUtils.DeleteFile(delTemp.savePath);
+ Common.FileUtlis.Files.DeleteFile(delTemp.savePath);
}
bool lockReadFunctionStatus = false;
@@ -598,17 +598,29 @@
lockReadFunctionStatus = true;
try
{
- foreach (var function in GetAllDeviceFunctionList())
+ if (DriverLayer.Control.Ins.IsRemote)
{
- switch (function.functionCategory)
+ var functionIds = new List<string>();
+ foreach (var function in GetAllDeviceFunctionList())
{
- case FunctionCategory.Light:
- case FunctionCategory.Electrical:
- case FunctionCategory.SwitchDevice:
- case FunctionCategory.Curtain:
- case FunctionCategory.Thermostat:
- DriverLayer.Control.Ins.SendReadCommand(function);
- break;
+ functionIds.Add(function.deviceId);
+ }
+ DriverLayer.Control.Ins.SendApiReadCommand(functionIds);
+ }
+ else
+ {
+ foreach (var function in GetAllDeviceFunctionList())
+ {
+ switch (function.functionCategory)
+ {
+ case FunctionCategory.Light:
+ case FunctionCategory.Electrical:
+ case FunctionCategory.SwitchDevice:
+ case FunctionCategory.Curtain:
+ case FunctionCategory.Thermostat:
+ DriverLayer.Control.Ins.SendReadCommand(function);
+ break;
+ }
}
}
}
--
Gitblit v1.8.0