From b65e1b285f3548e8827991fca91bf2753eaed3ca Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Wed, 17 Sep 2025 20:46:06 -0600 Subject: [PATCH] =?UTF-8?q?-=20VERSION=205.07.24=20-=20Cambios=20en=20el?= =?UTF-8?q?=20c=C3=B3digo=20de=20la=20geoceca,=20que=20no=20se=20activaba/?= =?UTF-8?q?desactivaba=20cuando=20estaba=20cerca=20del=20almacen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/B4XMainPage.bas | 7 ++++++- B4A/C_Cliente.bas | 43 +++++++++++++++++++++--------------------- B4A/C_Principal.bas | 1 - B4A/Files/cliente.bal | Bin 38928 -> 38919 bytes B4A/Mariana.b4a | 2 +- B4A/Mariana.b4a.meta | 6 +++--- B4A/Starter.bas | 9 ++++++--- B4A/Subs.bas | 7 ++++--- 8 files changed, 41 insertions(+), 34 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index cd2bf67..3502f6a 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -380,6 +380,11 @@ Sub B4XPage_Appear ' ks.Initialize(Me, "ks") ' ks.vacuum ' ks.centraEtiqueta(l_version, Root.Width) + Private cu As Cursor = Starter.skmt.ExecQuery("select USUARIO from USUARIOA") + If cu.RowCount > 0 Then + cu.Position = 0 + If cu.GetString("USUARIO") <> "" Then user.Text = cu.GetString("USUARIO") + End If End Sub Sub ks_etiquetaCentrada(success As Boolean) @@ -923,7 +928,7 @@ End Sub Private Sub p_geocerca_Click Log("CLICKED") Dim activa As Int = 1 - If Subs.estamosEnAlmacen(500) Then + If Subs.estamosEnAlmacen(100) Then If l_geocerca.Text <> "Buscando ubicación ..." Then If passSupervisor = "" Then p_transparente.Visible = True diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas index ee972bc..43a0e61 100644 --- a/B4A/C_Cliente.bas +++ b/B4A/C_Cliente.bas @@ -150,7 +150,8 @@ Sub Class_Globals Private p_passGeocerca As Panel Private b_passGeocerca As Button Private et_passGeocerca As EditText - dim l_geoAlmacen As Label + Dim l_geoAlmacen As Label + Dim rangoAAlmacen As Int = 50 End Sub 'You can add more parameters here. @@ -220,6 +221,7 @@ Sub B4XPage_Appear b_venta.Enabled = True b_noVenta.Visible = False 'Boton deshabilitado por default. b_venta.Visible = False 'Boton deshabilitado por default. + l_geoAlmacen.text = $"Almacen a: N/A"$ ' c = Starter.skmt.ExecQuery("SELECT ID FROM VENDIDOS WHERE ID IN (Select cuenta from cuentaa)") ' If c.RowCount > 0 Then ' b_noVenta.Enabled = False @@ -262,7 +264,6 @@ Sub B4XPage_Appear l_total.Text = "0" Else l_total.Text = s.GetString("TOTAL_CLIE") - End If total_cliente = s.GetString("TOTAL_CLIE") Private factura As String = 0 @@ -301,7 +302,6 @@ Sub B4XPage_Appear Else MONTO_COMPRA = "0" End If - la_saldotot.Text = MONTO_COMPRA If MONTO_COMPRA <> "0" Then META2 = 1200 - MONTO_COMPRA @@ -347,7 +347,6 @@ Sub B4XPage_Appear ' b_noVenta.Visible = True ' b_venta.Visible = True ' End If - If Not(Starter.GPS.GPSEnabled) Then ToastMessageShow("Debe Activar el GPS del Equipo.", True) StartActivity(Starter.GPS.LocationSettingsIntent) @@ -355,7 +354,6 @@ Sub B4XPage_Appear Starter.GPS.Start(0, 0) ' If Starter.ubicacionActual.Latitude <> 0 Then GPS_LocationChanged(Starter.ubicacionActual) End If - Log("Tracker LR Init: " & (Tracker.actualLR.IsInitialized)) If Not(Tracker.actualLR.IsInitialized) Then Log("INICIAMOS TRACKER") @@ -368,23 +366,20 @@ Sub B4XPage_Appear '' Log($"Tenemos UUC: ${Tracker.FLP.GetLastKnownLocation.Latitude},${Tracker.FLP.GetLastKnownLocation.Longitude}"$) ' GPS_LocationChanged(Tracker.FLP.GetLastKnownLocation) ' End If - ' Log("DISTANCIA: " & distance) ' Log("HAY PEDIDO: " & Subs.hayPedido) ' Log("GEOCERCA ACTIVA: " & Subs.geocercaHabilitada) ' Log("EN ALMACEN: " & Subs.estamosEnAlmacen(50)) - If Subs.hayPedido Or distance <= 50 Or Not(Subs.geocercaHabilitada) Or Subs.estamosEnAlmacen(50) Then ' Si estamos dentro de la geocerca, habilitamos los botones de Venta y noVenta - b_noVenta.Visible = True - b_venta.Visible = True - Log("Botones visibles") - End If - +' If Subs.hayPedido Or distance <= 50 Or Not(Subs.geocercaHabilitada) Or Subs.estamosEnAlmacen(50) Then ' Si estamos dentro de la geocerca, habilitamos los botones de Venta y noVenta +' b_noVenta.Visible = True +' b_venta.Visible = True +' Log("Botones visibles") +' End If 'Si el cliente es nuevo, no aparece el boton de venta - If la_cuenta.text.SubString2(0,1) = "N" Then +' If la_cuenta.text.SubString2(0,1) = "N" Then b_venta.Visible = False b_noVenta.Visible = False - End If - Subs.estamosEnAlmacen(50) +' End If End Sub Sub GPS_LocationChanged (Location1 As Location) @@ -396,7 +391,7 @@ Sub GPS_LocationChanged (Location1 As Location) ' End If Dim l1, l2 As Location - l1.Initialize2(B4XPages.MainPage.lat_gps, B4XPages.MainPage.lon_gps) + l1.Initialize2(Location1.Latitude, Location1.Longitude) ' Log($"Coordenadas de la tienda - lat:${m_lat}, lon:${m_lon}"$) l2.Initialize2(m_lat, m_lon) BT_QR.Enabled = True @@ -414,16 +409,20 @@ Sub GPS_LocationChanged (Location1 As Location) ' b_venta.Visible = True ' Log("Botones visibles") ' End If -' Log("###########################################") -' Log("No geocerca: " & Not(Subs.geocercaHabilitada)) -' Log("estamosEnAlmacen: " & Subs.estamosEnAlmacen(50)) -' Log("distance: " & distance) -' Log("hayPedido: " & Subs.hayPedido) + Log("###########################################") + Log("No geocerca: " & Not(Subs.geocercaHabilitada)) + Log("estamosEnAlmacen: " & Subs.estamosEnAlmacen(rangoAAlmacen)) + Log("distance: " & distance) + Log("hayPedido: " & Subs.hayPedido) +' Subs.estamosEnAlmacen(ramgoAAlmacen) ' Log("ENTRAMOS: " & (Subs.hayPedido Or distance <= 50 Or Not(Subs.geocercaHabilitada) Or Subs.estamosEnAlmacen(50))) - If Subs.hayPedido Or distance <= 50 Or Not(Subs.geocercaHabilitada) Or Subs.estamosEnAlmacen(50) Then ' Si estamos dentro de la geocerca, habilitamos los botones de Venta y noVenta + If Subs.hayPedido Or distance <= 50 Or Not(Subs.geocercaHabilitada) Or Subs.estamosEnAlmacen(rangoAAlmacen) Then ' Si estamos dentro de la geocerca, habilitamos los botones de Venta y noVenta b_noVenta.Visible = True b_venta.Visible = True ' Log("Botones visibles") + Else + b_noVenta.Visible = False + b_venta.Visible = False End If LA_GEO.TextColor = Colors.Blue ' b_noVenta.Visible = True diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 02d5f4c..5607882 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -312,7 +312,6 @@ Private Sub B4XPage_Created (Root1 As B4XView) ds.Position = 0 Starter.dia_semana = ds.GetString("CAT_CL_DIASEMANA") End If -' CallSubDelayed(FirebaseMessaging, "SubscribeToTopics") End Sub Sub B4XPage_Appear diff --git a/B4A/Files/cliente.bal b/B4A/Files/cliente.bal index f10e6682dc581617d78a1a96db28717aa6fcfe83..f9bc3b891c059f02ea0e4d251b97c1078c99eec4 100644 GIT binary patch delta 37 vcmV+=0NVeMumXp$0