From 53189866ba4012fec0b40990fd2281b836fa2668 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 七月 2020 16:29:16 +0800
Subject: [PATCH] 20200701
---
HDL_ON/DriverLayer/CommonPage.cs | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/DriverLayer/CommonPage.cs b/HDL_ON/DriverLayer/CommonPage.cs
index c7f1c2e..9d732f0 100644
--- a/HDL_ON/DriverLayer/CommonPage.cs
+++ b/HDL_ON/DriverLayer/CommonPage.cs
@@ -441,6 +441,13 @@
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);
}
}
@@ -477,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