From 22c0be4b6d37d8a2654b7cb1cd73831535bd5f2d Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Wed, 28 May 2025 16:40:29 -0600 Subject: [PATCH] - VERSION 5.05.27 - Se cambio el servidor de DBReq a keymon.net - Se hizo que el envio de ubicacion en tiempo real siempre inicialize el servidor de DBReq con la ip correcta, porque si se modificaba la direccion desde el engrane, no enviaba bien la informacion! --- B4A/B4XMainPage.bas | 6 +++--- B4A/Mariana Censos.b4a.meta | 4 ++-- B4A/Starter.bas | 14 +++++++------- B4A/Subs.bas | 10 ++++++---- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index cde12e8..b83f54a 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -388,7 +388,7 @@ Sub Entrar_Click End Sub Sub JobDone(Job As HttpJob) - Log(Job.Success) + Log("Main.JobDone: " & Job.Success) If Job.Success = False Then LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red) ToastMessageShow("Error: " & Job.ErrorMessage, True) @@ -632,7 +632,7 @@ Sub i_engrane_Click b_mandaUsrs.Visible = False cb_importarBDWA.Checked = Subs.traeUsarIntentBDWA p_importarBDWA.Visible = False - lv_server.AddSingleLine("http://keymon.lat:1781") + lv_server.AddSingleLine("http://keymon.net:1781") If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1781") b_mandaUsrs.Visible = True @@ -720,7 +720,7 @@ Private Sub b_mandaUsrs_Click Private c As Cursor = Starter.skmt.ExecQuery($"select * from kmt_info"$) Private dbr As DBRequestManager Private cmd1 As DBCommand - dbr.Initialize(Me, "http://keymon.lat:1781") + dbr.Initialize(Me, "http://keymon.net:1781") If c.RowCount > 0 Then subirClientes = c.RowCount - 1 Subs.centraPanel(p_avanceSubirUsrs, p_appUpdate.Width) diff --git a/B4A/Mariana Censos.b4a.meta b/B4A/Mariana Censos.b4a.meta index 14e2d52..5eefc30 100644 --- a/B4A/Mariana Censos.b4a.meta +++ b/B4A/Mariana Censos.b4a.meta @@ -49,6 +49,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8=1 ModuleClosedNodes9=1 -NavigationStack=C_NuevoCliente,mandaPendientesNuevosClientes,502,1,C_Principal,e_ruta_EnterPressed,993,6,Subs,traeRuta,663,0,C_Cliente,cb_activo_SelectedIndexChanged,671,0,C_Cliente,b_guardaCambios_Click,397,0,C_Cliente,B4XPage_CloseRequest,390,0,C_Principal,cargar_Click,507,0,C_Principal,JobDone,634,0,MAPA_RUTAS,MapFragment1_Ready,202,0,C_Cliente,B4XPage_Appear,287,0 +NavigationStack=C_Principal,cargar_Click,507,0,Diseñador Visual,login.bal,-100,1,Starter,JobDone,133,6,Starter,Service_Destroy,71,0,B4XMainPage,JobDone,383,0,Starter,Service_Start,52,0,B4XMainPage,Entrar_Click,382,0,B4XMainPage,b_guardar_Click,642,0,B4XMainPage,i_engrane_Click,639,0,Starter,ENVIA_ULTIMA_GPS,75,0 SelectedBuild=0 -VisibleModules=2,14,9,4,8,15,7,16,13,5 +VisibleModules=14,2,9,4,8,15,7,16,13,5 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index dbf6c7f..64649a8 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -19,12 +19,12 @@ Sub Process_Globals Public FLP As FusedLocationProvider ' Private flpStarted As Boolean Dim reqManager As DBRequestManager - Dim server As String = "http://keymon.lat:1781" + Dim server As String = "http://keymon.net:1781" ' Dim server As String = "http://187.189.244.154:1783" ' Dim server As String = "http://10.0.0.205:1782" ' Dim server As String = "http://11.0.0.231:1782" Dim Timer1 As Timer - Dim Interval As Int = 500 + Dim Interval As Int = 10 Dim ruta As String = File.DirInternal 'Para los Logs Private logs As StringBuilder @@ -77,12 +77,11 @@ Sub Service_Destroy End Sub Sub ENVIA_ULTIMA_GPS -' reqManager.Initialize(Me, server) + reqManager.Initialize(Me, server) Dim logger As Boolean = True - If logger Then LogColor("Iniciamos ENVIA_ULTIMA_GPS", Colors.Magenta) + If logger Then LogColor("############### Iniciamos ENVIA_ULTIMA_GPS #####################", Colors.Magenta) Dim skmt As SQL skmt.Initialize(ruta,"kmt.db", False) - If Subs.traeAlmacen <> Null And Subs.traeAlmacen <> "" Then 'Primero borramos de CAT_RUTAS_CENSOS el registro (por almacen y ruta) 'y LUEGO lo insertamos en JobDone @@ -90,7 +89,7 @@ Sub ENVIA_ULTIMA_GPS cmd.Initialize cmd.Name = "deleteRutaCensos2" cmd.Parameters = Array As Object(Subs.traeAlmacen, Subs.traeRuta, Subs.traeUsuarioDeBD) - Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${Subs.traeUsuarioDeBD}"$) +' Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${Subs.traeUsuarioDeBD}"$) reqManager.ExecuteCommand(cmd , "delCatRutas") End If @@ -121,7 +120,7 @@ Sub Application_Error (Error As Exception, StackTrace As String) As Boolean End Sub Sub JobDone(Job As HttpJob) -' Log(Job.Success) + Log("Starter.JobDone: " & Job.Success) If Job.Success = False Then ' ToastMessageShow("Error: " & Job.ErrorMessage, True) LogColor("Error: " & Job.ErrorMessage, Colors.red) @@ -136,6 +135,7 @@ Sub JobDone(Job As HttpJob) Subs.logJobDoneResultados(resultado) End If If resultado.Tag = "delCatRutas" Then + Log(123) Subs.logJobDoneResultados(resultado) Dim cmd As DBCommand cmd.Initialize diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 01d4c48..0a12efc 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -660,8 +660,10 @@ Sub traeAlmacen As String 'ignore Private c As Cursor Private a As String c=B4XPages.MainPage.skmt.ExecQuery("select ID_ALMACEN from CAT_ALMACEN") - c.Position = 0 - a = C.GetString("ID_ALMACEN") + If c.RowCount > 0 Then + c.Position = 0 + a = C.GetString("ID_ALMACEN") + End If c.Close Return a End Sub @@ -1257,12 +1259,12 @@ Sub agregaColumna(tabla As String, columna As String, tipo As String) c.Position = 0 If c.GetString("fCol") = 0 Then 'Si no esta la columna la agregamos B4XPages.MainPage.skmt.ExecNonQuery($"ALTER TABLE ${tabla} ADD COLUMN ${columna} ${tipo}"$) - Log($"Columna "${columna} ${tipo}", agregada a "${tabla}"."$) +' Log($"Columna "${columna} ${tipo}", agregada a "${tabla}"."$) End If Catch 'Si no funciona "pragma_table_info" lo hacemos con try/catch Try B4XPages.MainPage.skmt.ExecNonQuery($"ALTER TABLE ${tabla} ADD COLUMN ${columna} ${tipo}"$) - Log($"Columna "${columna} ${tipo}", agregada a "${tabla}".."$) +' Log($"Columna "${columna} ${tipo}", agregada a "${tabla}".."$) Catch Log(LastException) End Try