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/RoomTemperatureSetting.cs | 57 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
index bf48c23..d47fa9d 100644
--- a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
@@ -47,7 +47,7 @@
public void Show(Shared.Common.Room r)
{
room = r;
-
+
AddTop();
AddBodyView();
@@ -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,19 +101,28 @@
selectDeviceAction?.Invoke(tempDevice);
}
};
-
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(device.DeviceName);
- devRow.SetZone(room.FloorName + ", " + room.Name);
-
- if(tempDevice!=null && tempDevice==device)
+ 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)
{
tempDeviceRow = devRow;
tempDevice = device;
@@ -139,21 +148,21 @@
}
}
- /// <summary>
- /// 娓╁害浼犳劅鍣ㄥ垪琛�
- /// </summary>
- private List<ZigBee.Device.CommonDevice> GetTemperatrueDevices()
- {
- var listDevice = new List<ZigBee.Device.CommonDevice>();
- foreach (var device in Common.LocalDevice.Current.listAllDevice)
- {
- //鑾峰彇娓╁害浼犳劅鍣�
- if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)
- {
- listDevice.Add(device);
- }
- }
- return listDevice;
+ /// <summary>
+ /// 娓╁害浼犳劅鍣ㄥ垪琛�
+ /// </summary>
+ private List<ZigBee.Device.CommonDevice> GetTemperatrueDevices()
+ {
+ var listDevice = new List<ZigBee.Device.CommonDevice>();
+ foreach (var device in Common.LocalDevice.Current.listAllDevice)
+ {
+ //鑾峰彇娓╁害浼犳劅鍣�
+ if (device is ZigBee.Device.TemperatureSensor && ((ZigBee.Device.TemperatureSensor)device).SensorDiv == 1)
+ {
+ listDevice.Add(device);
+ }
+ }
+ return listDevice;
}
#endregion
--
Gitblit v1.8.0