Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix area IobNet

Browse Source
This commit is contained in:
Samuele Locatelli
2023-04-27 14:45:57 +02:00
parent 5828994ee3
commit 5a46383da4
5 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-WIN-NEXT/AdapterForm.cs
+3 -3
View File
@@ -1668,7 +1668,7 @@ namespace IOB_WIN_NEXT
break;
case tipoAdapter.IcoelSoap:
iobObj = new Iob.IcoelSoap(this, IOBConf);
iobObj = new IobNet.IcoelSoap(this, IOBConf);
start.Enabled = true;
break;
@@ -1804,7 +1804,7 @@ namespace IOB_WIN_NEXT
break;
case tipoAdapter.PingWatchdog:
iobObj = new IobPing(this, IOBConf);
iobObj = new IobNet.Ping(this, IOBConf);
start.Enabled = true;
break;
@@ -1902,7 +1902,7 @@ namespace IOB_WIN_NEXT
break;
case tipoAdapter.WPS:
iobObj = new IobWPS(this, IOBConf);
iobObj = new IobNet.WebPageScrap(this, IOBConf);
start.Enabled = true;
break;
IOB-WIN-NEXT/IOB-WIN-NEXT.csproj
+4 -3
View File
@@ -238,7 +238,7 @@
<Compile Include="IobSql\SqlServLantek.cs" />
<Compile Include="IobSql\SqlServPama.cs" />
<Compile Include="IobSql\IcoelDb.cs" />
<Compile Include="Iob\IcoelSoap.cs" />
<Compile Include="IobNet\IcoelSoap.cs" />
<Compile Include="IobModbusTCP\ModbusTCPFimat.cs" />
<Compile Include="IobModbusTCP\ModbusTCPRimor.cs" />
<Compile Include="IobModbusTCP\ModbusTCPSaim.cs" />
@@ -273,7 +273,7 @@
<Compile Include="IobOpc\OpcUaCMS.cs" />
<Compile Include="IobOpc\OpcUaEwon.cs" />
<Compile Include="IobBeckhoff\Beckhoff.cs" />
<Compile Include="IobPing.cs" />
<Compile Include="IobNet\Ping.cs" />
<Compile Include="IobSiemens\SiemensAt2001.cs" />
<Compile Include="IobSiemens\SiemensComeca.cs" />
<Compile Include="IobSiemens\SiemensRobotService.cs" />
@@ -285,7 +285,7 @@
<Compile Include="IobSiemens\SiemensComur.cs" />
<Compile Include="IobSiemens\SiemensSaet.cs" />
<Compile Include="IobFile\FileGen.cs" />
<Compile Include="IobWPS.cs" />
<Compile Include="IobNet\WebPageScrap.cs" />
<Compile Include="IobOSAI.cs" />
<Compile Include="IobKawasaki.cs" />
<Compile Include="IobSiemens\SiemensAprochim.cs" />
@@ -810,6 +810,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Iob\" />
<Folder Include="prog\" />
</ItemGroup>
<ItemGroup>
IOB-WIN-NEXT/Iob/IcoelSoap.cs → IOB-WIN-NEXT/IobNet/IcoelSoap.cs
+1 -1
View File
@@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using System.Net.NetworkInformation;
namespace IOB_WIN_NEXT.Iob
namespace IOB_WIN_NEXT.IobNet
{
/// <summary>
/// Adapter specializzato per ICOEL e le chiamate tramite WS Soap al Sizer, con libreria EgwProxy.Icoel
IOB-WIN-NEXT/IobPing.cs → IOB-WIN-NEXT/IobNet/Ping.cs
+3 -3
View File
@@ -3,9 +3,9 @@ using MapoSDK;
using System;
using System.Net.NetworkInformation;
namespace IOB_WIN_NEXT
namespace IOB_WIN_NEXT.IobNet
{
public class IobPing : IobGeneric
public class Ping : IobGeneric
{
#region Public Constructors
@@ -13,7 +13,7 @@ namespace IOB_WIN_NEXT
/// Estende l'init della classe base
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public IobPing(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
public Ping(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
{
lgInfo("NEW IobPing (WatchDog)");
// init datetime counters
IOB-WIN-NEXT/IobWPS.cs → IOB-WIN-NEXT/IobNet/WebPageScrap.cs
+3 -3
View File
@@ -12,13 +12,13 @@ using System.Net.NetworkInformation;
using System.Threading;
using System.Windows.Forms;
namespace IOB_WIN_NEXT
namespace IOB_WIN_NEXT.IobNet
{
/// <summary>
/// Generica classe per implementare WebPageScraping (scaricamento web pages anche js-based x
/// recupero informazioni)
/// </summary>
public class IobWPS : IobGeneric, IDisposable
public class WebPageScrap : IobGeneric, IDisposable
{
/* --------------------------------------------------------------------------------
* Controlli dotati di GENERICA pagina WEB in cui cercare e recuperare informazioni
@@ -35,7 +35,7 @@ namespace IOB_WIN_NEXT
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
public IobWPS(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
public WebPageScrap(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
{
lgInfo("INIT IobWPS");
//reloadAdapterConf();