From 23fb45dd846ed8b62304c408c6bbe64265d4ac8b Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 20 十二月 2019 18:57:16 +0800
Subject: [PATCH] 代码合并
---
ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs | 18 ++----------------
1 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
index 83195f4..c4d180f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
@@ -112,8 +112,8 @@
verticalScrolView.AddChidren(devRow);
devRow.Init();
devRow.SetIcon(device.IconPath);
- devRow.SetName(device.DeviceName);
- devRow.SetZone(room.FloorName + ", " + room.Name);
+ devRow.SetName(Common.LocalDevice.Current.GetDeviceEpointName(device));
+ devRow.SetZone(Common.Room.CurrentRoom.GetRoomNameByDevice(device));
if (tempDevice != null && tempDevice == device)
{
@@ -140,20 +140,6 @@
};
}
- }
-
- /// <summary>
- /// AddItem
- /// </summary>
- /// <param name="vertical"></param>
- public void AddItem(VerticalScrolViewLayout vertical, int y)
- {
- var dev = new DeviceInfoWithZoneRow(y);
- vertical.AddChidren(dev);
- dev.Init();
- dev.SetIcon("DeviceIcon/1.png");
- dev.SetName("婀垮害浼犳劅鍣�" + y);
- dev.SetZone(room.FloorName + ", " + room.Name);
}
/// <summary>
--
Gitblit v1.8.0