From 1f50e37fe15dfe36e436564fa47fff4f973e5358 Mon Sep 17 00:00:00 2001 From: Elena Date: Sun, 27 Mar 2022 13:14:38 +0200 Subject: [PATCH] =?UTF-8?q?Buscando=20fallo=20conexi=C3=B3n=20oliviaTasks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Conexion/Cstr_socket.cs | 14 +++++++------- Services/LanzaSrv/LanzaOlvServ.cs | 2 +- Services/ProcesoEjecServ.cs | 10 +++++----- ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Conexion/Cstr_socket.cs b/Conexion/Cstr_socket.cs index 0da6bff..d897d4c 100644 --- a/Conexion/Cstr_socket.cs +++ b/Conexion/Cstr_socket.cs @@ -116,25 +116,25 @@ namespace OliviaAddIn } } //funciones auxiliares------------------------------ - [DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] + [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)] unsafe public static extern IntPtr str_socket_crea(); - [DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] + [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)] unsafe public static extern int str_socket_conecta(IntPtr soc, String ip, int puerto); [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)] - unsafe public static extern int str_socket_envia(IntPtr soc, String txt); + unsafe public static extern int str_socket_envia(IntPtr soc, String txt);//solo este - [DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] + [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)] unsafe public static extern int str_socket_recive(IntPtr soc); - [DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] + [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)] unsafe public static extern void str_socket_dame_buf(IntPtr soc, StringBuilder buf); - [DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] + [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)] unsafe public static extern void str_socket_dame_error(IntPtr soc, StringBuilder error);//llamar con 1024 de espacio - [DllImport("utiles.dll", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)] + [DllImport("utiles.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)] unsafe public static extern void str_socket_borra(IntPtr soc); } } diff --git a/Services/LanzaSrv/LanzaOlvServ.cs b/Services/LanzaSrv/LanzaOlvServ.cs index cacbba0..0c0edfd 100644 --- a/Services/LanzaSrv/LanzaOlvServ.cs +++ b/Services/LanzaSrv/LanzaOlvServ.cs @@ -105,7 +105,7 @@ namespace OliviaAddInPro.Services.LanzaSrv GeneralDef.EjecGeoParamSep + GeneralDef.GG_port + GeneralDef.EjecGeoParamIgual + OliviaGlob.Conexion.Puerto + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_tout + GeneralDef.EjecGeoParamIgual + OliviaGlob.Conexion.TiempoOutSocket + " " + GeneralDef.EjecGeoParamSep + GeneralDef.GG_pt + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathTemp + " " + - GeneralDef.EjecGeoParamSep + GeneralDef.GG_pcfg + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathCfg + " "; + GeneralDef.EjecGeoParamSep + GeneralDef.GG_pcfg + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathCfg + "D:\\Proyectos\\Olivia\\Instal2.0\\cfg.ini"; pfi = new ProcessStartInfo(OliviaGlob.Paths.PathExeOlivia, args); System.Diagnostics.Process.Start(pfi); diff --git a/Services/ProcesoEjecServ.cs b/Services/ProcesoEjecServ.cs index 319a032..3e98bcd 100644 --- a/Services/ProcesoEjecServ.cs +++ b/Services/ProcesoEjecServ.cs @@ -13,9 +13,9 @@ namespace OliviaAddInPro.Services public class ProcesoEjecServ { Cstr_socket soc = null; - int m_out; - int m_miliseconds; - int m_tm_progr; + int m_out=0; + int m_miliseconds=200; + int m_tm_progr=1000; int modo_fin = 0; bool cancela = false; bool cancela_fin = false; @@ -66,7 +66,7 @@ namespace OliviaAddInPro.Services private Respuesta run() { int nint = 0; - int nint_max = 10; + int nint_max = 5; bool sal = false; bool first_send_cfg = true; bool fin = false; @@ -87,7 +87,7 @@ namespace OliviaAddInPro.Services if (nint >= nint_max) { res.Error.Add("Error en la comunicación con OliviaTask"); - var act = new Respuesta() { Value = TiposActu.ActuMal }; + var act = new Respuesta() { Value = TiposActu.ActuFinNOk }; act.Error.AddRange(res.Error); actualiza(act); sal = true; diff --git a/ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs b/ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs index b4d5553..4f2b6a8 100644 --- a/ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs +++ b/ViewModel/Limpieza/PaneLimpiezaSub3ViewModel.cs @@ -23,7 +23,7 @@ namespace OliviaAddInPro { numPtosCtrl = numSect = 3; checkAjustSect = checkSectAuto = false; - checkIgnoAis = true; + checkIgnoAis = false; enableNSect = true; }