From 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期二, 21 七月 2020 09:46:53 +0800
Subject: [PATCH] 请合并最新多功能面板代码
---
ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
old mode 100644
new mode 100755
index 5cb83ef..5008025
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
@@ -11,19 +11,22 @@
public PMSensor()
{
this.Type = DeviceType.PMSensor;
- }
-
+ }
+
/// <summary>
/// 褰撳墠娓╁害
/// </summary>
- public int currentTemperature = 0;
+ [Newtonsoft.Json.JsonIgnore]
+ public int currentTemperature = 0;
/// <summary>
/// 褰撳墠婀垮害
/// </summary>
- public int currentHumidity = 0;
+ [Newtonsoft.Json.JsonIgnore]
+ public int currentHumidity = 0;
/// <summary>
/// 褰撳墠PM2.5鍊�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentPmData = 0;
}
}
--
Gitblit v1.8.0