diff --git a/FLP_2.0.b4a b/FLP_2.0.b4a index 5f14bdf..7c35921 100644 --- a/FLP_2.0.b4a +++ b/FLP_2.0.b4a @@ -13,6 +13,7 @@ Library14=reflection Library15=replyauto Library16=runtimepermissions Library17=sql +Library18=javaobject Library2=byteconverter Library3=compressstrings Library4=core @@ -23,22 +24,23 @@ Library8=gps Library9=json ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.LightTheme)~\n~'End of default text.~\n~AddPermission(android.permission.ACCESS_FINE_LOCATION)~\n~AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ ~\n~)~\n~~\n~CreateResource(xml, device_admin.xml,~\n~~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~~\n~)~\n~AddPermission(android.permission.SEND_SMS)~\n~AddPermission(android.permission.RECEIVE_SMS)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.READ_CALL_LOG)~\n~AddApplicationText(~\n~~\n~ ~\n~ )~\n~ ~\n~AddPermission(android.permission.RECEIVE_BOOT_COMPLETED)~\n~AddReceiverText(R_Test, ~\n~~\n~) Module1=DBRequestManager -Module2=FirebaseMessaging -Module3=Mods -Module4=NotificationService -Module5=R_Test -Module6=Starter -Module7=Subs -Module8=Tracker +Module2=errorManager +Module3=FirebaseMessaging +Module4=Mods +Module5=NotificationService +Module6=R_Test +Module7=Starter +Module8=Subs +Module9=Tracker NumberOfFiles=2 -NumberOfLibraries=17 -NumberOfModules=8 +NumberOfLibraries=18 +NumberOfModules=9 Version=12.5 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: FLP 2.0 #VersionCode: 1 - #VersionName: 4.01.04 + #VersionName: 4.01.17 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: unspecified #CanInstallToExternalStorage: False diff --git a/FLP_2.0.b4a.meta b/FLP_2.0.b4a.meta index fe4a998..bbf878c 100644 --- a/FLP_2.0.b4a.meta +++ b/FLP_2.0.b4a.meta @@ -7,6 +7,7 @@ ModuleBookmarks5= ModuleBookmarks6= ModuleBookmarks7= ModuleBookmarks8= +ModuleBookmarks9= ModuleBreakpoints0= ModuleBreakpoints1= ModuleBreakpoints2= @@ -16,15 +17,17 @@ ModuleBreakpoints5= ModuleBreakpoints6= ModuleBreakpoints7= ModuleBreakpoints8= +ModuleBreakpoints9= ModuleClosedNodes0= ModuleClosedNodes1= -ModuleClosedNodes2=6,9,10 -ModuleClosedNodes3=1 +ModuleClosedNodes2= +ModuleClosedNodes3= ModuleClosedNodes4= ModuleClosedNodes5= ModuleClosedNodes6= -ModuleClosedNodes7=2,5,6,7,9,11,13,14,16,19,20 -ModuleClosedNodes8=8,11,12 -NavigationStack=Starter,Service_Create,37,0,Starter,Process_Globals,26,0,Starter,restartTracker,84,0,Starter,PE_PhoneStateChanged,101,6,Main,b_pong_Click,92,0,Main,chkPermisosAlmacenamientoExterno,124,0,Main,b_pong_LongClick,114,0,Main,chkPermisosLeerLlamadas,145,0,Main,chkPermisosUbicacion,138,0,Main,chkPermisosEstadoTelefono,146,3,Main,Activity_Resume,71,0 +ModuleClosedNodes7= +ModuleClosedNodes8= +ModuleClosedNodes9= +NavigationStack=Tracker,flpReConnect,197,0,Starter,Service_Create,67,0,errorManager,Activity_Resume,91,0,Starter,Application_Error,67,0,Starter,Process_Globals,18,5,Tracker,Process_Globals,28,0,Tracker,Service_Destroy,189,0,Tracker,StopFLP,141,1,Tracker,CreateLocationRequest2,136,0,NotificationService,NotiMon_NotificationPosted,69,0,Subs,revisaYmandaUUC,289,6 SelectedBuild=0 -VisibleModules=6,2,8,3,7,4,5 +VisibleModules=7,3,9,4,8,5,6,2 diff --git a/Starter.bas b/Starter.bas index 6f0952c..4341e46 100644 --- a/Starter.bas +++ b/Starter.bas @@ -23,7 +23,7 @@ Sub Process_Globals Dim devModel As String Dim lastLocUpdate As String = 0 Dim logger As Boolean = True - + Dim errorLog As SQL Dim PE As PhoneEvents Dim PhId As PhoneId diff --git a/Subs.bas b/Subs.bas index 4c8562c..e1c0fa1 100644 --- a/Subs.bas +++ b/Subs.bas @@ -291,8 +291,12 @@ Sub revisaYmandaUUC ' bitacora(Tracker.flp.SuspendedCause) 'ignore Starter.UUC.Time = DateTime.Now guardaInfoEnBD(Starter.UUC) 'Guardamos la ultima ubicacion con la hora actual, para que no se reinicie la app si no consigue una ubicacion nueva. - Sleep(1000) - ExitApplication +' Sleep(1000) + StopService(Tracker) + Sleep(5000) + StartService(Tracker) + CallSubDelayed(Tracker, "StartFLP") +' ExitApplication End If End If ' LogColor($"Ultima loc: ${Subs.fechaNormal(ultimaLoc.Time)}"$, Colors.blue) diff --git a/Tracker.bas b/Tracker.bas index e738d94..8ecfa3a 100644 --- a/Tracker.bas +++ b/Tracker.bas @@ -145,7 +145,7 @@ End Sub Public Sub StopFLP If Starter.logger Then Log("StopFLP") If flpStarted Then - flp.RemoveLocationUpdates 'Eliminamos todas las solicitudes de ubicacion + If flp.IsConnected Then flp.RemoveLocationUpdates 'Eliminamos todas las solicitudes de ubicacion flpStarted = False End If End Sub @@ -192,7 +192,11 @@ End Sub Sub Service_Destroy If Tracking Then - StopFLP + Try + StopFLP + Catch + Log(LastException) + End Try End If Tracking = False lock.ReleasePartialLock