Ancora spostamenti e riorganizzaizone classi e servizi

IOB-UT-NEXT/Config/IobConfTree.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT.Config;
 using IOB_UT_NEXT.Config.Base;
+using IOB_UT_NEXT.Config.Mem;
 using IOB_UT_NEXT.Config.Special;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;

IOB-UT-NEXT/Config/Mem/plcMemMapExt.cs

@@ -1,12 +1,7 @@
-using IOB_UT_NEXT.Config.Special;
-using MapoSDK;
-using System;
+using MapoSDK;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace IOB_UT_NEXT
+namespace IOB_UT_NEXT.Config.Mem
 {
     public class plcMemMapExt : plcMemMap
     {

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

@@ -156,8 +156,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BitUtils.cs" />
-    <Compile Include="ByteDataConverter.cs" />
+    <Compile Include="Services\Core\BitUtils.cs" />
+    <Compile Include="Services\Core\ByteDataConverter.cs" />
     <Compile Include="CallMetricsCollector.cs" />
     <Compile Include="Config\Base\AlarmDto.cs" />
     <Compile Include="Config\Base\CmdUriDto.cs" />
@@ -195,7 +195,7 @@
     <Compile Include="Config\GenActConf.cs" />
     <Compile Include="IniFile.cs" />
     <Compile Include="IntConditionCheck.cs" />
-    <Compile Include="BitConditionCheck.cs" />
+    <Compile Include="Services\Core\BitConditionCheck.cs" />
     <Compile Include="CustomObj.cs" />
     <Compile Include="Services\Data\DataExport.cs" />
     <Compile Include="Services\Files\Eurom63.cs" />
@@ -208,14 +208,14 @@
     <Compile Include="Services\Data\XmlDataSerializer.cs" />
     <Compile Include="JobTask2Exe.cs" />
     <Compile Include="MeasureUtils.cs" />
-    <Compile Include="plcMemMapExt.cs" />
+    <Compile Include="Config\Mem\plcMemMapExt.cs" />
     <Compile Include="TimerMan.cs" />
     <Compile Include="SingleThreadTaskScheduler.cs" />
     <Compile Include="TCMan.cs" />
     <Compile Include="TimeUtils.cs" />
     <Compile Include="ToMapo.cs" />
     <Compile Include="baseUtils.cs" />
-    <Compile Include="BinaryUtils.cs" />
+    <Compile Include="Services\Core\BinaryUtils.cs" />
     <Compile Include="Enums.cs" />
     <Compile Include="Services\Files\FileMover.cs" />
     <Compile Include="Logging.cs" />
@@ -249,9 +249,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Services\Core\" />
-  </ItemGroup>
+  <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

@@ -1,4 +1,5 @@
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Config.Mem;
 using IOB_UT_NEXT.Services.Data;
 using NLog;
 using System;

IOB-UT-NEXT/Services/Core/BinaryUtils.cs

@@ -3,7 +3,7 @@ using System.Globalization;
 using System.Linq;
 using System.Numerics;
 
-namespace IOB_UT_NEXT
+namespace IOB_UT_NEXT.Services.Core
 {
     public class BinaryUtils : IFormatProvider, ICustomFormatter
     {

IOB-UT-NEXT/Services/Core/BitConditionCheck.cs

@@ -1,4 +1,4 @@
-namespace IOB_UT_NEXT
+namespace IOB_UT_NEXT.Services.Core
 {
     public class BitConditionCheck
     {

IOB-UT-NEXT/Services/Core/BitUtils.cs

@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IOB_UT_NEXT
+namespace IOB_UT_NEXT.Services.Core
 {
     public class BitUtils
     {

IOB-UT-NEXT/Services/Core/ByteDataConverter.cs

@@ -1,4 +1,5 @@
-namespace IOB_UT_NEXT
+
+namespace IOB_UT_NEXT.Services.Core
 {
     public class ByteDataConverter
     {

IOB-UT-NEXT/baseUtils.cs

@@ -1,3 +1,4 @@
+using IOB_UT_NEXT.Services.Core;
 using IOB_UT_NEXT.Services.Files;
 using NLog;
 using RestSharp;

IOB-WIN-FORM/Iob/Generic.cs

@@ -1,6 +1,8 @@
 using EgwProxy.Ftp;
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Config.Mem;
+using IOB_UT_NEXT.Services.Core;
 using IOB_UT_NEXT.Services.Data;
 using IOB_UT_NEXT.Services.Files;
 using IOB_UT_NEXT.Services.Networking;

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

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Config.Mem;
 using IOB_UT_NEXT.DataModel;
 using IOB_UT_NEXT.Services.Networking;
 using MapoSDK;
@@ -16,7 +17,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using static IOB_UT_NEXT.ByteDataConverter;
+using static IOB_UT_NEXT.Services.Core.ByteDataConverter;
 
 namespace IOB_WIN_OPC_UA.IobOpc
 {

IOB-WIN-SIEMENS/IobSiemens/Siemens.cs

@@ -1,5 +1,6 @@
 using IOB_UT_NEXT;
 using IOB_UT_NEXT.Config;
+using IOB_UT_NEXT.Config.Mem;
 using MapoSDK;
 using Newtonsoft.Json;
 using S7.Net;