From de3bc335c02364f1f8eff777e9c1dfa00dabca3b Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 14:23:59 +0800
Subject: [PATCH] 1
---
HDL_ON/Entity/FunctionList.cs | 164 ++++++++++++++++--------------------------------------
1 files changed, 49 insertions(+), 115 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index c5e82f0..c88347c 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -108,123 +108,57 @@
{
if (filePath.StartsWith("FunctionData_"))
{
- //if (filePath.Length == 13 + 28)
- //{
- // var _functionTypeString = filePath.Substring(16 + 13, 4);
- // var ft = (FunctionType)Enum.ToObject(typeof(FunctionType), Convert.ToInt32(_functionTypeString, 16));
- // switch (ft)
- // {
- // case FunctionType.AC:
- // //鎭㈠绌鸿皟鏁版嵁
- // var acDataBytes = FileUtils.ReadFile(filePath);
- // var acString = System.Text.Encoding.UTF8.GetString(acDataBytes);
- // List.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(acString));
- // break;
- // case FunctionType.Relay:
- // case FunctionType.Dimmer:
- // case FunctionType.RGB:
- // //鎭㈠鐏厜鏁版嵁
- // var lightsDataBytes = FileUtils.ReadFile(filePath);
- // var lightsString = System.Text.Encoding.UTF8.GetString(lightsDataBytes);
- // List.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(lightsString));
- // break;
- // case FunctionType.Curtain:
- // case FunctionType.MotorCurtain:
- // case FunctionType.RollingShutter:
- // //鎭㈠绐楀笜鏁版嵁
- // var curtainsDataBytes = FileUtils.ReadFile(filePath);
- // var curtainsString = System.Text.Encoding.UTF8.GetString(curtainsDataBytes);
- // List.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(curtainsString));
- // break;
- // case FunctionType.FloorHeating:
- // //鎭㈠鍦扮儹鏁版嵁
- // var fhDataBytes = FileUtils.ReadFile(filePath);
- // var fhString = System.Text.Encoding.UTF8.GetString(fhDataBytes);
- // List.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(fhString));
- // break;
- // case FunctionType.PM25:
- // case FunctionType.CO2:
- // case FunctionType.TVOC:
- // case FunctionType.Temp:
- // case FunctionType.Humidity:
- // //鎭㈠鐜鏁版嵁
- // var sesDataBytes = FileUtils.ReadFile(filePath);
- // var sesString = System.Text.Encoding.UTF8.GetString(sesDataBytes);
- // List.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(sesString));
- // break;
- // case FunctionType.Socket:
- // //鎭㈠鎻掑骇鏁版嵁
- // var eleDataBytes = FileUtils.ReadFile(filePath);
- // var eleString = System.Text.Encoding.UTF8.GetString(eleDataBytes);
- // List.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(eleString));
- // break;
- // case FunctionType.TV:
- // //鎭㈠鐢佃鏁版嵁
- // var eleDataBytes1 = FileUtils.ReadFile(filePath);
- // var eleString1 = System.Text.Encoding.UTF8.GetString(eleDataBytes1);
- // List.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(eleString1));
- // break;
- // case FunctionType.Fan:
- // //鎭㈠椋庢墖鏁版嵁
- // var eleDataBytes2 = FileUtils.ReadFile(filePath);
- // var eleString2 = System.Text.Encoding.UTF8.GetString(eleDataBytes2);
- // List.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(eleString2));
- // break;
- // }
- //}
- //else//sid闈炴爣鍑嗘儏鍐典笅锛岄�氳繃spk鍔犺浇璁惧
+ var functionDataBytes = FileUtils.ReadFile(filePath);
+ var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
+ var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
+ if (tempFunction.DeleteSign)
{
- var functionDataBytes = FileUtils.ReadFile(filePath);
- var functionDataString = System.Text.Encoding.UTF8.GetString(functionDataBytes);
- var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
- if (tempFunction.DeleteSign)
+ //todo 鍒犻櫎浜戠鏁版嵁 20201203--App涓嶈兘鍒犻櫎鍔熻兘鏁版嵁
+ }
+ else
+ {
+ switch (tempFunction.spk)
{
- //todo 鍒犻櫎浜戠鏁版嵁 20201203--App涓嶈兘鍒犻櫎鍔熻兘鏁版嵁
- }
- else {
- switch (tempFunction.spk)
- {
- case SPK.LightSwitch:
- case SPK.LightDimming:
- case SPK.LightRGB:
- case SPK.LightRGBW:
- case SPK.LightCCT:
- List.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
- break;
- case SPK.CurtainRoller:
- case SPK.CurtainShades:
- case SPK.CurtainSwitch:
- case SPK.CurtainTrietex:
- List.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
- break;
- case SPK.AcStandard:
- List.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
- break;
- case SPK.FloorHeatStandard:
- //鎭㈠鍦扮儹鏁版嵁
- List.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
- break;
- case SPK.SensorPm25:
- case SPK.SensorCO2:
- case SPK.SensorTVOC:
- case SPK.SensorTemperature:
- case SPK.SensorHumidity:
- //鎭㈠鐜鏁版嵁
- List.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
- break;
- case SPK.ElectricSocket:
- //鎭㈠鎻掑骇鏁版嵁
- List.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
- break;
- case SPK.ElectricTV:
- //鎭㈠鐢佃鏁版嵁
- List.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
- break;
- case SPK.ElectricFan:
- //鎭㈠椋庢墖鏁版嵁
- List.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
- break;
- }
+ case SPK.LightSwitch:
+ case SPK.LightDimming:
+ case SPK.LightRGB:
+ case SPK.LightRGBW:
+ case SPK.LightCCT:
+ List.lights.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Light>(functionDataString));
+ break;
+ case SPK.CurtainRoller:
+ case SPK.CurtainShades:
+ case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ List.curtains.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Curtain>(functionDataString));
+ break;
+ case SPK.AcStandard:
+ List.aCs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(functionDataString));
+ break;
+ case SPK.FloorHeatStandard:
+ //鎭㈠鍦扮儹鏁版嵁
+ List.floorHeatings.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<FloorHeating>(functionDataString));
+ break;
+ case SPK.SensorPm25:
+ case SPK.SensorCO2:
+ case SPK.SensorTVOC:
+ case SPK.SensorTemperature:
+ case SPK.SensorHumidity:
+ //鎭㈠鐜鏁版嵁
+ List.sensorsEnvironmentalScience.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Sensor>(functionDataString));
+ break;
+ case SPK.ElectricSocket:
+ //鎭㈠鎻掑骇鏁版嵁
+ List.switchSockets.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<SwitchSocket>(functionDataString));
+ break;
+ case SPK.ElectricTV:
+ //鎭㈠鐢佃鏁版嵁
+ List.tVs.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<TV>(functionDataString));
+ break;
+ case SPK.ElectricFan:
+ //鎭㈠椋庢墖鏁版嵁
+ List.fans.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<Fan>(functionDataString));
+ break;
}
}
}
--
Gitblit v1.8.0