Ancora spostamento servizi base

IOB-UT-NEXT/Config/IobConfTree.cs

@@ -1,7 +1,7 @@
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Base;
 using IOB_UT_NEXT.Config.Special;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;
 using NLog;

IOB-UT-NEXT/IOB-UT-NEXT.csproj

@@ -202,10 +202,10 @@
     <Compile Include="iobRefreshedEventArgs.cs" />
     <Compile Include="IobWinStatus.cs" />
     <Compile Include="Iob\BaseObj.cs" />
-    <Compile Include="Services\DataSerializer.cs" />
-    <Compile Include="Services\HttpService.cs" />
-    <Compile Include="Services\NetService.cs" />
-    <Compile Include="Services\XmlDataSerializer.cs" />
+    <Compile Include="Services\Data\DataSerializer.cs" />
+    <Compile Include="Services\Networking\HttpService.cs" />
+    <Compile Include="Services\Networking\NetService.cs" />
+    <Compile Include="Services\Data\XmlDataSerializer.cs" />
     <Compile Include="JobTask2Exe.cs" />
     <Compile Include="MeasureUtils.cs" />
     <Compile Include="plcMemMapExt.cs" />
@@ -249,7 +249,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Services\Core\" />
+    <Folder Include="Services\Files\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets" Condition="Exists('..\packages\System.ValueTuple.4.6.2\build\net471\System.ValueTuple.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

IOB-UT-NEXT/Iob/BaseObj.cs

@@ -593,22 +593,22 @@ namespace IOB_UT_NEXT.Iob
         /// <summary>
         /// Serializza un oggetto in formato JSON.
         /// </summary>
-        protected string JsonSerialize<T>(T obj) => IOB_UT_NEXT.Services.DataSerializer.Serialize(obj);
+        protected string JsonSerialize<T>(T obj) => IOB_UT_NEXT.Services.Data.DataSerializer.Serialize(obj);
 
         /// <summary>
         /// Deserializza una stringa JSON in un oggetto.
         /// </summary>
-        protected T JsonDeserialize<T>(string json) => IOB_UT_NEXT.Services.DataSerializer.Deserialize<T>(json);
+        protected T JsonDeserialize<T>(string json) => IOB_UT_NEXT.Services.Data.DataSerializer.Deserialize<T>(json);
 
         /// <summary>
         /// Serializza un oggetto in formato XML.
         /// </summary>
-        protected string XmlSerialize<T>(T obj) => IOB_UT_NEXT.Services.XmlDataSerializer.Serialize(obj);
+        protected string XmlSerialize<T>(T obj) => IOB_UT_NEXT.Services.Data.XmlDataSerializer.Serialize(obj);
 
         /// <summary>
         /// Deserializza una stringa XML in un oggetto.
         /// </summary>
-        protected T XmlDeserialize<T>(string xml) => IOB_UT_NEXT.Services.XmlDataSerializer.Deserialize<T>(xml);
+        protected T XmlDeserialize<T>(string xml) => IOB_UT_NEXT.Services.Data.XmlDataSerializer.Deserialize<T>(xml);
 
         #endregion Protected Serialization Helpers
 

IOB-UT-NEXT/Services/Data/DataSerializer.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using Newtonsoft.Json;
 
-namespace IOB_UT_NEXT.Services
+namespace IOB_UT_NEXT.Services.Data
 {
     /// <summary>
     /// Gestisce tutte le operazioni di serializzazione e deserializzazione dei dati.

IOB-UT-NEXT/Services/Data/XmlDataSerializer.cs

@@ -2,7 +2,7 @@ using System;
 using System.IO;
 using System.Xml.Serialization;
 
-namespace IOB_UT_NEXT.Services
+namespace IOB_UT_NEXT.Services.Data
 {
     /// <summary>
     /// Gestisce le operazioni di serializzazione e deserializzazione in formato XML.

IOB-UT-NEXT/Services/Networking/HttpService.cs

@@ -7,7 +7,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace IOB_UT_NEXT.Services
+namespace IOB_UT_NEXT.Services.Networking
 {
     /// <summary>
     /// Servizio dedicato alla gestione delle chiamate HTTP.

IOB-UT-NEXT/Services/Networking/NetService.cs

@@ -6,7 +6,7 @@ using System.Net.NetworkInformation;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace IOB_UT_NEXT.Services
+namespace IOB_UT_NEXT.Services.Networking
 {
     public class NetService
     {

IOB-UT-NEXT/utils.cs

@@ -1,4 +1,4 @@
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using System;
 using System.IO;
 using System.Linq;

IOB-WIN-FANUC/Iob/Fanuc.cs

@@ -2,7 +2,7 @@
 using EgwProxy.MultiCncLib.CNC;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using NLog;
 using System;

IOB-WIN-FORM/AdapterForm.cs

@@ -1,7 +1,7 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Base;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;
 using NLog;

IOB-WIN-FORM/Iob/Generic.cs

@@ -1,7 +1,8 @@
 using EgwProxy.Ftp;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Data;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using MathNet.Numerics.Statistics;
 using Newtonsoft.Json;
@@ -410,7 +411,7 @@ namespace IOB_WIN_FORM.Iob
         /// <returns></returns>
         public static Dictionary<string, string> ConvertToStringDict(Dictionary<string, object> input)
         {
-            return IOB_UT_NEXT.Services.DataSerializer.ToDictionary(input);
+            return IOB_UT_NEXT.Services.Data.DataSerializer.ToDictionary(input);
         }
 
         /// <summary>

IOB-WIN-FORM/Iob/Simula.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;
 using System;

IOB-WIN-FORM/MainForm.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using MathNet.Numerics.Distributions;
 using Newtonsoft.Json;

IOB-WIN-KAWASAKI/Iob/Kawasaki.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using System;
 using System.Collections.Generic;

IOB-WIN-MTC/Iob/MTConn.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using MTConnect.Assets;
 using MTConnect.Clients;

IOB-WIN-OMRON/Iob/Omron.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using System;
 using System.Collections.Generic;

IOB-WIN-OPC-UA/IobOpc/OpcUa.cs

@@ -1,7 +1,7 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.DataModel;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;
 using NLog;

IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;
 using Opc.Ua;

IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;
 using System;

IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;
 using Opc.Ua;

IOB-WIN-OSAI/Iob/OSAI.cs

@@ -2,7 +2,7 @@
 using EgwProxy.OsaiCncLib;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using System;
 using System.Collections.Generic;

IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using System;
 using System.Collections.Generic;
 using System.Linq;

IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs

@@ -1,6 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using System;
 using System.Collections.Generic;
 using System.Linq;

IOB-WIN-SQL/IobSql/SqlServLantek.cs

@@ -2,7 +2,7 @@
 using EgwProxy.SqlDb.DbModels;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;
 using System;

IOB-WIN-SQL/IobSql/SqlServPama.cs

@@ -2,7 +2,7 @@
 using EgwProxy.SqlDb.DbModels;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Services;
+using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
 using Newtonsoft.Json;
 using System;