mirror of
https://github.com/KeymonSoft/ADM2.git
synced 2026-04-20 04:39:14 +00:00
VERSION 5.12.04
- Cambios en el timer del envio de ubicacion en tiempo real
This commit is contained in:
@@ -97,6 +97,6 @@ ModuleClosedNodes6=
|
|||||||
ModuleClosedNodes7=
|
ModuleClosedNodes7=
|
||||||
ModuleClosedNodes8=
|
ModuleClosedNodes8=
|
||||||
ModuleClosedNodes9=
|
ModuleClosedNodes9=
|
||||||
NavigationStack=Diseñador Visual,principal.bal,-100,6,Diseñador Visual,login.bal,-100,2,C_Principal,B4XPage_Appear,457,0,C_Cliente,MODS,0,0,Diseñador Visual,cliente.bal,-100,6,C_Cliente,B4XPage_Created,190,5,C_Cliente,Class_Globals,179,0,Main,Process_Globals,18,0,Main,Globals,25,0,B4XMainPage,B4XPage_Created,305,0,MAPA_RUTAS,MapFragment1_Ready,189,0
|
NavigationStack=Starter,Service_Create,46,0,Starter,Process_Globals,34,0,C_Principal,B4XPage_Created,253,0,C_BItacora,cargamosPanel,167,0,C_Principal,B4XPage_Appear,540,0,Tracker,flp_LocationChanged,195,0,Tracker,guardaYEnviaUbicacion,302,0,C_Cliente,GPS_LocationChanged,522,0,C_Cliente,B4XPage_Appear,507,0,Starter,JobDone,146,0
|
||||||
SelectedBuild=0
|
SelectedBuild=0
|
||||||
VisibleModules=2,14,30,5,6,15,32,4,31,18,27
|
VisibleModules=2,14,30,5,6,15,32,4,31,18,27
|
||||||
|
|||||||
@@ -171,10 +171,10 @@ End Sub
|
|||||||
|
|
||||||
'Cargamos el layout del panel.
|
'Cargamos el layout del panel.
|
||||||
private Sub cargamosPanel
|
private Sub cargamosPanel
|
||||||
Log(p_transparenteInicioFin2.IsInitialized)
|
' Log(p_transparenteInicioFin2.IsInitialized)
|
||||||
' Log(p_transparenteInicioFin2.)
|
' Log(p_transparenteInicioFin2.)
|
||||||
If Not(p_transparenteInicioFin2.IsInitialized) Then
|
If Not(p_transparenteInicioFin2.IsInitialized) Then
|
||||||
LogColor(">>>>>>> CARGAMOS PANEL BITACORA", Colors.red)
|
' LogColor(">>>>>>> CARGAMOS PANEL BITACORA", Colors.red)
|
||||||
Root2.LoadLayout("inicioFinVenta")
|
Root2.LoadLayout("inicioFinVenta")
|
||||||
p_transparenteInicioFin2.Width = Root2.Width
|
p_transparenteInicioFin2.Width = Root2.Width
|
||||||
p_transparenteInicioFin2.Height = Root2.Height
|
p_transparenteInicioFin2.Height = Root2.Height
|
||||||
|
|||||||
@@ -524,7 +524,7 @@ Sub GPS_LocationChanged (Location1 As Location)
|
|||||||
|
|
||||||
Dim l1, l2 As Location
|
Dim l1, l2 As Location
|
||||||
l1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)
|
l1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps)
|
||||||
Log($"Coordenadas de la tienda - lat:${m_lat}, lon:${m_lon}"$)
|
' Log($"Coordenadas de la tienda - lat:${m_lat}, lon:${m_lon}"$)
|
||||||
l2.Initialize2(m_lat, m_lon)
|
l2.Initialize2(m_lat, m_lon)
|
||||||
|
|
||||||
If BT_QR.IsInitialized Then BT_QR.Enabled = True
|
If BT_QR.IsInitialized Then BT_QR.Enabled = True
|
||||||
|
|||||||
@@ -257,7 +257,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
|
|||||||
e.Position=0
|
e.Position=0
|
||||||
f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
|
f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
|
||||||
f.Position=0
|
f.Position=0
|
||||||
Log("-- A")
|
' Log("-- A")
|
||||||
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
||||||
f.Close
|
f.Close
|
||||||
If l_ruta.Text = 0 Then
|
If l_ruta.Text = 0 Then
|
||||||
@@ -426,7 +426,7 @@ Sub B4XPage_Appear
|
|||||||
f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO <> 0 OR CAT_CL_CODIGO <> 1 ")
|
f=B4XPages.MainPage.skmt.ExecQuery("select count(*) as CAT_CL_RUTA from kmt_info WHERE CAT_CL_CODIGO <> 0 OR CAT_CL_CODIGO <> 1 ")
|
||||||
f.Position = 0
|
f.Position = 0
|
||||||
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
||||||
Log("-- A:" & l_ruta.Text)
|
' Log("-- A:" & l_ruta.Text)
|
||||||
f.Close
|
f.Close
|
||||||
If l_ruta.Text = 0 Then
|
If l_ruta.Text = 0 Then
|
||||||
l_ruta.Text = 0
|
l_ruta.Text = 0
|
||||||
@@ -434,7 +434,7 @@ Sub B4XPage_Appear
|
|||||||
f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
|
f=B4XPages.MainPage.skmt.ExecQuery("select CAT_CL_RUTA from kmt_info")
|
||||||
f.Position=0
|
f.Position=0
|
||||||
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
l_ruta.Text = f.GetString("CAT_CL_RUTA")
|
||||||
Log("-- A:" & l_ruta.Text)
|
' Log("-- A:" & l_ruta.Text)
|
||||||
f.Close
|
f.Close
|
||||||
End If
|
End If
|
||||||
If Cuantos = 0 Then
|
If Cuantos = 0 Then
|
||||||
@@ -544,7 +544,7 @@ Sub B4XPage_Appear
|
|||||||
l_ruta.Text = 0
|
l_ruta.Text = 0
|
||||||
Else If s.RowCount > 0 Then
|
Else If s.RowCount > 0 Then
|
||||||
l_ruta.Text = s.GetString("RUTAA")
|
l_ruta.Text = s.GetString("RUTAA")
|
||||||
Log("-- A:" & l_ruta.Text)
|
' Log("-- A:" & l_ruta.Text)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If l_ruta.Text = "0" Then
|
If l_ruta.Text = "0" Then
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ Sub Process_Globals
|
|||||||
' Dim DBReqServer As String = "http://10.0.0.205:1783"
|
' Dim DBReqServer As String = "http://10.0.0.205:1783"
|
||||||
' Dim DBReqServer As String = "http://192.168.100.10:1781"
|
' Dim DBReqServer As String = "http://192.168.100.10:1781"
|
||||||
Dim Timer1 As Timer
|
Dim Timer1 As Timer
|
||||||
Dim Interval As Int = 10
|
Dim Interval As Int = 300
|
||||||
Dim ruta As String = File.DirInternal
|
Dim ruta As String = File.DirInternal
|
||||||
'Para los Logs
|
'Para los Logs
|
||||||
Private logs As StringBuilder
|
Private logs As StringBuilder
|
||||||
@@ -148,9 +148,9 @@ Sub JobDone(Job As HttpJob)
|
|||||||
If reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos.
|
If reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos.
|
||||||
If reqManager.reqsList.IndexOf(Job.tag) <> -1 Then
|
If reqManager.reqsList.IndexOf(Job.tag) <> -1 Then
|
||||||
reqManager.reqsList.RemoveAt(reqManager.reqsList.IndexOf(Job.tag))
|
reqManager.reqsList.RemoveAt(reqManager.reqsList.IndexOf(Job.tag))
|
||||||
LogColor($">>>>>> Quitamos ${Job.tag}"$, Colors.Blue)
|
' LogColor($">>>>>> Quitamos ${Job.tag}"$, Colors.Blue)
|
||||||
End If
|
End If
|
||||||
LogColor(">>>>>> " & reqManager.reqsList.Size & " - " & reqManager.reqsList, Colors.Blue)
|
' LogColor(">>>>>> " & reqManager.reqsList.Size & " - " & reqManager.reqsList, Colors.Blue)
|
||||||
End If
|
End If
|
||||||
If Job.Success = False Then
|
If Job.Success = False Then
|
||||||
LogColor("############################################", Colors.red)
|
LogColor("############################################", Colors.red)
|
||||||
@@ -188,7 +188,7 @@ Sub JobDone(Job As HttpJob)
|
|||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
Log(">>>>> Job.Release Starter")
|
' Log(">>>>> Job.Release Starter")
|
||||||
Job.Release
|
Job.Release
|
||||||
Catch
|
Catch
|
||||||
Log(LastException)
|
Log(LastException)
|
||||||
|
|||||||
@@ -199,7 +199,7 @@ Sub flp_LocationChanged (Location1 As Location)
|
|||||||
' CallSub2(B4XPages.MainPage.cliente, "GPS_LocationChanged", Location1)
|
' CallSub2(B4XPages.MainPage.cliente, "GPS_LocationChanged", Location1)
|
||||||
' CallSub2(gestion, "GPS_LocationChanged", Location1)
|
' CallSub2(gestion, "GPS_LocationChanged", Location1)
|
||||||
If B4XPages.MainPage.cliente.IsInitialized Then
|
If B4XPages.MainPage.cliente.IsInitialized Then
|
||||||
Log("Call Cliente GPS_LocationChanged")
|
' Log("Call Cliente GPS_LocationChanged")
|
||||||
CallSub2(B4XPages.GetPage("Cliente"), "GPS_LocationChanged", Location1)
|
CallSub2(B4XPages.GetPage("Cliente"), "GPS_LocationChanged", Location1)
|
||||||
End If
|
End If
|
||||||
' CallSub2(nuevocliente, "GPS_LocationChanged", Location1)
|
' CallSub2(nuevocliente, "GPS_LocationChanged", Location1)
|
||||||
@@ -305,8 +305,8 @@ Sub revisaUUG 'ignore
|
|||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
Sub guardaYEnviaUbicacion(lat As String, lon As String)
|
Sub guardaYEnviaUbicacion(lat As String, lon As String)
|
||||||
LogColor("#######################################", Colors.Magenta)
|
' LogColor("#######################################", Colors.Magenta)
|
||||||
LogColor("#######################################", Colors.Magenta)
|
' LogColor("#######################################", Colors.Magenta)
|
||||||
' LogColor("#######################################", Colors.Magenta)
|
' LogColor("#######################################", Colors.Magenta)
|
||||||
DateTime.DateFormat="yy-MM-dd HH:mm:ss"
|
DateTime.DateFormat="yy-MM-dd HH:mm:ss"
|
||||||
Private fecha As String = DateTime.Date(DateTime.Now)
|
Private fecha As String = DateTime.Date(DateTime.Now)
|
||||||
@@ -319,6 +319,6 @@ Sub guardaYEnviaUbicacion(lat As String, lon As String)
|
|||||||
cmd.Name = "guardaHistorialUbicaciones_ADM3"
|
cmd.Name = "guardaHistorialUbicaciones_ADM3"
|
||||||
If B4XPages.MainPage.lat_gps.Length < 15 Then B4XPages.MainPage.lat_gps = B4XPages.MainPage.lat_gps&"0"
|
If B4XPages.MainPage.lat_gps.Length < 15 Then B4XPages.MainPage.lat_gps = B4XPages.MainPage.lat_gps&"0"
|
||||||
cmd.Parameters = Array As Object(Subs.traeAlmacen, Subs.traeRuta, usuario, lat, lon, fecha)
|
cmd.Parameters = Array As Object(Subs.traeAlmacen, Subs.traeRuta, usuario, lat, lon, fecha)
|
||||||
Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${usuario}, ${lat}, ${lon}, ${fecha}"$)
|
' Log($"${Subs.traeAlmacen}, ${Subs.traeRuta}, ${usuario}, ${lat}, ${lon}, ${fecha}"$)
|
||||||
Starter.reqManager.ExecuteCommand(cmd, $"guardaHistorialUbicaciones_${id}"$)
|
Starter.reqManager.ExecuteCommand(cmd, $"guardaHistorialUbicaciones_${id}"$)
|
||||||
End Sub
|
End Sub
|
||||||
Reference in New Issue
Block a user