From a533f7b8e38ea7bd65798ba877e0046262b54b40 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Fri, 13 Jun 2025 22:26:40 -0600 Subject: [PATCH] - VERSION 5.06.13.1 - Se cambio el SDK a 28 para que corra en Android 15. - Se puso el nuevo servidor. - Se corrigio que no guardaba el servidor. --- Files/detalle_promo.bal | Bin 2682 -> 2747 bytes Files/fila.bal | Bin 6829 -> 6829 bytes Files/info_gral.bal | Bin 20356 -> 20356 bytes Files/login.bal | Bin 9878 -> 9878 bytes Files/pedido.bal | Bin 11335 -> 11335 bytes Files/productos.bal | Bin 16455 -> 16455 bytes Files/seleccion.bal | Bin 18580 -> 18992 bytes Files/tarjeta.bal | Bin 6823 -> 6823 bytes Starter.bas | 3 +- intmex_reparto.b4a | 62 ++++++++++++++++++++++++---------------- intmex_reparto.b4a.meta | 8 +++--- seleccion.bas | 7 ++++- 12 files changed, 49 insertions(+), 31 deletions(-) diff --git a/Files/detalle_promo.bal b/Files/detalle_promo.bal index 14ef3fb69faf1bf3fa06c06079680333583b078b..673a2bc61025f05e5088d5afd5e2bfbe7c530df8 100644 GIT binary patch delta 452 zcmew*vRib6Dot7Q3OcX05PX6 zkgx+W>?a@RNJw@7GMRyxfzuI4Fo76OK!O#BA;QiuVHY3+1X!?n#}z1n!#i%18#$%w zL59i#G2<2>f$BGqUR1xi14UTz`_KcZ1meU0{~m8010^PlaHRnNHzhC{ delta 391 zcmZ{fNe%%)6oy~vZn{N+#LyuuY{bSq&r@4D0T#Wra|4H{i%9g2d$@)rHtl~zq9ZE# zzkKyxRi)l3{)incAr{AlaC|bXE{|LFqU6Iwq=^V<6oC>;5-1}9B70KdN>%Rk{HFG4 z###7y0SP5|7X|7p4ZvjKSDGv>ppE$5>&?wVL=5O4Mi=O@^yOW*R|BYmkTC>&EF(Ze z-sLguRh~e2sbBw}V*ls=GkG>rdwwf}2nX;E!*{*I%u&()jbx$e9my0wBjHRAL4zob I$aT=j>CIA2c diff --git a/Files/fila.bal b/Files/fila.bal index edc036b2f5f04bab04df1f685e8ff4c4f0a5be37..abd04b0ebb2ea07110a384ccea30cd03de9f5d69 100644 GIT binary patch delta 33 hcmZ2$y4G~V2a(AllAe?G_>4AZi%w^Rb85v6m;ulN3eo@o delta 61 wcmZ2$y4G~V2NBK>KmN-yFfcH3O@1h(JlR1~cCsFy(dKN?>5Mp}YQ+th0k=&QQ~&?~ diff --git a/Files/info_gral.bal b/Files/info_gral.bal index 9e8be1cc2fc6bc198306a571c0da13c8b40e4196..e9262dc64f3fe41d274c52cf7290a825fd593e0b 100644 GIT binary patch delta 124 zcmZpf&)71baYKR<=l}ozy?{v~<|KQt2lb)BpdIZ|U1ju5;$x{95-dBapxO zmi|6YkoW~_yU7cbI5$7Egot0TwqOOxb2*wYfoKP3Fb!1azIm_f29Vt3Mqj(lYrQXl K&1v*yW&!}_GdcDE delta 124 zcmZpf&)71baYKR<=Z7Evy?{v~<|KQt2lb(}y3EZ|U1ju5;$x{95-dBapxO zmi|6YkoW~_yU7cbI5$7Egot0TwqOOxb2*wYfoKP3Fb!1azIm_f29Vt3Mqj(lYrQXl K&1v*yW&!}Vn>iW) diff --git a/Files/login.bal b/Files/login.bal index 1427d2b04a274bcc3a7865e8594840326863ec38..d61c2136d9b87a272e4b92e1bae51051945a494e 100644 GIT binary patch delta 52 zcmbQ{JI!~)4}r;%3J#ks1jU3V$4hc-4pXjVoP0n+Wb=D&DwDt%6tg%H77~-r9L19pB)pRu92B$TBn|-y@c923 S000013X@L~BLM)D9wvDE`xUzY diff --git a/Files/pedido.bal b/Files/pedido.bal index defff340adf4e3442a09347602c4b9fea38dec9e..94d96cceb504d27e06275013d5a7470ffef3930a 100644 GIT binary patch delta 34 mcmX>eaXey!g(B1c|C4)^>^4^@3NZrNn|qWDI6-3jv^xP63lGHr delta 34 mcmX>eaXey!g(B03ACr5O>^4^@3NZrNn|qWDI6-3jv^xP2EDwVK diff --git a/Files/productos.bal b/Files/productos.bal index 00a4ba610526108568826cde6185aada44f2abde..5c919a401726f39dbb13e8d75cd6a7df13c78d81 100644 GIT binary patch delta 64 zcmX@!z<9iYaYKOw*Z=?j#TghF7|j?b3#w{N=GWufyg}kNBh&x?n|q}snSk`m*KLCXk3BigBBL_?L4r|NsAg z@&dK)$&FGIn1D=vO@qmA)x|eQNq=Pr@;3)6XR$!VH@{V%B?A)cbot24xNY)8Io-(* z)FdVwsBlaUag$}-KH1GdXYxEZ6(H-Og5G3)Bd*C?#2jQK7#SEOfz~s!0|_Y*BLGN9 XgBWs?7YfTy))(iRT<^ih#K-^uCxAzS delta 141 zcmdlmg>lM6MqXA128NA5f(u9+Z{%IWIQbakc}BI()0ieRPBvtb5Y+=p=mW7K5HkZY z3lJM^PGTuwWZbs-GV3JH%@zF1xh5-!2u;pcs+qi2YQkhoO{2~E(mWiK<%JwJ?^f1f j0f|h`mloe_pwTP?84G0DN2t!vFvP diff --git a/Starter.bas b/Starter.bas index 7d38909..a964fb3 100644 --- a/Starter.bas +++ b/Starter.bas @@ -32,6 +32,7 @@ Sub Process_Globals Public SharedFolder As String 'Para actualizar apk Dim cedisLocation As Location Dim reqManager As DBRequestManager + Dim server As String End Sub Sub Service_Create @@ -98,7 +99,7 @@ Sub ENVIA_ULTIMA_GPS Dim skmt As SQL Dim cmd As DBCommand Dim reqManager As DBRequestManager - reqManager.Initialize(Me, Main.server) + reqManager.Initialize(Me, server) skmt.Initialize(ruta,"kmt.db", True) ' Log("server: "&Main.server) diff --git a/intmex_reparto.b4a b/intmex_reparto.b4a index 133c0e3..69c4732 100644 --- a/intmex_reparto.b4a +++ b/intmex_reparto.b4a @@ -1,4 +1,4 @@ -Build1=Default,intmex_rep.keymon.com.mx +Build1=Default,intmex_rep.keymon.com.mx,HU2_PUBLIC File1=alert2.png File10=foto.bal File11=guardagestion.bal @@ -104,7 +104,7 @@ Library6=core Library7=fusedlocationprovider Library8=googlemaps Library9=googlemapsextras -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: http://www.basic4ppc.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~'End of default text.~\n~~\n~''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~'End of default text.~\n~ ~\n~ '''''''''''PUSH~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddManifestText()~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText(~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~AddManifestText()~\n~'/////////////// FLP y FBMessageing MOD Inicia /////////////////////~\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~'/////////////// FLP y FBMessageing MOD Termina /////////////////////~\n~~\n~'/////////////////////// App Updating ////////////////~\n~ AddManifestText(~\n~ )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\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: http://www.basic4ppc.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~'End of default text.~\n~~\n~''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~'End of default text.~\n~ ~\n~ '''''''''''PUSH~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddManifestText()~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText(~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~AddManifestText()~\n~'/////////////// FLP y FBMessageing MOD Inicia /////////////////////~\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~'/////////////// FLP y FBMessageing MOD Termina /////////////////////~\n~~\n~'/////////////////////// App Updating ////////////////~\n~ AddManifestText(~\n~ )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ) Module1=BatteryUtilities Module10=gestion Module11=Historico @@ -136,7 +136,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Intmex-Reparto #VersionCode: 1 - #VersionName: 4.08.05 + #VersionName: 5.06.13.1 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -207,10 +207,10 @@ Sub Globals Private b_regesar As Button Private p_serverList As Panel Public Provider As FileProvider + Private l_version As Label End Sub Sub Activity_Create(FirstTime As Boolean) - ' If File.ExternalWritable Then ' ruta = Starter.rp.GetSafeDirDefaultExternal("") ' Else @@ -228,7 +228,14 @@ Sub Activity_Create(FirstTime As Boolean) Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PAGARES (PA_ALMACEN TEXT, PA_RUTA_REP TEXT, PA_RUTAPREV TEXT, PA_FECHA_PREV TEXT, PA_CAPTURA TEXT, PA_MONTO TEXT, PA_USUARIO TEXT, PA_CLIENTE TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS wayPoints (codigo TEXT, indice INT)") - Dim server As String = "http://187.189.244.154:1781" + Dim server As String = "http://keymon.net:1781" + Private s As Cursor = Starter.skmt.ExecQuery("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'SERVER'") + Log(s.RowCount) + If s.RowCount > 0 Then + s.Position = 0 + Log("Ponemos el servidor desde CAT_VARIABLES: " & s.GetString("CAT_VA_VALOR")) + server = s.GetString("CAT_VA_VALOR") + End If ' Dim server As String = "http://11.0.0.107:1781" ' server = "http://10.0.0.205:1782" ' server = "http://11.0.0.44:1782" @@ -276,7 +283,6 @@ Sub Activity_Resume Wait For Activity_PermissionResult (Permission As String, resultC As Boolean) Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE) Wait For Activity_PermissionResult (Permission As String, resultC As Boolean) - ' CallSubDelayed(FirebaseMessaging, "SubscribeToTopics") End Sub @@ -301,7 +307,6 @@ Sub Entrar_Click 'existe = 1 If existe = 0 Then 'skmt.ExecNonQuery("delete from usuarioa") - Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_usuario_INTMEX_REPG" @@ -338,13 +343,8 @@ Sub JobDone(Job As HttpJob) Dim result As DBResult = reqManager.HandleJob(Job) If result.Tag = "agencia" Then 'query tag For Each records() As Object In result.Rows - Dim ID_ALMACEN As String = records(result.Columns.Get("ID_ALMACEN")) - - - Next - End If End If @@ -392,8 +392,14 @@ Sub Activity_KeyPress (key As Int) As Boolean Return False End Sub - Private Sub i_engrane_Click + Private s As Cursor = Starter.skmt.ExecQuery("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'SERVER'") + Log(s.RowCount) + If s.RowCount > 0 Then + s.Position = 0 + Log(s.GetString("CAT_VA_VALOR")) + et_server.Text = s.GetString("CAT_VA_VALOR") + End If p_appUpdate.Width = Activity.Width p_appUpdate.Height = Activity.Height Subs.centraPanel(p_serverList, Activity.Width) @@ -403,8 +409,8 @@ Private Sub i_engrane_Click Subs.centraBoton(b_regesar, Activity.Width) Subs.centraBoton(b_server, p_serverList.Width) lv_server.Clear - lv_server.AddSingleLine("http://keymon.lat:1782") - If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1782") + lv_server.AddSingleLine("http://keymon.net:1781") + If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://192.99.93.204:1781") ' l_server.Text = Starter.server et_server.Text = server Subs.panelVisible(p_appUpdate, 0, 0) @@ -438,15 +444,21 @@ Private Sub b_apk_Click End Sub Private Sub b_server_Click -' Log("Guardar servidor") -' Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("SERVER")) -' Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("SERVER",et_server.text)) -' Starter.server = et_server.text -' Starter.server = B4XPages.MainPage.server -' If logger Then Log("Inicializamos reqManager con " & B4XPages.MainPage.server) -' reqManager.Initialize(Me, B4XPages.MainPage.server) -' LogColor($"ReqServer = ${B4XPages.MainPage.server}"$, Colors.red) + Log("Guardar servidor") + Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("SERVER")) + Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("SERVER",et_server.text)) + Log(et_server.text) + Starter.server = et_server.text + server = et_server.text + If logger Then Log("Inicializamos reqManager con " & server) + reqManager.Initialize(Me, server) + LogColor($"ReqServer = ${server}"$, Colors.red) ' reinicializaReqManager -' p_appUpdate.Visible = False -'' Entrar.Visible = True + p_appUpdate.Visible = False +' Entrar.Visible = True +End Sub + +Private Sub lv_server_ItemClick (Position As Int, Value As Object) + Log(Value) + et_server.text = Value End Sub \ No newline at end of file diff --git a/intmex_reparto.b4a.meta b/intmex_reparto.b4a.meta index 95956c0..741b562 100644 --- a/intmex_reparto.b4a.meta +++ b/intmex_reparto.b4a.meta @@ -46,7 +46,7 @@ ModuleBreakpoints6= ModuleBreakpoints7= ModuleBreakpoints8= ModuleBreakpoints9= -ModuleClosedNodes0= +ModuleClosedNodes0=5,9,10 ModuleClosedNodes1= ModuleClosedNodes10= ModuleClosedNodes11= @@ -56,7 +56,7 @@ ModuleClosedNodes14= ModuleClosedNodes15= ModuleClosedNodes16= ModuleClosedNodes17= -ModuleClosedNodes18=6,7,8,9 +ModuleClosedNodes18=3,6,7,8,9,10,11,13 ModuleClosedNodes19=3,4,5,6,7,8 ModuleClosedNodes2= ModuleClosedNodes20= @@ -70,6 +70,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=seleccion,e_ruta_EnterPressed,1051,0,fila,ListView1_ItemLongClick,247,0,fila,Guardado,274,0,fila,b_cancred_Click,588,4,Main,Activity_Create,93,0,fila,b_acred_Click,627,2,fila,gest_Click,319,6,seleccion,Subir_Click,470,6,nopago,Activity_Create,50,0,nopago,Activity_Resume,65,6 +NavigationStack=Historico,Globals,29,0,Starter,Service_TaskRemoved,75,0,Main,Activity_Create,83,6,seleccion,connecta_Click,1079,2,seleccion,JobDone,1009,0,seleccion,Activity_Resume,190,3,seleccion,Activity_Create,171,5,Diseñador Visual,tarjeta.bal,-100,2,Diseñador Visual,seleccion.bal,-100,6,Main,b_server_Click,310,0 SelectedBuild=0 -VisibleModules=19,23,20,18,4,5,8,15,6,9 +VisibleModules=19,23,20,18,4,5,8,15,6,9,13,11 diff --git a/seleccion.bas b/seleccion.bas index 4366c70..1d96075 100644 --- a/seleccion.bas +++ b/seleccion.bas @@ -96,12 +96,14 @@ Sub Globals Private Btn_Ubicar_Ru As Button Dim cargo As String Private p_principal As Panel + Private l_version As Label End Sub Sub Activity_Create(FirstTime As Boolean) EJECUTANDO=1 If FirstTime Then reqManager.Initialize(Me, Main.server) + Log(Main.server) 'reqManager.Initialize(Me,"http://201.99.139.28:1782") 'reqManager.Initialize(Me,"http://177.244.63.54:1782") 'reqManager.Initialize(Me,"http://keymon.com.mx:1782") @@ -191,6 +193,7 @@ End Sub Sub Activity_Resume reqManager.Initialize(Me, Main.server) + Log("-------> " & Main.server) Subs.centraPanel(p_principal, Activity.Width) c=Starter.skmt.ExecQuery("select noversion from version") c.Position=0 @@ -342,6 +345,8 @@ Sub Activity_Resume If c.RowCount > 0 Then RUTA_T = c.GetString("RUTAA") Main.rutaPreventa = RUTA_T c.Close + l_version.Text = Application.VersionName + l_version.Left = Activity.Width - l_version.Width End Sub Sub IsConnectedToInternet As Boolean 'ignore @@ -1066,7 +1071,7 @@ Sub Activity_KeyPress (key As Int) As Boolean End Sub Sub connecta_Click - imei = p.GetDeviceId + imei = "" ' p.GetDeviceId conn = "1" Dim cmd As DBCommand cmd.Initialize