diff --git a/IOB-UT-NEXT/Config/Base/AlarmDto.cs b/IOB-UT-NEXT/Config/Base/AlarmDto.cs index deb05245..2a52e6d2 100644 --- a/IOB-UT-NEXT/Config/Base/AlarmDto.cs +++ b/IOB-UT-NEXT/Config/Base/AlarmDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -using static IOB_UT_NEXT.BaseAlarmConf; +using static IOB_UT_NEXT.Config.BaseAlarmConf; namespace IOB_UT_NEXT.Config.Base { diff --git a/IOB-UT-NEXT/IniFile.cs b/IOB-UT-NEXT/Config/IniFile.cs similarity index 99% rename from IOB-UT-NEXT/IniFile.cs rename to IOB-UT-NEXT/Config/IniFile.cs index 66114c6a..7675e142 100644 --- a/IOB-UT-NEXT/IniFile.cs +++ b/IOB-UT-NEXT/Config/IniFile.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Runtime.InteropServices; using System.Text; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Config { /// /// Create a new INI file to store or load data diff --git a/IOB-UT-NEXT/Config/IobConfTree.cs b/IOB-UT-NEXT/Config/IobConfTree.cs index c92faadb..62f30ff3 100644 --- a/IOB-UT-NEXT/Config/IobConfTree.cs +++ b/IOB-UT-NEXT/Config/IobConfTree.cs @@ -17,7 +17,7 @@ using System.Runtime.InteropServices.ComTypes; using System.Threading; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; -using static IOB_UT_NEXT.BaseAlarmConf; +using static IOB_UT_NEXT.Config.BaseAlarmConf; using static IOB_UT_NEXT.Config.EnumConf; using static System.Net.Mime.MediaTypeNames; diff --git a/IOB-UT-NEXT/ToMapo.cs b/IOB-UT-NEXT/Config/ToMapo.cs similarity index 99% rename from IOB-UT-NEXT/ToMapo.cs rename to IOB-UT-NEXT/Config/ToMapo.cs index cd5d82d8..34b333a0 100644 --- a/IOB-UT-NEXT/ToMapo.cs +++ b/IOB-UT-NEXT/Config/ToMapo.cs @@ -2,9 +2,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Converters; using System.Collections.Generic; -using System; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Config { /// /// Classe gestione configurazione parametri di base x allarmi diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj index ea3f7698..b1820939 100644 --- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj +++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj @@ -194,7 +194,7 @@ - + @@ -214,7 +214,7 @@ - + diff --git a/IOB-UT-NEXT/Iob/BaseObj.cs b/IOB-UT-NEXT/Iob/BaseObj.cs index 43c3f59f..46b08ee8 100644 --- a/IOB-UT-NEXT/Iob/BaseObj.cs +++ b/IOB-UT-NEXT/Iob/BaseObj.cs @@ -9,9 +9,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using System.Net.NetworkInformation; -using System.Threading; -using System.Threading.Tasks; -using static IOB_UT_NEXT.BaseAlarmConf; +using static IOB_UT_NEXT.Config.BaseAlarmConf; namespace IOB_UT_NEXT.Iob { diff --git a/IOB-WIN-FORM/Iob/BaseObj.cs b/IOB-WIN-FORM/Iob/BaseObj.cs index 938c072e..1fb37ed3 100644 --- a/IOB-WIN-FORM/Iob/BaseObj.cs +++ b/IOB-WIN-FORM/Iob/BaseObj.cs @@ -1,12 +1,6 @@ using IOB_UT_NEXT; using NLog; using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Net.NetworkInformation; -using System.Threading; -using static IOB_UT_NEXT.BaseAlarmConf; namespace IOB_WIN_FORM.Iob { diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs index e303c497..29da454e 100644 --- a/IOB-WIN-FORM/Iob/Generic.cs +++ b/IOB-WIN-FORM/Iob/Generic.cs @@ -30,7 +30,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using System.Threading.Tasks; using System.Windows.Forms; -using static IOB_UT_NEXT.BaseAlarmConf; +using static IOB_UT_NEXT.Config.BaseAlarmConf; using static IOB_UT_NEXT.CustomObj; using static IOB_UT_NEXT.DataModel.Fimat; using static MapoSDK.WharehouseData; @@ -3216,7 +3216,7 @@ namespace IOB_WIN_FORM.Iob } } - string rawData = JsonConvert.SerializeObject(ActiveAlarmList); + string rawData = JsonSerialize(ActiveAlarmList); string resp = HttpService.CallUrlPost(lastUrl, rawData); //string resp = HttpService.CallUrlAsync(lastUrl, rawData); if (resp != null)