From a4d525d08da7b6fb985b0069c539c11b06306a9b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:28:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
index 55a51f1..c0741b3 100755
--- a/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Room/UnallocatedRoom.cs
@@ -275,7 +275,7 @@
};
functionSceneBodyView.AddChidren(deviceListScrolView);
-
+
tempFunctionTypeBtn = new FunctionButton();
@@ -299,7 +299,7 @@
functionTypeIMG.ClickBtn.MouseUpEventHandler += ShowSameTypeFunction;
-
+
if (deviceType == Shared.Common.Room.AllRoomDeviceUIList[0].CommonDevice.Type)
{
--
Gitblit v1.8.0