From 50b7b7a486f56fab27c83b59eb45673c6d9f0935 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 24 二月 2021 18:33:57 +0800
Subject: [PATCH] 2021-02-24 1.新增场景上传。2.优化
---
Crabtree/SmartHome/HDL/Common/CommonUtlis.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs b/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs
index 5f543c5..827f722 100644
--- a/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs
+++ b/Crabtree/SmartHome/HDL/Common/CommonUtlis.cs
@@ -649,6 +649,7 @@
/// <summary>
/// 鏈湴Common鍖归厤浜戠鐨凢unctionList 杩斿洖Function
+ /// 鍖归厤瀛愮綉鍙枫�佽澶囧彿銆佸洖璺彿銆佸ぇ绫诲皬绫�
/// </summary>
/// <param name="common">鏈湴璁惧</param>
/// <returns></returns>
@@ -659,7 +660,8 @@
foreach (var function in FunctionList) {
if (common.SubnetID == function.bus.SubnetID &&
common.DeviceID == function.bus.DeviceID &&
- common.LoopID == function.bus.LoopId
+ common.LoopID == function.bus.LoopId &&
+ common.DeviceTypeString == function.DeviceTypeString
) {
return function;
}
--
Gitblit v1.8.0