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 | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs b/ZigbeeApp/Shared/Phone/Device/Room/RoomTemperatureSetting.cs
old mode 100755
new mode 100644
index bccc36e..01d8174
--- 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;
--
Gitblit v1.8.0