From 26d1cdf2f5246c1ad7890e6740444c4a6a80e6fb Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 11 八月 2020 13:21:10 +0800
Subject: [PATCH] 合并了新代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
index f2dece7..ae70ba4 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
@@ -11,6 +11,20 @@
public PMSensor()
{
this.Type = DeviceType.PMSensor;
- }
+ }
+
+ /// <summary>
+ /// 褰撳墠娓╁害
+ /// </summary>
+ public decimal currentTemperature = 0;
+ /// <summary>
+ /// 褰撳墠婀垮害
+ /// </summary>
+ public decimal currentHumidity = 0;
+ /// <summary>
+ /// 褰撳墠PM2.5鍊�
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int currentPmData = 0;
}
}
--
Gitblit v1.8.0