From 0f6bf2b39fe1d3838c385eee86dc47a2260ad024 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 24 十二月 2019 15:03:52 +0800
Subject: [PATCH] 2019.12.24
---
ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
old mode 100755
new mode 100644
index 83195f4..2c8b49d
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
@@ -91,7 +91,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) =>
@@ -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