From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
index bf48c23..01d8174 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();
@@ -112,7 +112,7 @@
devRow.SetIcon(device.IconPath);
devRow.SetName(device.DeviceName);
devRow.SetZone(room.FloorName + ", " + room.Name);
-
+
if(tempDevice!=null && tempDevice==device)
{
tempDeviceRow = devRow;
@@ -139,21 +139,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