cheveguerra/ADM
1
0
Fork 0
mirror of https://github.com/KeymonSoft/ADM.git synced 2026-04-20 04:39:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

- VERSION 5.08.22

Browse Source 
- Cambios para que desde clienets y mapa aparezcan losbotones de inicio y fin venta
This commit is contained in:
Jose Alberto Guerra Ugalde
2025-08-22 20:21:24 -06:00
parent 08289ecef0
commit 79897e5efd
25 changed files with 2789 additions and 1287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
B4A/Starter.bas
View File

@@ -21,11 +21,9 @@ Sub Process_Globals
' Private flpStarted As Boolean
Dim reqManager As DBRequestManager
Dim DBReqServer As String = "http://keymon.net:1781"
' Dim DBReqServer As String = "http://11.0.0.107:1781"
' Dim DBReqServer As String = "http://10.0.0.205:1783"
' Dim DBReqServer As String = "http://192.168.100.10:1781"
Dim Timer1 As Timer
Dim Interval As Int = 10
Dim Interval As Int = 300
Dim ruta As String = File.DirInternal
'Para los Logs
Private logs As StringBuilder
@@ -39,6 +37,8 @@ Sub Process_Globals
Private BTAdmin As BluetoothAdmin
Public BluetoothState As Boolean
Public fFileProvider As FileProvider
Dim lat_gps, lon_gps As String
Dim enVenta As Boolean = False
End Sub
Sub Service_Create
@@ -105,7 +105,7 @@ Sub ENVIA_ULTIMA_GPS
If B4XPages.MainPage.lat_gps.Length < 15 Then B4XPages.MainPage.lat_gps = B4XPages.MainPage.lat_gps&"0"
cmd.Parameters = Array As Object(B4XPages.MainPage.montoActual, B4XPages.MainPage.clientestotal, B4XPages.MainPage.clientesventa,B4XPages.MainPage.clientesvisitados,B4XPages.MainPage.lat_gps,B4XPages.MainPage.lon_gps,B4XPages.MainPage.batt,0, 0, 0,B4XPages.MainPage.ALMACEN,B4XPages.MainPage.rutapreventa)
If logger Then Log($"montoActual: ${B4XPages.MainPage.montoActual}, cTotal: ${B4XPages.MainPage.clientestotal}, cVenta: ${B4XPages.MainPage.clientesventa}, cVisitados: ${B4XPages.MainPage.clientesvisitados}, ${B4XPages.MainPage.lat_gps}, ${B4XPages.MainPage.lon_gps}, Batt: ${B4XPages.MainPage.batt}, 0, 0, 0, Almacen: ${B4XPages.MainPage.ALMACEN}, Ruta: ${B4XPages.MainPage.rutapreventa}"$)
reqManager.ExecuteCommand(cmd, "inst_visitas")
reqManager.ExecuteCommand(cmd, "ubicacionTiempoReal")
skmt.ExecNonQuery2("Update cat_variables set CAT_VA_VALOR = ? WHERE CAT_VA_DESCRIPCION = ?" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))
'Reiniciamos el timer para cuando llamamos el Sub desde "seleccion"
Timer1.Enabled = False
@@ -140,4 +140,64 @@ Sub reinicializaReqManager(srv As String)
DBReqServer = srv
reqManager.Initialize(Me, srv)
LogColor(srv, Colors.red)
End Sub
Sub JobDone(Job As HttpJob)
Log("JOBDONE STARTER")
Try
If reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos.
If reqManager.reqsList.IndexOf(Job.tag) <> -1 Then
reqManager.reqsList.RemoveAt(reqManager.reqsList.IndexOf(Job.tag))
LogColor($">>>>>> Quitamos ${Job.tag}"$, Colors.Blue)
End If
LogColor(">>>>>> " & reqManager.reqsList.Size & " - " & reqManager.reqsList, Colors.Blue)
End If
If Job.Success = False Then
Log("ERROR")
LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red)
Else 'If Job Success then ...
' Log(3)
LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.RGB(0,160,0)) 'Mod por CHV - 211027
'Verificamos que el usuario guardado en BD sea VALIDO.
If Job.JobName = "DBRequest" Then
Dim result As DBResult = reqManager.HandleJob(Job)
' For Each records() As Object In result.Rows
' Log("==========================REGISTROS="&result.Rows)
' For Each k As String In result.Columns.Keys
' Log(result.Tag & ": " & k & ": " & records(result.Columns.Get(k)))
' Next
' Next
If result.Tag.As(String).StartsWith("mandaBitacora_") Then
For Each records() As Object In result.Rows
Private id() = Regex.Split("_", result.tag)
If id.Length > 1 Then
For Each k As String In result.Columns.Keys
' Log(result.Tag & ": " & k & ": " & records(result.Columns.Get(k)))
skmt.ExecNonQuery($"update bitacoragps set enviado = 1 where id = '${id(1)}'"$)
' Log($"update bitacoragps set enviado = 1 where id = '${id(1)}'"$)
Next
End If
Next
End If
'HISTORIAL DE UBICACIONES (Tracker)
If result.Tag.As(String).StartsWith("guardaHistorialUbicaciones_") Then
For Each records() As Object In result.Rows
Private id() As String = Regex.Split("_", result.tag)
If id.Length > 1 Then
For Each k As String In result.Columns.Keys
' Log(result.Tag & ": " & k & ": " & records(result.Columns.Get(k)))
skmt.ExecNonQuery($"update HIST_UBICACIONES set HU_ENVIADO = 1 where HU_ID = '${id(1)}'"$)
' Log($"update bitacoragps set enviado = 1 where id = '${id(1)}'"$)
Next
End If
Next
End If
End If
End If
Log(">>>>> Job.Release Starter")
Job.Release
Catch
Log(LastException)
End Try
End Sub