From 5e0c7eda499e2d98118bbf537c4777e90b23fcf0 Mon Sep 17 00:00:00 2001
From: cvaldes1201 <cj.valdes@keymonsoft.com>
Date: Wed, 14 Feb 2024 10:48:09 -0600
Subject: [PATCH] Correcciones de mapa y regresos

---
 B4A/C_Cliente.bas           |  14 ++++++++++++--
 B4A/C_NuevoCliente.bas      |  14 ++++++++++++--
 B4A/C_Principal.bas         |   1 +
 B4A/Files/principal.bal     | Bin 16450 -> 16450 bytes
 B4A/MAPA_RUTAS.bas          |   8 +++++++-
 B4A/Mariana Censos.b4a.meta |   6 +++---
 B4A/Starter.bas             |   1 +
 7 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas
index 05af26c..c8edf2f 100644
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -368,10 +368,20 @@ Private Sub B4XPage_CloseRequest As ResumableSub
 '	BACK key pressed
 	q.encuestaIniciada = False
 	q.ocultPanelPregunta
+	If q.panelSombra.IsInitialized Then
+		Log(1)
+		q.panelSombra.Visible = False
+	End If
 '	Return True To close, False To cancel
 	CallSubDelayed(Tracker, "StartFLP")
-	Return True
-'	Return False
+	If Starter.dondeestoy = "1" Then
+		StartActivity(MAPA_RUTAS)
+	Else
+		Log("AQUI")
+		B4XPages.ShowPage("Principal")
+	End If
+'	Return True
+	Return False
 End Sub
 
 Private Sub b_guardaCambios_Click
diff --git a/B4A/C_NuevoCliente.bas b/B4A/C_NuevoCliente.bas
index 7b9cc9a..dace110 100644
--- a/B4A/C_NuevoCliente.bas
+++ b/B4A/C_NuevoCliente.bas
@@ -403,12 +403,22 @@ Sub B4XPage_CloseRequest As ResumableSub
 	Log("CloseRequest NC")
 	StopCamera2
 	q.ocultPanelPregunta
-	q.panelSombra.Visible = False
 	CallSubDelayed(Tracker, "StartFLP")
+	If q.panelSombra.IsInitialized Then
+		Log(1)
+		q.panelSombra.Visible = False
+	End If
 	If p_camara.Visible Then
+		Log(2)
 		p_camara.Visible = False
 	Else
-		B4XPages.ShowPage("Principal")
+		Log(3)
+		If Starter.dondeestoy = "1" Then
+			StartActivity(MAPA_RUTAS)
+		Else 
+			Log("AQUI")
+			B4XPages.ShowPage("Principal")
+		End If
 	End If
 	Return False
 End Sub
diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas
index df5dff7..6cbc2fc 100644
--- a/B4A/C_Principal.bas
+++ b/B4A/C_Principal.bas
@@ -1082,6 +1082,7 @@ Sub hacer_ped_Click
 End Sub
 
 Sub nvo_cliente_Click
+	Starter.dondeestoy = "2"
 	B4XPages.MainPage.nuevoCliente.cargarCliente = False
 	B4XPages.ShowPage("NuevoCliente")
 End Sub
diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal
index e95f5a07301c1f389d385cccc56fa4cc2c92123e..a997cef1a24b3a3e89cbf51573dc6711f89384d3 100644
GIT binary patch
delta 50
zcmX@qz<8*EaYL7yuqOipgA5QeG6D%%5QAy*L=*AJ3xupEPY{=w?61eMnP1&l5&#|!
B3l9JQ

delta 34
qcmX@qz<8*EaYL8d<T)A&ljoUmO<o{mJ$Zt-#AJUxj?Mh)#*zT-2n*~0

diff --git a/B4A/MAPA_RUTAS.bas b/B4A/MAPA_RUTAS.bas
index 21b1f60..8f287c2 100644
--- a/B4A/MAPA_RUTAS.bas
+++ b/B4A/MAPA_RUTAS.bas
@@ -120,6 +120,7 @@ Sub Activity_Create(FirstTime As Boolean)
 End Sub
 
 Sub Activity_Resume
+	Starter.dondeestoy = "0"
 	Starter.rp.Check(Starter.rp.PERMISSION_ACCESS_FINE_LOCATION)
 	Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
 	If Result Then
@@ -140,6 +141,11 @@ Sub Activity_Resume
 	todos = 1
 End Sub
 
+Sub Activity_KeyPress (KeyCode As Int) As Boolean
+	B4XPages.ShowPage("Principal")
+	Return False
+End Sub
+
 Sub MapFragment1_Ready
 '	Log("ENTRANDO MapFragment1_Ready")
 	gmap = MapFragment1.GetMap
@@ -261,7 +267,7 @@ Sub OnInfoWindowClickListener1_click(Marker1 As Marker)
 	skmt.ExecNonQuery("delete from CUENTAA")
 	skmt.ExecNonQuery2("INSERT INTO CUENTAA VALUES (?) ", Array As Object(Marker1.Title))
 	Activity.Finish
-	
+	Starter.dondeestoy = "1"
 	If Marker1.Title.As(String).StartsWith("N") Then
 		B4XPages.MainPage.nuevoCliente.cargarCliente = True
 		B4XPages.ShowPage("NuevoCliente")
diff --git a/B4A/Mariana Censos.b4a.meta b/B4A/Mariana Censos.b4a.meta
index 2018cc1..cc2e998 100644
--- a/B4A/Mariana Censos.b4a.meta	
+++ b/B4A/Mariana Censos.b4a.meta	
@@ -37,7 +37,7 @@ ModuleClosedNodes1=
 ModuleClosedNodes10=
 ModuleClosedNodes11=
 ModuleClosedNodes12=
-ModuleClosedNodes13=3,5
+ModuleClosedNodes13=3
 ModuleClosedNodes14=
 ModuleClosedNodes15=
 ModuleClosedNodes16=4,5,6,10,13,17,18,19
@@ -49,6 +49,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=9,13,14,17
 ModuleClosedNodes9=1
-NavigationStack=C_NuevoCliente,Camera1_Ready,327,0,Diseñador Visual,cliente.bal,-100,1,Diseñador Visual,nuevocliente.bal,-100,2,Diseñador Visual,clienteDatos.bal,-100,1,C_NuevoCliente,B4XPage_CloseRequest,399,0,C_NuevoCliente,B_FOTO_Click,392,0,C_NuevoCliente,cb_giro_SelectedIndexChanged,500,0,C_Cliente,JobDone,447,0,C_Principal,b_subir_Click,433,0,C_NuevoCliente,mandaPendientesNuevosClientes,457,3
+NavigationStack=MAPA_RUTAS,OnInfoWindowClickListener1_click,254,4,MAPA_RUTAS,Activity_Resume,137,4,MAPA_RUTAS,Activity_KeyPress,138,6,Diseñador Visual,principal.bal,-100,1,C_Clientes,Mods,0,0,C_Cliente,JobDone,447,0,C_NuevoCliente,B4XPage_CloseRequest,400,6,C_Cliente,B4XPage_CloseRequest,364,0,C_Principal,Btn_Ubicar_Click,1092,5,Main,Activity_KeyPress,41,0
 SelectedBuild=0
-VisibleModules=2,14,6,9,4,8,5,15,7,16
+VisibleModules=2,14,6,9,4,8,5,15,7,16,13
diff --git a/B4A/Starter.bas b/B4A/Starter.bas
index 6132396..c668193 100644
--- a/B4A/Starter.bas
+++ b/B4A/Starter.bas
@@ -32,6 +32,7 @@ Sub Process_Globals
 	Dim logger As Boolean = False
 	Dim marcaCel As String = ph.manufacturer
 	Public rp As RuntimePermissions
+	Public dondeestoy As Int
 End Sub
 
 Sub Service_Create