From 52e317b95d830f8cd1156b403ff5a34fb8f9bccb Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 31 七月 2020 17:43:42 +0800
Subject: [PATCH] 2020-7-31-2
---
HDL_ON/DriverLayer/CommonPage.cs | 121 +++++++++++++++++++++++++++++++++-------
1 files changed, 99 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/DriverLayer/CommonPage.cs b/HDL_ON/DriverLayer/CommonPage.cs
index 8f940e8..07fa7ec 100644
--- a/HDL_ON/DriverLayer/CommonPage.cs
+++ b/HDL_ON/DriverLayer/CommonPage.cs
@@ -211,38 +211,45 @@
case Command.ReadCurtainStutasACK:
foreach (var curtain in DB_ResidenceData.residenceData.functionList.curtains)
{
- if (curtain.GetBusId() == subnetID + "_" + deviceID + "_" + receiveBytes[0])
+ if (curtain.bus_Data.SubnetID == subnetID && curtain.bus_Data.DeviceID == deviceID)
{
- switch(receiveBytes[1])
+ if (receiveBytes[0] == 17)
{
- case 0:
- curtain.on_off = "stop";
- break;
- case 1:
+ if (receiveBytes[1] > 1)
+ {
curtain.on_off = "on";
- curtain.lastState = Language.StringByID(StringId.Open);
- break;
- case 2:
+ }
+ else
+ {
curtain.on_off = "off";
- curtain.lastState = Language.StringByID(StringId.Close);
- break;
- default:
- if (receiveBytes[1] > 1)
- {
+ }
+ curtain.openLevel = receiveBytes[1];
+ curtain.lastState = Language.StringByID(StringId.Open) + curtain.openLevel + "%";
+ }
+ else
+ {
+ if (curtain.bus_Data.LoopID != receiveBytes[0])
+ continue;
+ switch (receiveBytes[1])
+ {
+ case 0:
+ curtain.on_off = "stop";
+ break;
+ case 1:
curtain.on_off = "on";
- }
- else
- {
+ curtain.lastState = Language.StringByID(StringId.Open);
+ break;
+ case 2:
curtain.on_off = "off";
- }
- curtain.openLevel = receiveBytes[1];
- curtain.lastState = Language.StringByID(StringId.Open) + curtain.openLevel + "%";
- break;
+ curtain.lastState = Language.StringByID(StringId.Close);
+ break;
+ }
}
RoomPage.UpdataStates(curtain);
FunctionPage.UpdataStates(curtain);
HomePage.UpdataFunctionStates(curtain);
ClassificationPage.UpdataInfo(curtain);
+ RollingShutterPage.UpdataState(curtain);
switch (curtain.functionType)
{
case FunctionType.Curtain:
@@ -383,6 +390,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 +491,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