From 652243206427f35a256400a149a1734085824cb9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 02 九月 2020 17:35:03 +0800
Subject: [PATCH] 2020-09-02-4
---
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
old mode 100644
new mode 100755
index 8bfa320..0bacf91
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -264,7 +264,7 @@
roomTextButton = roomClickView.roomnameBtn;
roomClickView.roomnameBtn.IsSelected = true;
- var list = Method.GetDeviceUIList(room, deviceTypeList);
+ var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);
AllDeviceTypeView(list);
}
@@ -297,7 +297,7 @@
roomTextButton = roomClickView.roomnameBtn;
roomClickView.roomnameBtn.IsSelected = true;
- var list = Method.GetDeviceUIList(room, deviceTypeList);
+ var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);
AllDeviceTypeView(list);
};
roomClickView.roomnameBtn.MouseUpEventHandler += roomclick;
@@ -414,13 +414,6 @@
if (deviceTypelist.Count != 0 && !deviceTypelist.Contains(common.Type))
{
continue;
- }
- if (IfType == "condition_mould")
- {
- if (common.IasDeviceType != 13)
- {//鑷姩鍖栨ā鏉垮彧鏀寔绾㈠浼犳劅鍣�
- continue;
- }
}
var deviceFramelayout = new FrameLayout
{
--
Gitblit v1.8.0