From 84fa7c9665d9bed9aef79237be9c5eb57c49f13d Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期五, 05 三月 2021 10:54:37 +0800 Subject: [PATCH] Merge branch 'CJL' into ez-test --- HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs b/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs index 84feeb0..8dc9425 100644 --- a/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs +++ b/HDL_ON/UI/UI0-Stan/Logic/HdlDeviceStatuPushLogic.cs @@ -44,13 +44,25 @@ if (localDevice != null) { foreach (var attr in updateData) - { - var localAttr = localDevice.status.Find((obj) => obj.key == attr.key); - if (localAttr != null) - { - //鏇存敼灞炴�у�� - localAttr.value = attr.value; - } + { + 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; } //鍏ㄩ儴鐣岄潰鎺ㄩ�� HdlFormLogic.Current.DeviceStatuPush(localDevice); -- Gitblit v1.8.0