From 98d002e55304e5c8ff13b7cd195920975bef69f5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 23 二月 2021 17:16:57 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs b/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs
index dfc9099..84feeb0 100644
--- a/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs
+++ b/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs
@@ -38,18 +38,18 @@
/// 璁惧鐘舵�佹洿鏂�
/// </summary>
/// <param name="updateData">浜戠鎺ㄩ�佺殑鏇存柊鏁版嵁</param>
- public Function UpdateDeviceStatu(AlinkControlData updateData)
+ public Function UpdateDeviceStatu(string sId ,List<AttributesStatus> updateData)
{
- var localDevice = FunctionList.List.electricals.Find((obj) => obj.sid == updateData.sid);
+ var localDevice = FunctionList.List.GetDeviceFunctionList().Find((obj) => obj.sid == sId);
if (localDevice != null)
{
- foreach (var attr in updateData.status)
+ foreach (var attr in updateData)
{
- var localAttr = localDevice.attributes.Find((obj) => obj.key == attr.key);
+ var localAttr = localDevice.status.Find((obj) => obj.key == attr.key);
if (localAttr != null)
{
//鏇存敼灞炴�у��
- localAttr.curValue = attr.value;
+ localAttr.value = attr.value;
}
}
//鍏ㄩ儴鐣岄潰鎺ㄩ��
--
Gitblit v1.8.0