From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomHumiditySetting.cs
index 83195f4..82a4850 100644
--- 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) =>
@@ -107,13 +107,24 @@
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(device.DeviceName);
- devRow.SetZone(room.FloorName + ", " + room.Name);
+ devRow.SetName(Common.LocalDevice.Current.GetDeviceEpointName(device));
+ devRow.SetZone(Common.Room.CurrentRoom.GetRoomNameByDevice(device));
+ if (i == deviceList.Count - 1)
+ {
+ devRow.HideLine(true);
+ }
if (tempDevice != null && tempDevice == device)
{
@@ -140,20 +151,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