From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm
---
ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/PMSensor.cs
index 5cb83ef..a3051f6 100644
--- 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