From 23532fa8ad34c89b6d24b01eaef6475fd0aad898 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 15 四月 2020 18:08:24 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index 130617e..d9e47fd 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -79,8 +79,8 @@
var frameBackGroudTemp = new FrameLayout();
frameBackGroudTemp.Width = roomBackView.Width;
frameBackGroudTemp.Height = roomBackView.Height;
- frameBackGroudTemp.Radius = roomBackView.Radius;
- frameBackGroudTemp.BackgroundColor = 0x12000000;
+ frameBackGroudTemp.Radius = (uint)Application.GetRealHeight(17);
+ frameBackGroudTemp.BackgroundColor = UserCenterColor.Current.PictrueZhezhaoColor;
roomBackView.AddChidren(frameBackGroudTemp);
roomNameBackground = new FrameLayout
@@ -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