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/RoomTemperatureSetting.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
index 01d8174..4691908 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
@@ -90,7 +90,7 @@
};
bodyFrameLayout.AddChidren(verticalScrolView);
- var confirm = new Device.CommonForm.CompleteButton(1700, 700, 127);
+ var confirm = new Device.CommonForm.CompleteButton(1700, 900, 127);
confirm.SetTitle(R.MyInternationalizationString.Save);
AddChidren(confirm);
confirm.MouseUpEventHandler += (sender, e) =>
@@ -101,7 +101,6 @@
selectDeviceAction?.Invoke(tempDevice);
}
};
-
var deviceList = GetTemperatrueDevices();
for (int i = 0; i < deviceList.Count; i++)
{
@@ -110,8 +109,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)
{
--
Gitblit v1.8.0