From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
index bc1f4e1..a14d05a 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/EditRoom.cs
@@ -46,9 +46,9 @@
/// </summary>
public int OldIconPathType;
- CommonDevice temperDevice;
+ public CommonDevice temperDevice;
- CommonDevice humidDevice;
+ public CommonDevice humidDevice;
DeviceInfoRow temperatureRow;
@@ -107,7 +107,7 @@
//鏄惁涓哄綋鍓嶈澶�
if ((temperDevice?.DeviceEpoint != common.DeviceEpoint || temperDevice?.DeviceAddr != common.DeviceAddr) && (humidDevice?.DeviceEpoint != common.DeviceEpoint || humidDevice?.DeviceAddr != common.DeviceAddr))
{
- //return;
+ return;
}
//if (common.Type == DeviceType.TemperatureSensor)
@@ -349,6 +349,7 @@
return;
}
room.TemperatrueDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";
+ temperDevice=Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
temperatureRow.SetTitle(R.MyInternationalizationString.Getting);
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(selectTemp);
@@ -358,8 +359,8 @@
{
temperatureRow.SetTitle(room.Temperatrue == 0 ? "--鈩�" : $"{room.Temperatrue}鈩�");
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
- var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
- ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(dev);
+ temperDevice = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
+ ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(temperDevice);
}
else
{
@@ -386,6 +387,7 @@
return;
}
room.HumidityDevice = $"{selectTemp.DeviceAddr}{selectTemp.DeviceEpoint}";
+ humidDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
humidityRow.SetTitle(R.MyInternationalizationString.Getting);
//鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
@@ -396,8 +398,8 @@
{
humidityRow.SetTitle(room.Humidity == 0 ? "--%" : $"{room.Humidity}%");
//鍙戦�佽幏鍙栨箍搴︾殑鍛戒护
- var dev = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
- ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(dev);
+ humidDevice = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
+ ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(humidDevice);
}
else
{
@@ -607,4 +609,4 @@
#endregion
}
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0