From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs b/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs
index dfc9099..fca8398 100644
--- a/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs
+++ b/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs
@@ -38,19 +38,34 @@
/// 璁惧鐘舵�佹洿鏂�
/// </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)
- {
- var localAttr = localDevice.attributes.Find((obj) => obj.key == attr.key);
- if (localAttr != null)
- {
- //鏇存敼灞炴�у��
- localAttr.curValue = attr.value;
- }
+ foreach (var attr in updateData)
+ {
+ //var localAttr2 = localDevice.attributes.Find((obj) => obj.key == attr.key);
+ //if (localAttr2 == null)
+ //{
+ // //鏈韩瀹冨氨娌℃湁杩欎釜灞炴��,鍒欎笉澶勭悊
+ // continue;
+ //}
+ ////鏇存敼灞炴�у��
+ //localAttr2.curValue = attr.value;
+
+ //var localAttr = localDevice.status.Find((obj) => obj.key == attr.key);
+ //if (localAttr == null)
+ //{
+ // //status鏄綋鍓嶈澶囦笂鎶ヨ繃鐨勫睘鎬ф墠浼氬瓨鍦�,涔熷氨鏄畠鐨勪釜鏁版湁鍙兘鍜宎ttributes涓嶄竴鑷�
+ // localAttr = new AttributesStatus() { key = attr.key, value = attr.value };
+ // localDevice.status.Add(localAttr);
+ //}
+ ////鏇存敼灞炴�у��
+ //localAttr.value = attr.value;
+
+ localDevice.SetAttrState(attr.key, attr.value);
+
}
//鍏ㄩ儴鐣岄潰鎺ㄩ��
HdlFormLogic.Current.DeviceStatuPush(localDevice);
--
Gitblit v1.8.0