15/9/23 - Espacios y detalles sin importancia.

B4A/B4XMainPage.bas

@@ -270,13 +270,6 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 '	PopupMenu.AddMenuItem(3, 3, "Remove")
 	' menu fin
 '	Subs.borraArribaDe100Errores
-'	Log("Permisos BT: " & rp.Check("android.permission.BLUETOOTH_CONNECT"))
-'	Log("REVISAMOS PERMISOS DE BT")
-'	rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT")
-'	Wait For Activity_PermissionResult (Permission As String, Result As Boolean)
-'	If Result Then Log("Tenemos permisos de bluetooth.")
-'	Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
-'	Log("Check phone state: " & rp.Check(rp.PERMISSION_READ_PHONE_STATE))
 	Log("Pedimos permisos de estado del cel")
 	rp.CheckAndRequest(rp.PERMISSION_READ_PHONE_STATE)
 	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
@@ -287,13 +280,7 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 		If logger Then LogColor($"//////////////////  IMEI: ${IMEI} ////////////////// "$, Colors.Blue)
 	End If
 	Log("Permisos cel terminados")
-End Sub
 
-Sub B4XPage_Appear
-'	server = "http://keymon.com.mx:1782"
-'	server = "http://201.99.139.28:1782"
-'	server = "http://177.244.63.54:1782"
-	reqManager.Initialize(Me, Starter.server)
 	Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_ACCESS_FINE_LOCATION)
 	Wait For B4XPAge_PermissionResult (Permission As String, Result As Boolean)
 	If Result Then
@@ -302,6 +289,21 @@ Sub B4XPage_Appear
 	Else
 		ToastMessageShow("Sin permisos para GPS", True)
 	End If
+
+'	Log("Permisos BT: " & rp.Check("android.permission.BLUETOOTH_CONNECT"))
+'	Log("REVISAMOS PERMISOS DE BT")
+'	rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT")
+'	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+'	If Result Then Log("Tenemos permisos de bluetooth.")
+'	Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+'	Log("Check phone state: " & rp.Check(rp.PERMISSION_READ_PHONE_STATE))
+End Sub
+
+Sub B4XPage_Appear
+'	server = "http://keymon.com.mx:1782"
+'	server = "http://201.99.139.28:1782"
+'	server = "http://177.244.63.54:1782"
+	reqManager.Initialize(Me, Starter.server)
 	Starter.montoActual = 0
 	Starter.clientesTotal = 0
 	Starter.clientesVenta =  0
@@ -386,14 +388,12 @@ Sub Entrar_Click
 		Starter.db.ExecNonQuery2("INSERT INTO VERSION(NOVERSION) VALUES (?)", Array As Object ("2.95"))
 		B4XPages.ShowPage("Principal")
 	End If
-	Log(1)
 '	c=Starter.db.ExecQuery2("select count(*) as EXISTE1 from usuarioa where usuario = ?", Array As String(user.Text))
 	c=Starter.db.ExecQuery2($"select count(*) as EXISTE1 from usuarioa where usuario = ? and fecha = ${DateTime.Date(DateTime.Now)}"$, Array As String(user.Text))
 	c.Position=0
 	existe = c.GetString("EXISTE1")
 '	Log($"${existe}, ${DateTime.Date(DateTime.Now)}, ${user.Text}"$ )
 	'existe = 1
-	Log(2)
 	If existe = 0 Then
 		'skmt.ExecNonQuery("delete from usuarioa")
 		Dim cmd As DBCommand
@@ -404,15 +404,15 @@ Sub Entrar_Click
 		Dim cmd As DBCommand
 		cmd.Initialize
 		cmd.Name = "select_version_KELL"
-		reqManager.ExecuteQuery(cmd , 0, "version")
+		Starter.reqManager.ExecuteQuery(cmd , 0, "version")
 	Else
 		Subs.iniciaActividad("Principal")
 '		B4XPages.ShowPage("Principal")
 	End If
-	Log("xxxxxxx")
 End Sub
 
 Sub JobDone(Job As HttpJob)
+	Log("JOBDONE MAINPAGE")
 	If Job.Success = False Then
 		ToastMessageShow("Error: " & Job.ErrorMessage, True)
 	Else

B4A/C_Cliente.bas

@@ -349,18 +349,20 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	TOMAR_FOTO = 0
 	c.Close
 	If s.IsInitialized Then s.Close
-	Log("#################   PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
+'	Log("#################   PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
-	Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
+'	Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
-	Log("REVISAMOS PERMISOS DE BT")
+'	Log("REVISAMOS PERMISOS DE BT")
-	Starter.rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT")
+'	Starter.rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT")
-	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+'	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
-	If Result Then Log("Tenemos permisos de bluetooth.")
+'	If Result Then Log("Tenemos permisos de bluetooth.")
-	Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+'	Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 End Sub
 
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
 
 Sub B4XPage_Appear
+	Log(Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
+	
 	reqManager.Initialize(Me, Starter.server)
 '	Log(Subs.traeUltimaActividadBD)
 	Subs.panelVisibleCompleto(P_INF_GENERAL, Root)

B4A/C_Principal.bas

@@ -252,6 +252,13 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 		l_ctast.Text = d.GetString("TOTAL_VISITAR")
 		'l_porvisitar.Text = e.GetString("POR_VISITAR")
 	End If
+	'	Log("Permisos BT: " & rp.Check("android.permission.BLUETOOTH_CONNECT"))
+	Log("XXXXXXXXXXXXXXXXXXXXXXXXX    REVISAMOS PERMISOS DE BT")
+	rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT")
+	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+	If Result Then Log("Tenemos permisos de bluetooth.")
+	Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+'	Log("Check phone state: " & rp.Check(rp.PERMISSION_READ_PHONE_STATE))
 End Sub
 
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.
@@ -261,8 +268,7 @@ Sub B4XPage_Appear
 	reqManager.Initialize(Me, Starter.server)
 	Starter.btAdmin.Initialize("btAdmin")
 	Log("BTADMIN INICIALIZADO: "&Starter.btAdmin.IsEnabled)
-	Starter.btAdmin.Enable
+	If Not(Starter.btAdmin.IsEnabled) Then Starter.btAdmin.Enable 'Si no esta prendido el BT, lo prendemos.
-	If Not(Starter.btAdmin.IsEnabled) Then Starter.btAdmin.Enable
 	e_ruta.Enabled = True
 	Starter.rutaV = l_ruta.Text
 	c=Starter.db.ExecQuery2("select count(*) as CUANTOS from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("SERVER"))
@@ -1906,13 +1912,14 @@ End Sub
 
 Sub connecta_Click
 	
-'	Log("#################   PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
+	Log("#################   PERMISOS BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
-'	Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
+	Log("Permisos BT: " & Starter.rp.Check("android.permission.BLUETOOTH_CONNECT"))
-'	Log("REVISAMOS PERMISOS DE BT")
+	Log("REVISAMOS PERMISOS DE BT")
-'	Starter.rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT")
+	Starter.rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT")
-'	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
+	Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean)
-'	If Result Then Log("Tenemos permisos de bluetooth.")
+	If Result Then Log("Tenemos permisos de bluetooth.")
-'	Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+	Log($"Resultado del CheckAndRequest: ${Result}"$)
+	Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 	
 '	c=skmt.ExecQuery2("select CAT_VA_VALOR from CAT_VARIABLES WHERE CAT_VA_DESCRIPCION = ?", Array As String ("RUTA"))
 '	c.Position =0
@@ -1939,7 +1946,7 @@ Sub connecta_Click
 '	If Result Then
 '		imei = "" 'p.GetDeviceId
 '	End If
-	Log("Terminamos permisos")
+'	Log("Terminamos permisos")
 	conn = "1"
 	Dim cmd As DBCommand
 	cmd.Initialize
@@ -2608,6 +2615,7 @@ Sub SUBIR_INFO_PEDIDO
 	Wait For t3_tick
 	S_CP.Text = "Envio C/Pedidos"
 	PB2.Progress = 1
+
 	' PEDIO_CLIENTE
 	c = Starter.db.ExecQuery("SELECT PC_CLIENTE, PC_FECHA, PC_USER, PC_NOART, PC_MONTO,PC_LON, PC_LAT, PC_COSTO_SIN, PC_RUTA, PC_ALMACEN FROM PEDIDO_CLIENTE ")
 	d = Starter.db.ExecQuery("SELECT COUNT(*) as CUANTOS_PEDIDOSC FROM PEDIDO_CLIENTE ")
@@ -2630,6 +2638,7 @@ Sub SUBIR_INFO_PEDIDO
 	d.Close
 	ENVIADA = 0
 	PORENVIAR = 0
+
 '	Msgbox(ENVIADA & " " & PORENVIAR, "A") 'ignore
 	c = Starter.db.ExecQuery2("SELECT COUNT(*) as CANTIDAD FROM HIST_ENVIOS WHERE HE_TIPO = ?",Array As String("ABORDO") )
 	c.Position = 0

B4A/C_Subs.bas

@@ -9,30 +9,38 @@ Sub Class_Globals
 	'These variables can be accessed from all modules.
 '	Public GZip As GZipStrings 		'Usa la libreria CompressStrings
 '	Private su As StringUtils 		'Usa la libreria StringUtils
+	Private EventName As String 'ignore
+	Private CallBack As Object 'ignore
 	Dim phn As Phone
-	Dim db As SQL
 	Dim devModel As String
-	Dim kmt, errorLog As SQL 'Requiere la libreria "SQL" 'ignore
+	Dim db, kmt, errorLog As SQL 'Requiere la libreria "SQL" 'ignore
 '	Dim wifi As MLwifi
 	Dim ssid As String  'ignore
-'	Dim rutaMaxPoints As Int = 3000
-'	Dim rutaHrsAtras As Int = 48
-'	Dim rutaInicioHoy As String = ""
 	Private subsLogs As Boolean = False
 End Sub
 
 'You can add more parameters here.
-Public Sub Initialize As Object
+Public Sub Initialize (vCallback As Object, vEventName As String) As Object
+	EventName = vEventName
+	CallBack = vCallback
 	Return Me
 End Sub
 
 'Inicializa la BD con "kmt.db" en File.DirInternal, si el archivo no existe, lo copia desde File.DirAssets.
+'Dispara el evento "dbOk" cuando termina.
 Sub dbInit As SQL
 	If File.Exists(File.DirInternal, "kmt.db") = False Then File.Copy(File.DirAssets, "kmt.db", File.DirInternal, "kmt.db")
 	db.Initialize(File.DirInternal,"kmt.db", True)
+	dbOk(True)
 	Return db
 End Sub
 
+Sub dbOk(Success As Boolean)
+	If SubExists(CallBack, EventName & "_dbOk") Then
+		CallSub2(CallBack, EventName & "_dbOk", Success)
+	End If
+End Sub
+
 'Pone el valor de phn.Model en la variable global "devModel"
 Sub getPhnId As String 'ignore
 	'Requiere la libreria "Phone"
@@ -64,34 +72,6 @@ Sub fechaKMT(fecha As String) As String 'ignore
 	Return nuevaFecha
 End Sub
 
-'Genera una notificacion con importancia alta
-'Sub notiHigh(title As String, body As String, activity As Object) 'ignore
-'	Private notif As Notification
-'	notif.Initialize2(notif.IMPORTANCE_HIGH)
-'	notif.Icon = "icon"
-'	notif.Vibrate = False
-'	notif.Sound = False
-'	notif.AutoCancel = True
-'	Log("notiHigh: "&title)
-'	notif.SetInfo(title, body, activity)
-''	Log("notiHigh SetInfo")
-'	notif.Notify(777)
-'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
-'	notification.Initialize2(notification.IMPORTANCE_LOW)
-'	Log("notiLowReturn: "&title)
-'	notification.Icon = "icon"
-'	notification.Sound = False
-'	notification.Vibrate = False
-'	notification.SetInfo(title, Body, Main)
-'	notification.Notify(id)
-''	Log("notiLowReturn SetInfo")
-'	Return notification
-'End Sub
-
 'Escribimos las coordenadas y fecha a un archivo de texto 
 Sub guardaInfoEnArchivo(coords As String) 'ignore
 	'	Cambiamos el formato de la hora
@@ -135,7 +115,6 @@ Sub deleteErrorLog_DB 'ignore
 	ToastMessageShow("BD Errores Borrada", False)
 End Sub
 
-
 'Mandamos "coords" en un mensaje a "Sprvsr"
 'Sub mandamosLoc(coords As String) 'ignore
 ''	Log("Iniciamos mandamosLoc "&coords)
@@ -256,7 +235,7 @@ Sub InstallAPK(dir As String, apk As String) 'ignore
 	End If
 End Sub
 
-'Copia la base de datos del almacenamiento interno al externo en el directorio kmts
+'Copia la base de datos del almacenamiento interno al externo en el directorio kmts.
 Sub copiaDB(result As Boolean) 'ignore
 	ToastMessageShow("copiaDB", False)
 	If result Then
@@ -290,7 +269,7 @@ Sub copiaDB(result As Boolean) 'ignore
 	End If
 End Sub
 
-'Hace visible y trae al frente el panel con los parametros "Top" y "Left" dados
+'Hace visible y trae al frente el panel con los parametros "Top" y "Left" dados.
 Sub panelVisible(panel As Panel, top As Int, left As Int) 'ignore
 	panel.BringToFront
 	panel.Visible = True
@@ -298,22 +277,22 @@ Sub panelVisible(panel As Panel, top As Int, left As Int) 'ignore
 	panel.Left = left
 End Sub
 
-'Centra una etiqueta dentro de un elemento superior
+'Centra una etiqueta dentro de un elemento superior.
 Sub centraEtiqueta(elemento As Label, anchoElementoSuperior As Int) 'ignore
 	elemento.Left = Round(anchoElementoSuperior/2)-(elemento.Width/2)
 End Sub
 
-'Centra un panel horizontalmente dentro de un elemento superior
+'Centra un panel horizontalmente dentro de un elemento superior.
 Sub centraPanel(elemento As Panel, anchoElementoSuperior As Int) 'ignore
 	elemento.Left = Round(anchoElementoSuperior/2)-(elemento.Width/2)
 End Sub
 
-'Centra un panel verticalmente dentro de un elemento superior
+'Centra un panel verticalmente dentro de un elemento superior.
 Sub centraPanelV(elemento As Panel, altoElementoSuperior As Int) 'ignore
 	elemento.Top = Round(altoElementoSuperior/2)-(elemento.Height/2)
 End Sub
 
-'Centra una barra de progreso dentro de un elemento superior
+'Centra una barra de progreso dentro de un elemento superior.
 Sub centraProgressBar(elemento As ProgressBar, anchoElementoSuperior As Int) 'ignore
 	elemento.Left = Round(anchoElementoSuperior/2)-(elemento.Width/2)
 End Sub
@@ -328,6 +307,7 @@ Sub buscaDBUsuario As String 'ignore
 	Return usuario
 End Sub
 
+'Regresa la fecha en el formato "MM/dd/yyyy"
 Sub traeFecha As String 'ignore
 	DateTime.DateFormat = "MM/dd/yyyy"
 	Private sDate As String = DateTime.Date(DateTime.Now)
@@ -352,7 +332,7 @@ Sub logJobDoneResultados(resultado As DBResult) 'ignore
 	Next
 End Sub
 
-'Regresa la base de datos espscificada ya inicializada.
+'Regresa la base de datos especificada ya inicializada.
 Sub inicializaBD(ruta As String, BDName As String) As SQL
 	Dim skmt As SQL
 	If File.Exists(ruta, BDName) = False Then
@@ -384,7 +364,7 @@ Sub agregaColumna(tabla As String, columna As String, tipo As String) 'ignore
 	End Try
 End Sub
 
-'Regresa el el DBReqServer desde la base de datos o "N/A" si no existe.
+'Regresa el DBReqServer desde CAT_VARIABLES o "N/A" si no existe.
 Sub traeDBReqServerDeBD As String 'ignore
 	Dim srvr As String = "N/A"
 	Dim rs As ResultSet = Starter.db.ExecQuery("select valor from cat_variables where nombre = 'servidor'")
@@ -395,7 +375,7 @@ Sub traeDBReqServerDeBD As String 'ignore
 	Return srvr
 End Sub
 
-'Regresa el el intervalo desde la base de datos o "30" si no existe.
+'Regresa el valor de intervalo desde CAT_VARIABLES o "30" si no existe.
 Sub traeIntervaloDeBD As String 'ignore
 	Dim intrvl As String = "30"
 	Dim rs As ResultSet = Starter.db.ExecQuery("select valor from cat_variables where nombre = 'intervalo'")
@@ -406,7 +386,7 @@ Sub traeIntervaloDeBD As String 'ignore
 	Return intrvl
 End Sub
 
-'Regresa el timeout desde la base de datos o "9000" si no existe.
+'Regresa el valor timeout desde CAT_VARIABLES o "9000" si no existe.
 Sub traeTimeoutDeBD As String 'ignore
 	Dim tmout As String = "9000"
 	Dim rs As ResultSet = Starter.db.ExecQuery("select valor from cat_variables where nombre = 'timeout'")
@@ -417,6 +397,7 @@ Sub traeTimeoutDeBD As String 'ignore
 	Return tmout
 End Sub
 
+'Crea una notificación con el "body" dado y regresa el objeto.
 Sub CreateNotification (Body As String) As Notification
 	Dim notification As Notification
 	notification.Initialize2(notification.IMPORTANCE_LOW)

B4A/Starter.bas

@@ -56,7 +56,7 @@ End Sub
 Sub Service_Create
 	'This is the program entry point.
 	'This is a good place to load resources that are not specific to a single activity.
-	s.Initialize 'Inicializamos la clase Subs
+	s.Initialize(Me, "Subs") 'Inicializamos la clase Subs
 	If Logger Then LogColor("'/////////////////////////////////////////////////////////////////////////////////////////////", Colors.Green)
 	If Logger Then LogColor("'/////////////////////////////////////   Iniciamos Starter  /////////////////////////////////", Colors.Green)
 	If Logger Then LogColor("'/////////////////////////////////////////////////////////////////////////////////////////////", Colors.Green)
@@ -93,6 +93,10 @@ Sub Service_Start (StartingIntent As Intent)
 	#End If
 End Sub
 
+Sub Subs_dbOk(success As Boolean)
+	LogColor($"Conexión con base de datos: ${success}"$, Colors.red)
+End Sub
+
 Sub Service_TaskRemoved
 	'This event will be raised when the user removes the app from the recent apps list.
 	Timer1.Enabled=False