From 680d96f157e4609af3e7af6f8d01ee0bf3f55063 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 21:11:04 +0800
Subject: [PATCH] 20201210
---
HDL_ON/Entity/FunctionList.cs | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 82 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 22da38f..23f7b2e 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);
@@ -97,7 +97,7 @@
/// <summary>
/// 鍔熻兘鍒楄〃
/// </summary>
- List<Function> deviceFunctionList;
+ List<Function> deviceFunctionList = new List<Function>();
/// <summary>
@@ -109,9 +109,14 @@
{
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)
+ {
+ Common.FileUtlis.Files.DeleteFile(filePath);
+ return;
+ }
if (tempFunction.DeleteSign)
{
//todo 鍒犻櫎浜戠鏁版嵁 20201203--App涓嶈兘鍒犻櫎鍔熻兘鏁版嵁
@@ -126,19 +131,23 @@
case SPK.LightRGBW:
case SPK.LightCCT:
_FunctionList.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
+ deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
break;
case SPK.CurtainRoller:
case SPK.CurtainShades:
case SPK.CurtainSwitch:
case SPK.CurtainTrietex:
_FunctionList.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
+ deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
break;
case SPK.AcStandard:
_FunctionList.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
+ deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
break;
case SPK.FloorHeatStandard:
//鎭㈠鍦扮儹鏁版嵁
_FunctionList.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
+ deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
break;
case SPK.SensorPm25:
case SPK.SensorCO2:
@@ -147,25 +156,29 @@
case SPK.SensorHumidity:
//鎭㈠鐜鏁版嵁
_FunctionList.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
+ deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
break;
case SPK.ElectricSocket:
//鎭㈠鎻掑骇鏁版嵁
_FunctionList.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
+ deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
break;
case SPK.ElectricTV:
//鎭㈠鐢佃鏁版嵁
_FunctionList.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
+ deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
break;
case SPK.ElectricFan:
//鎭㈠椋庢墖鏁版嵁
_FunctionList.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
+ deviceFunctionList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
break;
}
}
}
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);
@@ -183,12 +196,14 @@
return fs;
}
+ //public void
+
/// <summary>
/// 鑾峰彇璁惧鍔熻兘鍒楄〃
/// </summary>
public List<Function> GetAllDeviceFunctionList()
{
- //if (deviceFunctionList == null)
+ if (deviceFunctionList == null || deviceFunctionList.Count == 0)
{
deviceFunctionList = new List<Function>();
deviceFunctionList.AddRange(aCs);
@@ -344,6 +359,24 @@
}
/// <summary>
+ /// 鍔熻兘缁戝畾鎴块棿
+ /// </summary>
+ public string FunctionsBindRooms(List<string> roomIds,List<string> deviceIds)
+ {
+ var pm = new HttpServerRequest();
+ var pack = pm.BindDeviceToRoom(deviceIds, roomIds);
+ if(pack.Code == StateCode.SUCCESS)
+ {
+
+ }
+ else
+ {
+ Utlis.ShowTip(Shared.Language.StringByID(StringId.EditFunctionInfoFail) + "\r\nCode:" + pack.Code);
+ }
+ return pack.Code;
+ }
+
+ /// <summary>
/// 涓嬫潵浜戠璁惧鏁版嵁
/// </summary>
public void DownloadFunctionList()
@@ -357,6 +390,11 @@
var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(pack.Data.ToString());
if (deviceList != null)
{
+ foreach(var serverFunction in deviceList.list)
+ {
+ MainPage.Log($"deviceId:{serverFunction.deviceId}");
+ }
+
////灏嗕笅杞藉埌鍒版暟鎹叏閮ㄤ繚瀛�
//new Thread(() => {
// foreach (var temp in deviceList.list)
@@ -365,8 +403,9 @@
// }
//})
//{ IsBackground = true }.Start();
- foreach (var localFunction in List.GetAllDeviceFunctionList())
+ for (int i =0;i < List.GetAllDeviceFunctionList().Count;)
{
+ var localFunction = List.GetAllDeviceFunctionList()[i];
var newFunction = deviceList.list.Find((obj) => obj.deviceId == localFunction.deviceId);
if (newFunction == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
{
@@ -374,6 +413,7 @@
}
else
{
+ i++;
if (localFunction.modifyTime != newFunction.modifyTime)
{
localFunction.name = newFunction.name;
@@ -393,7 +433,7 @@
List.IniFunctionList(newFunction.savePath);
}
}
- MainPage.Log($"璇诲彇浜戠璁惧鏁版嵁:\r\n{ pack.Data.ToString()}");
+ //MainPage.Log($"璇诲彇浜戠璁惧鏁版嵁:\r\n{ pack.Data.ToString()}");
}
else
{
@@ -414,7 +454,7 @@
var pack = pm.GetSceneList();
if(pack.Code == StateCode.SUCCESS)
{
- MainPage.Log($"璇诲彇浜戠鍦烘櫙鏁版嵁:\r\n{pack.Data.ToString()}");
+ //MainPage.Log($"璇诲彇浜戠鍦烘櫙鏁版嵁:\r\n{pack.Data.ToString()}");
var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
if (sceneList != null)
{
@@ -426,8 +466,9 @@
// }
//})
//{ IsBackground = true }.Start();
- foreach (var localScene in List.scenes)
+ for(int i=0;i<List.scenes.Count;)
{
+ var localScene = List.scenes[i];
var newScene = sceneList.Find((obj) => obj.userSceneId == localScene.userSceneId);
if (newScene == null)//濡傛灉浜戠鏈�鏂版暟鎹病鏈夎鏉℃暟鎹紝鍒欐湰鍦伴渶瑕佸垹鎺夎鏁版嵁璁板綍
{
@@ -435,6 +476,7 @@
}
else
{
+ i++;
if (localScene.modifyTime != newScene.modifyTime)
{
localScene.name = newScene.name;
@@ -468,12 +510,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();
@@ -489,7 +531,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
@@ -499,7 +541,7 @@
}
else
{
- FileUtils.DeleteFile(scene.savePath);
+ Common.FileUtlis.Files.DeleteFile(scene.savePath);
List.scenes.Remove(scene);
}
}
@@ -546,7 +588,12 @@
_FunctionList.fans.Remove(_FunctionList.fans.Find((obj) => obj.deviceId == delTemp.deviceId));
break;
}
- FileUtils.DeleteFile(delTemp.savePath);
+ var removeTemp = deviceFunctionList.Find((obj) => obj.deviceId == delTemp.deviceId);
+ if(removeTemp!= null)
+ {
+ deviceFunctionList.Remove(removeTemp);
+ }
+ Common.FileUtlis.Files.DeleteFile(delTemp.savePath);
}
bool lockReadFunctionStatus = false;
@@ -571,17 +618,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