From df9e5fc477609e4d8da98cc7568ae3c887629ec3 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Fri, 5 Feb 2021 17:37:01 +0100 Subject: [PATCH] fix equality test x signal-r degli IO --- .../Listeners/SignalR/SignalRListener.cs | 16 ++++++++-------- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Thermo.Active/Listeners/SignalR/SignalRListener.cs b/Thermo.Active/Listeners/SignalR/SignalRListener.cs index ee78b783..bb86d9d1 100644 --- a/Thermo.Active/Listeners/SignalR/SignalRListener.cs +++ b/Thermo.Active/Listeners/SignalR/SignalRListener.cs @@ -562,7 +562,7 @@ namespace Thermo.Active.Listeners.SignalR { // recupero var element = LastChannelsIoData.DI.Find(x => x.Id == item.Id); - if ((element == null) || (!item.Value.Equals(element))) + if ((element == null) || (!item.Value.Equals(element.Value))) { diffChannelsData.DI.Add(item); } @@ -572,7 +572,7 @@ namespace Thermo.Active.Listeners.SignalR { // recupero var element = LastChannelsIoData.DO.Find(x => x.Id == item.Id); - if ((element == null) || (!item.Value.Equals(element))) + if ((element == null) || (!item.Value.Equals(element.Value))) { diffChannelsData.DO.Add(item); } @@ -582,7 +582,7 @@ namespace Thermo.Active.Listeners.SignalR { // recupero var element = LastChannelsIoData.AI.Find(x => x.Id == item.Id); - if ((element == null) || (!item.Value.Equals(element))) + if ((element == null) || (!item.Value.Equals(element.Value))) { diffChannelsData.AI.Add(item); } @@ -592,7 +592,7 @@ namespace Thermo.Active.Listeners.SignalR { // recupero var element = LastChannelsIoData.AO.Find(x => x.Id == item.Id); - if ((element == null) || (!item.Value.Equals(element))) + if ((element == null) || (!item.Value.Equals(element.Value))) { diffChannelsData.AO.Add(item); } @@ -602,10 +602,10 @@ namespace Thermo.Active.Listeners.SignalR if (diffChannelsData.DI.Count + diffChannelsData.DO.Count + diffChannelsData.AI.Count + diffChannelsData.AO.Count > 0) { // salvo update CLONANDO - LastChannelsIoData.DI = currChannelsIoData.DI.Clone(); - LastChannelsIoData.DO = currChannelsIoData.DO.Clone(); - LastChannelsIoData.AI = currChannelsIoData.AI.Clone(); - LastChannelsIoData.AO = currChannelsIoData.AO.Clone(); + LastChannelsIoData.DI = currChannelsIoData.DI; + LastChannelsIoData.DO = currChannelsIoData.DO; + LastChannelsIoData.AI = currChannelsIoData.AI; + LastChannelsIoData.AO = currChannelsIoData.AO; var context = GlobalHost.ConnectionManager.GetHubContext(); context.Clients.Group("ncData").channelsIoVal(diffChannelsData); } diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 052aea09..5f2eb65b 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -30,4 +30,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.1.156")] +[assembly: AssemblyVersion("1.1.157")]