From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
index ee2e08c..8fda258 100755
--- a/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/CommonForm/RoomView.cs
@@ -83,7 +83,7 @@
//鏄惁涓哄綋鍓嶈澶�
if ((temperDevice?.DeviceEpoint != common.DeviceEpoint || temperDevice?.DeviceAddr != common.DeviceAddr) && (humidDevice?.DeviceEpoint != common.DeviceEpoint || humidDevice?.DeviceAddr != common.DeviceAddr) )
{
- //return;
+ return;
}
//if (common.Type == DeviceType.TemperatureSensor)
@@ -308,6 +308,8 @@
var editRoom = new Device.Room.EditRoom();
HomePage.Instance.AddChidren(editRoom);
HomePage.Instance.PageIndex += 1;
+ editRoom.temperDevice = this.temperDevice;
+ editRoom.humidDevice = this.humidDevice;
editRoom.Show(room);
editRoom.action += () =>
{
--
Gitblit v1.8.0