From a5b3c4bae726ef6770d4bfcbf2f4b50a37ed4a15 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 06 三月 2020 15:31:36 +0800
Subject: [PATCH] 删除了郭雪城的 DeviceUi 这个类
---
ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
index 4691908..60d6d8f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
@@ -104,15 +104,25 @@
var deviceList = GetTemperatrueDevices();
for (int i = 0; i < deviceList.Count; i++)
{
+ var fl = new FrameLayout
+ {
+ Height = Application.GetRealHeight(127 + 20),
+ BackgroundColor=ZigbeeColor.Current.GXCBackgroundColor
+ };
+ verticalScrolView.AddChidren(fl);
var device = deviceList[i];
- var devRow = new DeviceInfoWithZoneRow(20 + i * (127 + 20));
- verticalScrolView.AddChidren(devRow);
+ var devRow = new DeviceInfoWithZoneRow(20);
+ fl.AddChidren(devRow);
devRow.Init();
devRow.SetIcon(device.IconPath);
devRow.SetName(Common.LocalDevice.Current.GetDeviceEpointName(device));
- devRow.SetZone(Common.Room.CurrentRoom.GetRoomNameByDevice(device));
+ devRow.SetZone(UserCenter.HdlRoomLogic.Current.GetRoomNameByDevice(device));
+ if (i == deviceList.Count - 1)
+ {
+ devRow.HideLine(true);
+ }
- if(tempDevice!=null && tempDevice==device)
+ if (tempDevice!=null && tempDevice==device)
{
tempDeviceRow = devRow;
tempDevice = device;
--
Gitblit v1.8.0