From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 25 十一月 2019 14:30:13 +0800 Subject: [PATCH] 原来的 IOS 工程舍弃(注:没有合并其他组员的代码) --- ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs index ec02fdb..1e01919 100755 --- a/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs +++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/TemperatureSensor.cs @@ -18,10 +18,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