From 6fa9d69da922c8049f5acfcbb9ce9fd26811024c Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 16 四月 2020 17:10:57 +0800
Subject: [PATCH] 请合并代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp20200414/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
similarity index 97%
rename from ZigbeeApp20200414/Shared/Phone/Device/CommonForm/RoomView.cs
rename to ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index 21d6073..d9e47fd 100755
--- a/ZigbeeApp20200414/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -137,8 +137,9 @@
TextSize = 14,
TextAlignment = TextAlignment.CenterLeft
};
- if (string.IsNullOrEmpty(room.TemperatrueDevice) == false)
+ if (LocalDevice.Current.GetDevice(room.TemperatrueDevice) != null)
{
+ //杩欎釜璁惧瑕佸瓨鍦ㄦ湰鍦版墠琛�
temperatureText.Text = room.Temperatrue == 0 ? "0.0鈩�" : room.Temperatrue.ToString() + "鈩�";
}
roomTemperatureBackground.AddChidren(temperatureText);
@@ -162,8 +163,9 @@
TextSize = 14,
TextAlignment = TextAlignment.CenterLeft
};
- if (string.IsNullOrEmpty(room.HumidityDevice) == false)
+ if (LocalDevice.Current.GetDevice(room.HumidityDevice) != null)
{
+ //杩欎釜璁惧瑕佸瓨鍦ㄦ湰鍦版墠琛�
humidityText.Text = room.Humidity == 0 ? "0.0%" : room.Humidity.ToString() + "%";
}
roomTemperatureBackground.AddChidren(humidityText);
--
Gitblit v1.8.0