合并了新代码

黄学彪

2019-12-12 7e863a33397f317ffc3ffd9288496d0e4f16aa66

 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;