diff --git a/IOB-UT-NEXT/Config/IobConfTree.cs b/IOB-UT-NEXT/Config/IobConfTree.cs index 62f30ff3..b092ac15 100644 --- a/IOB-UT-NEXT/Config/IobConfTree.cs +++ b/IOB-UT-NEXT/Config/IobConfTree.cs @@ -2,6 +2,7 @@ using IOB_UT_NEXT.Config.Base; using IOB_UT_NEXT.Config.Mem; using IOB_UT_NEXT.Config.Special; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using Newtonsoft.Json; diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj index b1820939..2c5ed3af 100644 --- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj +++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj @@ -222,7 +222,7 @@ - + diff --git a/IOB-UT-NEXT/Iob/BaseObj.cs b/IOB-UT-NEXT/Iob/BaseObj.cs index 46b08ee8..c68f4aa0 100644 --- a/IOB-UT-NEXT/Iob/BaseObj.cs +++ b/IOB-UT-NEXT/Iob/BaseObj.cs @@ -3,6 +3,7 @@ using IOB_UT_NEXT.Config.Mem; using IOB_UT_NEXT.Services.Cache; using IOB_UT_NEXT.Services.Core; using IOB_UT_NEXT.Services.Data; +using IOB_UT_NEXT.Services.Files; using NLog; using System; using System.Collections.Generic; diff --git a/IOB-UT-NEXT/utils.cs b/IOB-UT-NEXT/Services/Files/utils.cs similarity index 70% rename from IOB-UT-NEXT/utils.cs rename to IOB-UT-NEXT/Services/Files/utils.cs index b8069604..ed5756ad 100644 --- a/IOB-UT-NEXT/utils.cs +++ b/IOB-UT-NEXT/Services/Files/utils.cs @@ -3,7 +3,7 @@ using System; using System.IO; using System.Linq; -namespace IOB_UT_NEXT +namespace IOB_UT_NEXT.Services.Files { public class utils : IOB_UT_NEXT.baseUtils { @@ -12,50 +12,32 @@ namespace IOB_UT_NEXT /// /// folder archiviazione dati configurazione (DATA\CONF) /// - public static string confDir - { - get => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, CRS("dataConfPath")); - } + public static string confDir => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, CRS("dataConfPath")); /// /// folder archiviazione dati storici giornalieri (DATA\DAT) /// - public static string dataDatDir - { - get => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, CRS("dataDatPath")); - } + public static string dataDatDir => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, CRS("dataDatPath")); /// /// folder archiviazione dati (DATA) /// - public static string dataDir - { - get => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, CRS("dataPath")); - } + public static string dataDir => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, CRS("dataPath")); /// /// File icona default /// - public static string defIconFilePath - { - get => Path.Combine(utils.resxDir, "SteamWare.ico"); - } + public static string defIconFilePath => Path.Combine(utils.resxDir, "SteamWare.ico"); /// /// File configurazione default x MAIN /// - public static string mainConfFilePath - { - get=> Path.Combine(utils.confDir, utils.CRS("mainConfFile")); - } + public static string mainConfFilePath => Path.Combine(utils.confDir, utils.CRS("mainConfFile")); /// /// folder archiviazione dati configurazione (DATA\CONF) /// - public static string resxDir - { - get => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, CRS("resxPath")); - } + public static string resxDir => Path.Combine(AppDomain.CurrentDomain.BaseDirectory, CRS("resxPath")); #endregion Public Properties diff --git a/IOB-WIN-FANUC/Iob/Fanuc.cs b/IOB-WIN-FANUC/Iob/Fanuc.cs index 6cd9523d..cc69ed8d 100644 --- a/IOB-WIN-FANUC/Iob/Fanuc.cs +++ b/IOB-WIN-FANUC/Iob/Fanuc.cs @@ -2,6 +2,7 @@ using EgwProxy.MultiCncLib.CNC; using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using NLog; diff --git a/IOB-WIN-FILE/IobFile/FileEurom63.cs b/IOB-WIN-FILE/IobFile/FileEurom63.cs index de92a7e7..9db34630 100644 --- a/IOB-WIN-FILE/IobFile/FileEurom63.cs +++ b/IOB-WIN-FILE/IobFile/FileEurom63.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Protocols; using MapoSDK; using Newtonsoft.Json; diff --git a/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs b/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs index 87ecc819..2d5fc113 100644 --- a/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs +++ b/IOB-WIN-FILE/IobFile/IobFileSoitaab.cs @@ -3,6 +3,7 @@ using EgwProxy.SqlDb.DbModels; #endif using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using System; using System.Collections.Generic; diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs index 29da454e..68eec222 100644 --- a/IOB-WIN-FORM/Iob/Generic.cs +++ b/IOB-WIN-FORM/Iob/Generic.cs @@ -6122,7 +6122,7 @@ namespace IOB_WIN_FORM.Iob lgInfo("loadMemConf.04"); try { - memMap = JsonConvert.DeserializeObject(jsonData); + memMap = JsonDeserialize(jsonData); } catch (Exception exc) { diff --git a/IOB-WIN-FORM/Iob/PingWatchDog.cs b/IOB-WIN-FORM/Iob/PingWatchDog.cs index 33c87f78..c53e2ed4 100644 --- a/IOB-WIN-FORM/Iob/PingWatchDog.cs +++ b/IOB-WIN-FORM/Iob/PingWatchDog.cs @@ -1,6 +1,7 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; using IOB_UT_NEXT.Services.Data; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using System; using System.Diagnostics; diff --git a/IOB-WIN-FORM/Iob/Simula.cs b/IOB-WIN-FORM/Iob/Simula.cs index 744e92ca..1d710b31 100644 --- a/IOB-WIN-FORM/Iob/Simula.cs +++ b/IOB-WIN-FORM/Iob/Simula.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using Newtonsoft.Json; diff --git a/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs b/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs index 765e4011..d5ca203b 100644 --- a/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs +++ b/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using System; diff --git a/IOB-WIN-MTC/Iob/MTConn.cs b/IOB-WIN-MTC/Iob/MTConn.cs index c605c896..311da6dd 100644 --- a/IOB-WIN-MTC/Iob/MTConn.cs +++ b/IOB-WIN-MTC/Iob/MTConn.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using MTConnect.Clients; diff --git a/IOB-WIN-OMRON/Iob/Omron.cs b/IOB-WIN-OMRON/Iob/Omron.cs index e8a34f85..6baa06d5 100644 --- a/IOB-WIN-OMRON/Iob/Omron.cs +++ b/IOB-WIN-OMRON/Iob/Omron.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using System; diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs index e3bfc4e1..4dcc7518 100644 --- a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs +++ b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs @@ -2,6 +2,7 @@ using IOB_UT_NEXT.Config; using IOB_UT_NEXT.Config.Mem; using IOB_UT_NEXT.DataModel; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using Newtonsoft.Json; diff --git a/IOB-WIN-OSAI/Iob/OSAI.cs b/IOB-WIN-OSAI/Iob/OSAI.cs index 6aa48741..86382e4c 100644 --- a/IOB-WIN-OSAI/Iob/OSAI.cs +++ b/IOB-WIN-OSAI/Iob/OSAI.cs @@ -2,6 +2,7 @@ using EgwProxy.OsaiCncLib; using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using IOB_UT_NEXT.Services.Networking; using MapoSDK; using System; diff --git a/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs b/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs index 440a7c25..b0c8fe7a 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/Siemens.cs @@ -1,6 +1,7 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; using IOB_UT_NEXT.Config.Mem; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using Newtonsoft.Json; using S7.Net; diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs index 7afc1b42..c6de9d0d 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensAprochim.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using System; using System.Collections.Generic; diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs index 9692d257..7f9cfb8f 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensLasco.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using System; using System.Collections.Generic; diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensTorri.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensTorri.cs index 3beefdde..e53c940e 100644 --- a/IOB-WIN-SIEMENS/IobSiemens/SiemensTorri.cs +++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensTorri.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using System; using System.Collections.Generic; diff --git a/IOB-WIN-WS/IobWs/Citizen.cs b/IOB-WIN-WS/IobWs/Citizen.cs index 061084e2..a0274c52 100644 --- a/IOB-WIN-WS/IobWs/Citizen.cs +++ b/IOB-WIN-WS/IobWs/Citizen.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using Newtonsoft.Json; using System; diff --git a/IOB-WIN-WS/IobWs/Gomba.cs b/IOB-WIN-WS/IobWs/Gomba.cs index 68547ad5..0144c208 100644 --- a/IOB-WIN-WS/IobWs/Gomba.cs +++ b/IOB-WIN-WS/IobWs/Gomba.cs @@ -1,6 +1,7 @@ using EgwProxy.Gomba.GombaServ; using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using Newtonsoft.Json; using System; diff --git a/IOB-WIN-WS/IobWs/IcoelSoap.cs b/IOB-WIN-WS/IobWs/IcoelSoap.cs index 7c357b9c..9fd720e0 100644 --- a/IOB-WIN-WS/IobWs/IcoelSoap.cs +++ b/IOB-WIN-WS/IobWs/IcoelSoap.cs @@ -2,6 +2,7 @@ using EgwProxy.Icoel.SizerService; using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using System; using System.Collections.Generic; diff --git a/IOB-WIN-WS/IobWs/RestBase.cs b/IOB-WIN-WS/IobWs/RestBase.cs index c7004071..931343c0 100644 --- a/IOB-WIN-WS/IobWs/RestBase.cs +++ b/IOB-WIN-WS/IobWs/RestBase.cs @@ -1,5 +1,6 @@ using IOB_UT_NEXT; using IOB_UT_NEXT.Config; +using IOB_UT_NEXT.Services.Files; using MapoSDK; using Newtonsoft.Json; using RestSharp;