From fd3c74df4d30a88d490d0c5b469df821f1bb2d78 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 04 八月 2020 14:53:25 +0800
Subject: [PATCH] 更换新接口之前的备份
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index ee7df2a..e67d3a3 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -136,10 +136,11 @@
TextSize = 14,
TextAlignment = TextAlignment.CenterLeft
};
- if (LocalDevice.Current.GetDevice(room.TemperatrueDevice) != null)
- {
- //杩欎釜璁惧瑕佸瓨鍦ㄦ湰鍦版墠琛�
- temperatureText.Text = room.Temperatrue == 0 ? "0.0鈩�" : room.Temperatrue.ToString() + "鈩�";
+ if (this.temperDevice != null)
+ {
+ //杩欎釜璁惧瑕佸瓨鍦ㄦ湰鍦版墠琛�
+ decimal temperatrue = (decimal)temperDevice.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, temperDevice, null);
+ temperatureText.Text = temperatrue == 0 ? "0.0鈩�" : temperatrue.ToString() + "鈩�";
}
roomTemperatureBackground.AddChidren(temperatureText);
temperatureText.Width = temperatureText.GetTextWidth() + Application.GetRealWidth(60);
@@ -162,10 +163,12 @@
TextSize = 14,
TextAlignment = TextAlignment.CenterLeft
};
- if (LocalDevice.Current.GetDevice(room.HumidityDevice) != null)
- {
- //杩欎釜璁惧瑕佸瓨鍦ㄦ湰鍦版墠琛�
- humidityText.Text = room.Humidity == 0 ? "0.0%" : room.Humidity.ToString() + "%";
+
+ if (this.humidDevice != null)
+ {
+ //杩欎釜璁惧瑕佸瓨鍦ㄦ湰鍦版墠琛�
+ decimal humidity = (decimal)humidDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, humidDevice, null);
+ humidityText.Text = humidity == 0 ? "0.0%" : humidity.ToString() + "%";
}
roomTemperatureBackground.AddChidren(humidityText);
humidityText.Width = humidityText.GetTextWidth() + Application.GetRealWidth(60);
@@ -215,14 +218,15 @@
if (report.DeviceAddr == temperDevice.DeviceAddr && report.DeviceEpoint == temperDevice.DeviceEpoint)
{
HdlThreadLogic.Current.RunMain(() =>
- {
- if (((TemperatureSensor)temperDevice).Temperatrue == 0)
+ {
+ decimal temperatrue = (decimal)temperDevice.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, temperDevice, null);
+ if (temperatrue == 0)
{
temperatureText.Text = "0.0鈩�";
}
else
{
- temperatureText.Text = ((TemperatureSensor)temperDevice).Temperatrue + "鈩�";
+ temperatureText.Text = temperatrue + "鈩�";
}
}, ShowErrorMode.NO);
}
@@ -234,7 +238,7 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- decimal humidity = (decimal)humidDevice.GetType().InvokeMember("Humidity", System.Reflection.BindingFlags.GetField, null, humidDevice, null);
+ decimal humidity = (decimal)humidDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, humidDevice, null);
if (humidity == 0)
{
humidityText.Text = "--%";
--
Gitblit v1.8.0