From 23c075a9c27946773feccf05abc90489a6bf5203 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 06 七月 2020 15:58:53 +0800
Subject: [PATCH] 20200706
---
HDL_ON/DriverLayer/CommonPage.cs | 72 +++++++++++++++++++++++++++++++++++
1 files changed, 71 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DriverLayer/CommonPage.cs b/HDL_ON/DriverLayer/CommonPage.cs
index 8f940e8..9d732f0 100644
--- a/HDL_ON/DriverLayer/CommonPage.cs
+++ b/HDL_ON/DriverLayer/CommonPage.cs
@@ -383,6 +383,76 @@
}
}
break;
+ case Command.ReadDeviceLoopInfoACK:
+ FunctionType dt = (FunctionType)(11 * 256 + receiveBytes[1]);
+ string tag = receiveBytes[1] + "_" + subnetID + "_" + deviceID + "_" + receiveBytes[2];
+
+ foreach (var sensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
+ {
+ if (sensor.bus_Data != null)
+ {
+ if ((int)sensor.functionType % 256 == receiveBytes[1] && sensor.bus_Data.SubnetID == subnetID &&
+ sensor.bus_Data.DeviceID == deviceID && sensor.bus_Data.LoopID == receiveBytes[2])
+ {
+ switch (dt)
+ {
+ case FunctionType.Temp:
+ byte[] tempBytes = new byte[] { receiveBytes[24], receiveBytes[25], receiveBytes[26], receiveBytes[27] };
+ sensor.values = Math.Round(BitConverter.ToSingle(tempBytes, 0), 1);
+ break;
+ case FunctionType.Humidity:
+ sensor.values = Convert.ToDouble(receiveBytes[24] * 256 + receiveBytes[25]) / 10;
+ break;
+ case FunctionType.TVOC:
+ sensor.values = Convert.ToDouble(receiveBytes[24] * 256 + receiveBytes[25]) / 100;
+ break;
+ case FunctionType.PM25:
+ sensor.values = Convert.ToInt32(receiveBytes[24] * 256 + receiveBytes[25]);
+ break;
+ case FunctionType.CO2:
+ sensor.values = Convert.ToInt32(receiveBytes[24] * 256 + receiveBytes[25]);
+ break;
+ }
+ EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
+ }
+ }
+ }
+ break;
+ case Command.New_Analog_Quantity_BROADCAST:
+ string tag1 = receiveBytes[1] + "_" + subnetID + "_" + deviceID + "_" + receiveBytes[2];
+ foreach (var sensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
+ {
+ if (sensor.bus_Data != null)
+ {
+ if ((int)sensor.functionType % 256 == receiveBytes[1] && sensor.bus_Data.SubnetID == subnetID &&
+ sensor.bus_Data.DeviceID == deviceID && sensor.bus_Data.LoopID == receiveBytes[2])
+ {
+ //0淇濈暀 1鏃犵鍙�4Byte鏁村舰 2鏈夌鍙�4Byte鏁村舰 3Float褰紙浠Ｂ憋級
+ switch (receiveBytes[3])
+ {
+ case 1:
+ sensor.values = (receiveBytes[5]*256 * 256 * 256)+ (receiveBytes[6] * 256 * 256)+ (receiveBytes[7] * 256)+ receiveBytes[8];
+ break;
+ case 2:
+ sensor.values = -1 * ((receiveBytes[5] * 256 * 256 * 256) + (receiveBytes[6] * 256 * 256) + (receiveBytes[7] * 256) + receiveBytes[8]);
+ break;
+ case 3:
+ byte[] tempBytes = new byte[] { receiveBytes[5], receiveBytes[6], receiveBytes[7], receiveBytes[8] };
+ sensor.values = Math.Round(BitConverter.ToSingle(tempBytes, 0), 1);
+ break;
+ }
+ switch (receiveBytes[4])
+ {
+ case 2:
+ if (receiveBytes[1] == 5)//TVOC闇�姹傞櫎浠�100000
+ sensor.values /= 100000;
+ break;
+ }
+ EnvironmentalSciencePage.LoadEvent_UpdataStatus(sensor);
+ }
+ }
+ }
+ break;
}
}
catch (Exception ex)
@@ -414,7 +484,7 @@
string tempFileName = nameValueCollection["Command"].Replace("Get", "");
if ("AllFiles" == tempFileName)
{
- byte[] bytes = Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(FileUtils.ReadFiles()));
+ byte[] bytes = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(FileUtils.ReadFiles()));
outputStream.Write(bytes, 0, bytes.Length);
outputStream.Flush();
}
--
Gitblit v1.8.0