From 4bacb20c6a449775c86b0cbc321c935818cc9479 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Tue, 3 Jun 2025 11:04:12 -0600 Subject: [PATCH] - VERSION 5.05.27 - Prueba release --- B4A/B4XMainPage.bas | 2 ++ B4A/C_Principal.bas | 2 +- B4A/Mariana Censos.b4a | 2 +- B4A/Mariana Censos.b4a.meta | 2 +- B4A/Starter.bas | 19 ++++++++++--------- B4A/Subs.bas | 9 +++++---- 6 files changed, 20 insertions(+), 16 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index b83f54a..31b2779 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -21,6 +21,8 @@ Version=9.85 'Ctrl + click to export as zip: ide://run?File=%B4X%\Zipper.jar&Args=Project.zip + + Sub Class_Globals Private Root As B4XView ' Dim rp As RuntimePermissions diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 4effec7..4957192 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -588,7 +588,7 @@ Sub JobDone(Job As HttpJob) B4XPages.ShowPage("B4XMainPage") End If Log("***************** "&n) - End If + End If If RESULT.Tag = "kmt_datos" Then 'query tag ' Subs.logJobDoneResultados(RESULT) diff --git a/B4A/Mariana Censos.b4a b/B4A/Mariana Censos.b4a index 9d2079f..7e170a3 100644 --- a/B4A/Mariana Censos.b4a +++ b/B4A/Mariana Censos.b4a @@ -730,7 +730,7 @@ Library6=byteconverter Library7=camera Library8=compressstrings Library9=core -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~AddApplicationText(~\n~)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~AddManifestText(~\n~ ~\n~ )~\n~AddApplicationText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~)~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~ ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~ AddManifestText(~\n~~\n~) AddManifestText(~\n~~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'///////////////////////// FLP Y PUSH /////////////~\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~'//////////////////////////////////////////////////////~\n~~\n~'/////////////////////// App Updating ////////////////~\n~ AddManifestText(~\n~ )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~'AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~~\n~ 'Para que se registre para abrir bases de datos~\n~ AddActivityText(main,~\n~~\n~~\n~~\n~~\n~)~\n~ +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~AddApplicationText(~\n~)~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~AddManifestText(~\n~ ~\n~ )~\n~AddApplicationText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~)~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~ ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~ AddManifestText(~\n~~\n~) AddManifestText(~\n~~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'///////////////////////// FLP Y PUSH /////////////~\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~'//////////////////////////////////////////////////////~\n~~\n~'/////////////////////// App Updating ////////////////~\n~ AddManifestText(~\n~ )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~~\n~AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~AddPermission(android.permission.INTERNET)~\n~AddPermission(android.permission.INSTALL_PACKAGES)~\n~AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~'AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~AddPermission(android.permission.READ_PHONE_STATE)~\n~AddPermission(android.permission.WAKE_LOCK)~\n~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~~\n~ 'Para que se registre para abrir bases de datos~\n~' AddActivityText(main,~\n~'~\n~'~\n~'~\n~'~\n~')~\n~~\n~ 'Para que se registre para abrir bases de datos~\n~ AddActivityText(main,~\n~~\n~~\n~~\n~~\n~~\n~)~\n~ Module1=appUpdater Module10=C_UpdateAvailable Module11=CameraExClass2 diff --git a/B4A/Mariana Censos.b4a.meta b/B4A/Mariana Censos.b4a.meta index 653ceab..0d33685 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_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,Starter,ENVIA_ULTIMA_GPS,75,0,B4XMainPage,i_engrane_Click,639,0 +NavigationStack=Subs,traeAlmacen,657,0,B4XMainPage,B4XPage_Created,190,0,Subs,traeUsarIntentBDWA,1332,4,B4XMainPage,B4XPage_Appear,225,0,Subs,importaBDDesdeWhatsApp,1341,6,Starter,JobDone,133,6,Starter,Process_Globals,20,0,Starter,Service_Create,35,0,C_Principal,Class_Globals,0,0,C_Principal,B4XPage_Created,240,0,C_Principal,JobDone,584,0 SelectedBuild=0 VisibleModules=14,2,9,4,8,15,7,16,13,5 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 64649a8..1832a05 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -24,7 +24,7 @@ Sub Process_Globals ' 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 = 10 + Dim Interval As Int = 300 Dim ruta As String = File.DirInternal 'Para los Logs Private logs As StringBuilder @@ -137,16 +137,17 @@ Sub JobDone(Job As HttpJob) If resultado.Tag = "delCatRutas" Then Log(123) Subs.logJobDoneResultados(resultado) - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_UTR_MARDS_C" - If B4XPages.MainPage.lat_gps.Length < 15 Then B4XPages.MainPage.lat_gps = B4XPages.MainPage.lat_gps&"0" - cmd.Parameters = Array As Object(Subs.traeAlmacen, B4XPages.MainPage.batt, B4XPages.MainPage.principal.l_dia.tag, B4XPages.MainPage.principal.l_nuevos_c.text, B4XPages.MainPage.principal.l_nuevos_p.text, Subs.traeRuta, B4XPages.MainPage.principal.l_total.text, Subs.traeUsuarioDeBD, B4XPages.MainPage.principal.l_visitados.text, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps) - If logger Then Log($"${Subs.traeAlmacen}, ${B4XPages.MainPage.batt}, ${B4XPages.MainPage.principal.l_dia.tag}, ${B4XPages.MainPage.principal.l_nuevos_c.text}, ${B4XPages.MainPage.principal.l_nuevos_p.text}, ${Subs.traeRuta}, ${B4XPages.MainPage.principal.l_total.text}, ${Subs.traeUsuarioDeBD}, ${B4XPages.MainPage.principal.l_visitados.text}, ${B4XPages.MainPage.lat_gps}, ${B4XPages.MainPage.lon_gps}"$) - reqManager.ExecuteCommand(cmd, "ins_UTR") + If B4XPages.MainPage.principal.l_dia.IsInitialized Then + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "insert_UTR_MARDS_C" + If B4XPages.MainPage.lat_gps.Length < 15 Then B4XPages.MainPage.lat_gps = B4XPages.MainPage.lat_gps&"0" + cmd.Parameters = Array As Object(Subs.traeAlmacen, B4XPages.MainPage.batt, B4XPages.MainPage.principal.l_dia.tag, B4XPages.MainPage.principal.l_nuevos_c.text, B4XPages.MainPage.principal.l_nuevos_p.text, Subs.traeRuta, B4XPages.MainPage.principal.l_total.text, Subs.traeUsuarioDeBD, B4XPages.MainPage.principal.l_visitados.text, B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps) + If logger Then Log($"${Subs.traeAlmacen}, ${B4XPages.MainPage.batt}, ${B4XPages.MainPage.principal.l_dia.tag}, ${B4XPages.MainPage.principal.l_nuevos_c.text}, ${B4XPages.MainPage.principal.l_nuevos_p.text}, ${Subs.traeRuta}, ${B4XPages.MainPage.principal.l_total.text}, ${Subs.traeUsuarioDeBD}, ${B4XPages.MainPage.principal.l_visitados.text}, ${B4XPages.MainPage.lat_gps}, ${B4XPages.MainPage.lon_gps}"$) + reqManager.ExecuteCommand(cmd, "ins_UTR") + End If End If End If Job.Release End If - End Sub diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 0a12efc..7af83ae 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -1337,20 +1337,21 @@ Sub traeUsarIntentBDWA As Boolean 'ignore x.Position = 0 If x.GetString("CAT_VA_VALOR") = "true" Then BDWA = True End If -' Log($"cb_importarBDWA = ${BDWA}"$) Return BDWA End Sub ' Se revisa si hay una intención (intent) de abrir una base de datos y si es así, entonces se importa esa base de datos. Sub importaBDDesdeWhatsApp + Log($"IMPORTAMOS BD DESDE WA"$) Private tmpBDWA As Boolean = traeUsarIntentBDWA + Log("IN: " & in.As(String)) + Log("INTRNT USADO: " & intentUsado) If Not(in.IsInitialized) Then in = B4XPages.GetNativeParent(B4XPages.MainPage).GetStartingIntent ' Si se usa esta funcion en Mainpage, se pone "Me" en lugar de B4XPages.MainPage. If Not(intentUsado) And in <> Null Then -' Log(in) intentUsado = True -' Log(in.As(String)) + Log(in.As(String)) If in.GetData <> Null Then -' Log(333) + Log(333) Dim XmlData As String XmlData = in.GetData Try