From 99253403b560f761d5f9af8b4f5140496996433a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十一月 2020 16:49:50 +0800
Subject: [PATCH] 新云端的代码Ver1.0
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index e67d3a3..4bbe8a8 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -53,9 +53,9 @@
this.room = r;
- this.temperDevice = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
+ this.temperDevice = HdlDeviceCommonLogic.Current.GetDevice(room.TemperatrueDevice);
- this.humidDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
+ this.humidDevice = HdlDeviceCommonLogic.Current.GetDevice(room.HumidityDevice);
var roomBackView = new FrameLayout()
{
@@ -137,8 +137,8 @@
TextAlignment = TextAlignment.CenterLeft
};
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() + "鈩�";
}
@@ -163,10 +163,10 @@
TextSize = 14,
TextAlignment = TextAlignment.CenterLeft
};
-
+
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() + "%";
}
@@ -177,13 +177,13 @@
if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
{
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
- var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
+ var dev = HdlDeviceCommonLogic.Current.GetDevice(room.TemperatrueDevice);
HdlDeviceAttributeLogic.Current.SendTemperatureStatuComand(dev);
}
if (string.IsNullOrEmpty(room.HumidityDevice) == false)
{
- var dev = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
+ var dev = HdlDeviceCommonLogic.Current.GetDevice(room.HumidityDevice);
HdlDeviceAttributeLogic.Current.SendHumidityStatuComand(dev);
}
@@ -218,7 +218,7 @@
if (report.DeviceAddr == temperDevice.DeviceAddr && report.DeviceEpoint == temperDevice.DeviceEpoint)
{
HdlThreadLogic.Current.RunMain(() =>
- {
+ {
decimal temperatrue = (decimal)temperDevice.GetType().InvokeMember("currentTemperature", System.Reflection.BindingFlags.GetField, null, temperDevice, null);
if (temperatrue == 0)
{
@@ -237,7 +237,7 @@
if (report.DeviceAddr == humidDevice.DeviceAddr && report.DeviceEpoint == humidDevice.DeviceEpoint)
{
HdlThreadLogic.Current.RunMain(() =>
- {
+ {
decimal humidity = (decimal)humidDevice.GetType().InvokeMember("currentHumidity", System.Reflection.BindingFlags.GetField, null, humidDevice, null);
if (humidity == 0)
{
--
Gitblit v1.8.0