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/TemperatureSensor.cs | 21 ++++++++++++++++++--- 1 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs index ec02fdb..992f964 100755 --- a/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs +++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs @@ -10,6 +10,15 @@ /// </summary> public int SensorDiv = 1; + /// <summary> + /// 娓╁害 + /// </summary> + public decimal Temperatrue; + /// <summary> + /// 婀垮害 + /// </summary> + public decimal Humidity; + public TemperatureSensor() { this.Type = DeviceType.TemperatureSensor ; @@ -18,10 +27,16 @@ /// <summary> /// 璇诲彇娓�/婀垮害 /// </summary> - public void ReadTemperature() + public void ReadTemperatureOrHumidity() { - ReadAttri(Device.Cluster_ID.TemperatureMeasurement, AttriButeId.MeasuredValue ); - ReadAttri(Device.Cluster_ID.RelativeHumidityMeasurement, AttriButeId.MeasuredValue); + if (SensorDiv == 1) + { + ReadAttri(Device.Cluster_ID.TemperatureMeasurement, AttriButeId.MeasuredValue); + } + else if (SensorDiv == 2) + { + ReadAttri(Device.Cluster_ID.RelativeHumidityMeasurement, AttriButeId.MeasuredValue); + } } } } -- Gitblit v1.8.0