From ce1feeeb0aaa2e53bca4e8d64953edaba2b41106 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 19 六月 2020 17:27:49 +0800
Subject: [PATCH] 请合并最新版代码
---
Home0618/Shared/Common/Device.cs | 45 ++-------------------------------------------
1 files changed, 2 insertions(+), 43 deletions(-)
diff --git a/Home0618/Shared/Common/Device.cs b/Home0618/Shared/Common/Device.cs
index fe6502f..07c1b89 100644
--- a/Home0618/Shared/Common/Device.cs
+++ b/Home0618/Shared/Common/Device.cs
@@ -1016,49 +1016,8 @@
});
return list;
- }
-
- /// <summary>
- /// 鏍规嵁MAC鍦板潃,鑾峰彇绠�绾﹂潰鏉垮叏閮ㄥ洖璺殑璁惧瀵硅薄
- /// </summary>
- /// <param name="listDevice"></param>
- /// <returns></returns>
- public List<CommonDevice> GetMutilfunctionPanelByMac(List<CommonDevice> listDevice, bool sort = true)
- {
- //鍜屽姜鍝ャ�佽澶囧拰浜у搧閮ㄥ悓浜嬬‘璁わ細
- //绠�绾﹀鍔熻兘闈㈡澘[涓嶆樉绀哄浣欑殑鍥炶矾锛屽彧鏄剧ず鎼哄甫鐨�2涓户鐢靛櫒鍜�1涓俯婀垮害浼犳劅鍣�
- var list = new List<CommonDevice>();
- foreach (var dev in listDevice)
- {
- if (dev.Type == DeviceType.TemperatureSensor)
- {
- if (dev.DeviceEpoint == 64)
- {
- list.Add(dev);
- }
- }
- else if (dev.Type == DeviceType.OnOffOutput)
- {
- list.Add(dev);
- }
- }
-
- if (sort == false)
- {
- return list;
- }
- list.Sort((obj1, obj2) =>
- {
- if (obj1.DeviceEpoint > obj2.DeviceEpoint)
- {
- return 1;
- }
- return -1;
- });
-
- return list;
- }
-
+ }
+
/// <summary>
/// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勮澶囧璞�(寮哄埗鎺掑簭)
/// </summary>
--
Gitblit v1.8.0