Cambios en como se envian los cambios de ubicacion y como se mantiene el servicio activo

2026-04-17 19:36:42 +00:00 · 2023-09-30 06:00:20 -06:00
parent c9e05a01df
commit 68bac1707c
6 changed files with 112 additions and 32 deletions
--- a/Tracker.bas
+++ b/Tracker.bas
@@ -37,29 +37,46 @@ Sub Process_Globals
 	Private Tracking As Boolean
 	Private lock As PhoneWakeState
 	'Para FusedLocationProvider (2 lineas)
-	Public FLP As FusedLocationProvider
+	Public flp As FusedLocationProvider
 	Private flpStarted As Boolean
 	Dim minAccuracy As Int = 50
+	Dim killerCalled As Int = 0
 End Sub

 Sub Service_Create
 	Service.AutomaticForegroundMode = Service.AUTOMATIC_FOREGROUND_NEVER 'we are handling it ourselves
 	'Para FusedLocationProvider (2 lineas)
-	FLP.Initialize("flp")
-	FLP.Connect
+	flp.Initialize("flp")
+	flp.Connect
 	lock.PartialLock
 	StartFLP
 	If Starter.logger Then Log("FLP initialized")
-	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${Starter.devModel}', 'Iniciamos Tracker', '${Subs.fechaKMT(DateTime.now)}')"$)
+	Subs.bitacora($"Iniciamos Tracker"$)
+'	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${Starter.devModel}', 'Iniciamos Tracker', '${Subs.fechaKMT(DateTime.now)}')"$)
+End Sub
+
+Sub flpReConnect
+	Try
+		If killerCalled = 0 Then
+			killerCalled = 1
+			Subs.bitacora("Llamamos RESTART-TRACKER")
+			CallSubDelayed(Starter, "restartTracker")
+		Else
+			Subs.bitacora("Llamamos EXIT-APP")
+			ExitApplication
+		End If
+	Catch
+		Log(LastException)
+	End Try
 End Sub

 Sub flp_ConnectionSuccess
-	If Starter.logger Then Log("Connected to location provider")
+	Log("FLP - Connected to location provider")
 	'FLP.GetLastKnownLocation
 End Sub

 Sub flp_ConnectionFailed(ConnectionResult1 As Int)
-	If Starter.logger Then Log("Failed to connect to location provider")
+	Log("Failed to connect to location provider")
 End Sub

 Sub Service_Start (StartingIntent As Intent)
@@ -68,7 +85,8 @@ Sub Service_Start (StartingIntent As Intent)
 	Service.StartForeground(nid, Subs.CreateNotification("..."))
 	Track
 	StartServiceAt(Me, DateTime.Now + 10 * DateTime.TicksPerMinute, True)
-	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${starter.devModel}', 'Tracker - Service_Start', '${Subs.fechaKMT(DateTime.now)}')"$)
+	Subs.bitacora($"Tracker - Service_Start"$)
+'	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${Starter.devModel}', 'Tracker - Service_Start', '${Subs.fechaKMT(DateTime.now)}')"$)
 End Sub

 Public Sub Track
@@ -84,14 +102,22 @@ End Sub

 Public Sub StartFLP
 '	Log("StartFLP - flpStarted="&flpStarted)
-	Do While FLP.IsConnected = False
+	Private cont As Int = 0
+	Do While flp.IsConnected = False
 		Sleep(500)
-		Log("sleeping")
+		Log($"FLP Sleeping - ${cont}"$)
+		Subs.bitacora($"Sleeping - ${cont}"$)
+		cont = cont + 1
+		If cont > 70 Then
+			cont = 0
+			Log("Reiniciamos FLP")
+			flpReConnect
+		End If
 	Loop
 '	If flpStarted = False Then
 '	Log("RequestLocationUpdates")
 '	Starter.FLPStatus = "Searching" : LogColor("FLP Searching", Colors.blue)
-	FLP.RequestLocationUpdates(CreateLocationRequest) 'Buscamos ubicacion
+	flp.RequestLocationUpdates(CreateLocationRequest) 'Buscamos ubicacion
 	flpStarted = True
 '	End If
 End Sub
@@ -108,22 +134,23 @@ Private Sub CreateLocationRequest As LocationRequest
 	Return lr
 End Sub

-Sub dameUltimaUbicacionConocida(lastLocation As Location) '
+Sub dameUltimaUbicacionConocida(lastLocation As Location) 'ignore
 	If Starter.logger Then LogColor("dameUltimaUbicacionConocida", Colors.Magenta)
 '	Subs.gps_hist.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTA_GPS(FECHA INTEGER, LAT TEXT, LON TEXT)")
 	If Starter.logger Then Log("This accuracy: " & Starter.UUC.Accuracy)
-	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${Starter.devModel}', 'Enviamos UUC - Acc: ${Starter.UUC.Accuracy}, Time:${Starter.UUC.Time}', '${Subs.fechaKMT(DateTime.now)}')"$)
-	Dim coords As String = Starter.UUC.Latitude & ","&Starter.UUC.Longitude & ","&Subs.formatoFecha(Starter.UUC.Time)
+	Subs.bitacora($"Enviamos UUC - Acc: ${Starter.UUC.Accuracy}, Time:${Starter.UUC.Time}"$)
+'	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${Starter.devModel}', 'Enviamos UUC - Acc: ${Starter.UUC.Accuracy}, Time:${Starter.UUC.Time}', '${Subs.fechaKMT(DateTime.now)}')"$)
 	Subs.mandaLocAServer(Starter.UUC, Starter.devModel)
-	CallSubDelayed2(FirebaseMessaging,"mandamosLoc",coords)
-	If Starter.logger Then Log("Mandamos GetLastKnownLocation : "&DateTime.Time(FLP.GetLastKnownLocation.Time))
+	FirebaseMessaging.locRequest = "Activa"
+	CallSubDelayed2(FirebaseMessaging,"mandamosLoc", Starter.UUC)
+	If Starter.logger Then Log("Mandamos GetLastKnownLocation : "&DateTime.Time(flp.GetLastKnownLocation.Time))
 	If Starter.logger Then Log($"UUC: ${Starter.UUC.Latitude},${Starter.UUC.Longitude}"$)
 End Sub

 Public Sub StopFLP
 	'Log("StopFLP")
 	If flpStarted Then
-		FLP.RemoveLocationUpdates  'Eliminamos todas las solicitudes de ubicacion
+		flp.RemoveLocationUpdates  'Eliminamos todas las solicitudes de ubicacion
 		flpStarted = False
 	End If
 End Sub
@@ -132,10 +159,12 @@ Sub flp_LocationChanged (Location1 As Location)
 '	Starter.FLPStatus = "Location changed" : LogColor("Location changed", Colors.blue)
 	Dim el_texto As String = ""
 	Starter.UUC = Location1
-	If Not(Starter.Timer1.Enabled) Then Starter.Timer1.Enabled = True : Log("timer enabled")
+	If Not(Starter.Timer1.Enabled) Then
+		Starter.Timer1.Enabled = True
+		Log("FLP - Timer Enabled")
+	End If
 	If Starter.logger Then LogColor("FLP_LocationChanged", Colors.Red)
 '	ToastMessageShow("FLP_LocationChanged", False)
-	Dim coords As String = Location1.Latitude&","&Location1.Longitude&","&Subs.formatoFecha(DateTime.Now)
 	Main.laUbicacion = Location1
 '	ToastMessageShow(coords, False)
 '	Log("Mandamos Ubicacion")
@@ -145,15 +174,16 @@ Sub flp_LocationChanged (Location1 As Location)
 	' solo mandamos la ubicacion si la precision es dentro de XX mts
 	el_texto = $"LocChange - Coords NO enviadas (Acc:${Location1.Accuracy})."$
 	If Location1.Accuracy < minAccuracy Then
-		CallSubDelayed2(FirebaseMessaging,"mandamosLoc", coords)
 		Subs.mandaLocAServer(Location1, Starter.devModel)
-		Dim coords As String = Location1.Latitude&","&Location1.Longitude&","&Subs.formatoFecha(Location1.Time)
-		CallSubDelayed2(FirebaseMessaging,"mandamosLoc",coords)
+		FirebaseMessaging.locRequest = "Activa"
+		CallSubDelayed2(FirebaseMessaging,"mandamosLoc", Location1)
 		el_texto = $"LocChange - Coords enviadas (Acc:${Location1.Accuracy})."$
 	End If
 	If Starter.logger Then Log("Loc changed : "&Location1.Latitude&","&Location1.Longitude&"|"&Starter.devModel&"|")
 	Subs.gps_hist.ExecNonQuery("CREATE TABLE IF NOT EXISTS BITACORA(RUTA TEXT, TEXTO TEXT, FECHA TEXT)")
-	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${Starter.devModel}', '${el_texto}', '${Subs.fechaKMT(DateTime.now)}')"$)
+	Subs.bitacora($"${el_texto}"$)
+	ToastMessageShow(el_texto, False)
+'	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${Starter.devModel}', '${el_texto}', '${Subs.fechaKMT(DateTime.now)}')"$)
 	CallSubDelayed(Main, "ponCoords")
 End Sub

@@ -163,5 +193,6 @@ Sub Service_Destroy
 	End If
 	Tracking = False
 	lock.ReleasePartialLock
-	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${Starter.devModel}', 'Tracker - Service_Destroy', '${Subs.fechaKMT(DateTime.now)}')"$)
+	Subs.bitacora($"Tracker - Service_Destroy"$)
+'	Subs.gps_hist.ExecNonQuery($"insert into BITACORA (RUTA, TEXTO, FECHA) values ('${Starter.devModel}', 'Tracker - Service_Destroy', '${Subs.fechaKMT(DateTime.now)}')"$)
 End Sub