From ecba45c93391066bc30c7bd602c3a7683fbb99a7 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 31 七月 2020 10:56:12 +0800
Subject: [PATCH] 临时备份
---
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 34 ++++------------------------------
1 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 7f76b73..6fba6f9 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -46,7 +46,7 @@
{
///鍖哄垎鍑鸿緭鍏ユ潯浠跺拰杈撳嚭鐩爣璁惧
var listdevicetype = GetDevice(type);
- var listdevice = GetDeviceUIList(listAllRoom[i], listdevicetype, type);
+ var listdevice = GetDeviceUIList(listAllRoom[i], listdevicetype);
if (listdevice.Count == 0)
{
///杩囨护鎺夋病鏈夎澶囩殑鎴块棿
@@ -68,9 +68,8 @@
/// </summary>
/// <param name="room">褰撳墠鎴块棿</param>
/// <param name="deviceTypelist">璁惧绫诲瀷</param>
- /// /// <param name="type">閫昏緫绫诲瀷</param>
/// <returns></returns>
- public static List<CommonDevice> GetDeviceUIList(Common.Room room, List<DeviceType> deviceTypelist,string type)
+ public static List<CommonDevice> GetDeviceUIList(Common.Room room, List<DeviceType> deviceTypelist)
{
var deviceUIlist = new List<CommonDevice>();
foreach (var deviceKey in room.ListDevice)
@@ -93,22 +92,6 @@
//鏆傛椂涓嶆敮鎸丼-one闂ㄩ攣;
//杩囨护鎺変笉鏀寔S-one闂ㄩ攣璁惧;
continue;
- }
- }
- if (type == "condition_mould")
- {
- if (device.Type == DeviceType.IASZone)
- {
- if (device.IasDeviceType != 13)
- {//鑷姩鍖栨ā鏉垮彧鏀寔绾㈠浼犳劅鍣�
- continue;
- }
- if (device.ModelIdentifier == "MSPIRB-ZB.10")
- {
- //鑷姩鍖栨ā鏉夸笉鏀寔鍏夌収搴�
- continue;
- }
-
}
}
deviceUIlist.Add(device);
@@ -278,17 +261,8 @@
{
break;
}
-
- if (device.ModelIdentifier == "MSPIRB-ZB.10")
- {
- patm = $"ZigeeLogic/sensor541.png";
- selectedpatm = $"ZigeeLogic/selectedsensor541.png";
- }
- else
- {
- patm = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
- selectedpatm = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
- }
+ patm = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
+ selectedpatm = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
}
break;
case DeviceType.TemperatureSensor:
--
Gitblit v1.8.0