From 18a7f9f40e5fab3bee5d4ac3d8fd0273dea052d6 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期日, 26 四月 2020 12:05:28 +0800
Subject: [PATCH] 先上传一个非最新的版本
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index 130617e..0c3df7d 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -1,6 +1,5 @@
锘縰sing System;
using Shared.Common;
-using Shared.Phone.Device.DeviceLogic;
using Shared.Phone.UserCenter;
using ZigBee.Device;
@@ -79,8 +78,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 +136,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 +162,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);
@@ -174,13 +175,13 @@
{
//鍙戦�佽幏鍙栨俯搴︾殑鍛戒护
var dev = Common.LocalDevice.Current.GetDevice(room.TemperatrueDevice);
- ReadDeviceAttributeLogic.Instance.SendTemperatureStatuComand(dev);
+ HdlDeviceAttributeLogic.Current.SendTemperatureStatuComand(dev);
}
if (string.IsNullOrEmpty(room.HumidityDevice) == false)
{
- var dev = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
- ReadDeviceAttributeLogic.Instance.SendHumidityStatuComand(dev);
+ var dev = Common.LocalDevice.Current.GetDevice(room.HumidityDevice);
+ HdlDeviceAttributeLogic.Current.SendHumidityStatuComand(dev);
}
roomListBtn = new Button()
--
Gitblit v1.8.0