- VERSION 5.07.07

- Se hicieron cambios en el codigo de la geocerca en cliente.

B4A/C_Cliente.bas

@@ -150,6 +150,7 @@ Sub Class_Globals
 	Private p_passGeocerca As Panel
 	Private b_passGeocerca As Button
 	Private et_passGeocerca As EditText
+	dim l_geoAlmacen As Label
 End Sub
 
 'You can add more parameters here.
@@ -212,6 +213,8 @@ End Sub
 
 Sub B4XPage_Appear
 	distance = 500000000000
+	B4XPages.MainPage.lon_gps = 0
+	B4XPages.MainPage.lat_gps = 0
 	B4XPages.mainpage.pantallaActual = Root
 	b_noVenta.Enabled = True
 	b_venta.Enabled = True
@@ -381,6 +384,7 @@ Sub B4XPage_Appear
 		b_venta.Visible = False
 		b_noVenta.Visible = False
 	End If
+	Subs.estamosEnAlmacen(50)
 End Sub
 
 Sub GPS_LocationChanged (Location1 As Location)
@@ -1080,7 +1084,7 @@ End Sub
 
 Private Sub b_passGeocerca_Click
 	Log("b_passGeocerca clicked")
-	ToastMessageShow("¡Un momento por favor!", false)
+	ToastMessageShow("¡Un momento por favor!", False)
 	b_passGeocerca.Enabled = False
 	If et_passGeocerca.Text.Trim = "KMTS1" Then
 		ToastMessageShow("¡¡Listo!!", False)

B4A/Mariana.b4a

@@ -199,7 +199,7 @@ Version=12.8
 #Region  Project Attributes 
 	#ApplicationLabel: Mariana
 	#VersionCode: 1
-	#VersionName: 5.07.05
+	#VersionName: 5.07.07
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

B4A/Mariana.b4a.meta

@@ -79,15 +79,15 @@ ModuleClosedNodes24=
 ModuleClosedNodes25=
 ModuleClosedNodes26=
 ModuleClosedNodes27=2,3,4,5,6,7,8,10,11,12,13,14
-ModuleClosedNodes28=
+ModuleClosedNodes28=2
 ModuleClosedNodes29=
 ModuleClosedNodes3=
-ModuleClosedNodes4=2,4,10,23,24,25,26,27,28,29,30,31,32,33,34,35,37,38,39,40,41,42,44,45
+ModuleClosedNodes4=4
 ModuleClosedNodes5=
 ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Cliente,B4XPage_Appear,349,6,Tracker,CreateLocationRequest,121,0,Tracker,CreateLocationRequestSmallD,138,0,C_Cliente,GPS_LocationChanged,438,6,C_Cliente,ListView1_ItemLongClick,448,0,Starter,ENVIA_ULTIMA_GPS,100,0,Starter,timerRecordatorio_Tick,163,0,C_Cliente,p_transparenteGeocerca_Click,1072,1,C_Cliente,b_passGeocerca_Click,1076,6,C_Cliente,JobDone,994,1
+NavigationStack=Subs,estamosEnAlmacen,1446,6,B4XMainPage,i_engrane_LongClick,814,0,Main,Process_Globals,21,0,Main,Activity_ActionBarHomeClick,35,0,Main,Activity_Create,27,0,B4XMainPage,Class_Globals,22,0,B4XMainPage,B4XPage_Appear,305,0,Diseñador Visual,cliente.bal,-100,6,B4XMainPage,B4XPage_Created,295,0,Main,Activity_Pause,49,0
 SelectedBuild=0
-VisibleModules=27,2,12,4,28,29
+VisibleModules=27,2,12,4,28,29,17

B4A/Subs.bas

@@ -90,6 +90,20 @@ Sub notiHigh(title As String, body As String, activity As Object) 'ignore
 	notif.Notify(777)
 End Sub
 
+'Regresa el objeto de una notificacion con importancia baja
+Sub notiLow(title As String, Body As String, activity As Object) ' As Notification 'ignore
+	Private notification As Notification
+	notification.Initialize2(notification.IMPORTANCE_LOW)
+	notification.Icon = "icon"
+	notification.Sound = False
+	notification.Vibrate = False
+	notification.SetInfo(title, Body, activity)
+	notification.Notify(777)
+'	Log("notiLowReturn: "&title)
+'	Log("notiLowReturn SetInfo")
+'	Return notification
+End Sub
+
 'Regresa el objeto de una notificacion con importancia baja
 Sub notiLowReturn(title As String, Body As String, id As Int) As Notification 'ignore
 	Private notification As Notification
@@ -1426,9 +1440,12 @@ Sub estamosEnAlmacen(rango As Int) As Boolean
 '		Log($"Coordenadas del almacen - lat:${latAlmacen}, lon:${lonAlmacen}"$)
 		l2.Initialize2(latAlmacen, lonAlmacen)
 		Dim distance As Long = l1.DistanceTo(l2)  'the result is in meters
-'		Log(distance)
+		Log(distance)
+'		If distance < 100 Then ToastMessageShow("Distancia a almacen: " & distance, False)
+		notiHigh("Mariana", "Distancia a almacen: " & distance, Main)
+		B4XPages.MainPage.cliente.l_geoAlmacen.text = $"Almacen a ${distance}"$
 		If distance <= rango Then res = True
-'		Log("Dentro del almacen: " & res)
+		Log("Dentro del almacen: " & res)
 	Catch
 		Log(LastException)
 	End Try