- VERSION 4.10.17

- Se modificó la sección del engrane para que se pueda modificar el servidor de DBRequest. - Se agregó en el engrane la opción de importar una base de datos desde Whatsapp.
2026-04-20 06:09:16 +00:00 · 2024-10-19 10:12:46 -06:00
parent 828527ea5f
commit 47a85d427d
13 changed files with 329 additions and 161 deletions
--- a/B4A/B4XMainPage.bas
+++ b/B4A/B4XMainPage.bas
@@ -91,6 +91,10 @@ Sub Class_Globals
 	Dim buscandoActualizacion As Boolean = False
 	Dim actualizacionRevisada As Boolean = False 'Parte de la funcionalidad "appUpdater"
 	Private b_actualizacion As Button
+	Private et_server As EditText
+	Dim intentUsado As Boolean = False
+	Private p_importarBDWA As Panel
+	Private cb_importarBDWA As CheckBox
 End Sub

 Public Sub Initialize
@@ -230,6 +234,10 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	almacen = 0
 	rutaPreventa =  0
 	p_appUpdate.Visible = False
+	'Revisamos si se disparo el intent de cargar la base de datos desde WhatApp.
+	If Subs.traeUsarIntentBDWA Then
+		Subs.importaBDDesdeWhatsApp
+	End If
 End Sub

 Sub B4XPage_Appear
@@ -241,6 +249,12 @@ Sub B4XPage_Appear
 '		Entrar.Enabled = False
 '		revisaActualizacion
 '	End If
+	cb_importarBDWA.Checked = Subs.traeUsarIntentBDWA
+	If user.Text.Trim = "KMTS1" Then
+		p_importarBDWA.Visible = True
+	Else
+		p_importarBDWA.Visible = False
+	End If
 	reqManager.Initialize(Me, Starter.server)
 	If Starter.muestraProgreso = 1 Then
 		muestraProgreso("Descargando nueva versión, un momento por favor.")
@@ -330,25 +344,23 @@ Sub B4XPage_Appear
 		B4XSwitch1.Value = False
 	End If
 	Subs.guardaAppInfo
+	
+'	If Subs.traeAlmacen <> "NA" Then
+'		Dim cmd As DBCommand
+'		cmd.Initialize
+'		cmd.Name = "selectVersionAppGuna" 'Antes select_usuario_guna_GV2_1
+'		cmd.Parameters = Array As Object(almacen)
+'		reqManager.ExecuteQuery(cmd , 0, "versionApp")
+'	End If
 End Sub
 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage.

 Sub Entrar_Click
-	
-	Dim reqManager9000 As DBRequestManager
-	reqManager9000.Initialize(Me, "http://keymon.lat:9000")
-	Dim cmd As DBCommand
-	cmd.Initialize
-	cmd.Name = "selectVersionGuna"
-	cmd.Parameters = Array As Object("1")
-	Log("#### TEST QUERY FALSO")
-	reqManager9000.ExecuteQuery(cmd , 0, "testQueryFalso") 
-	
-	
 	Dim r As Reflector
 	Dim Api As Int
 	Dim PP As Phone
 	user.Text = user.Text.trim
+	LogColor(Starter.server, Colors.Blue)
 	Api = r.GetStaticField("android.os.Build$VERSION", "SDK_INT")
 	If Api < 9 Then
 		'Old device
@@ -412,29 +424,35 @@ Sub Entrar_Click
 	c=skmt.ExecQuery2("select count(*) as EXISTE1 from usuarioa where usuario = ?", Array As String(user.Text))
 	c.Position=0
 	existe = c.GetString("EXISTE1")
+	
 	If existe = 0 Then
-		If IMEI = "" Then
-			Dim cmd As DBCommand
-			cmd.Initialize
-			cmd.Name = "select_usuario_guna_GV2_10" 'Antes select_usuario_guna_GV2_1
-			cmd.Parameters = Array As Object(user.Text.Trim, pass.Text.Trim)
-			reqManager.ExecuteQuery(cmd , 0, "usuario_10") 'Antes usuario
-		Else
-			If IMEI = "" Then
-				Dim cmd As DBCommand
-				cmd.Initialize
-				cmd.Name = "select_usuario_guna_GV2_10"
-				cmd.Parameters = Array As Object(user.Text.Trim, pass.Text.Trim)
-				reqManager.ExecuteQuery(cmd , 0, "usuario_10")
-			Else
-				Dim cmd As DBCommand
-				cmd.Initialize
-				cmd.Name = "select_usuario_guna_GV2_10" 'Antes select_usuario_guna_GV2
-				cmd.Parameters = Array As Object(user.Text.Trim, pass.Text.trim)
-				Log("Mandamos: "&user.Text&"|"& pass.Text)
-				reqManager.ExecuteQuery(cmd , 0, "usuario_10") 'Antes usuario
-			End If
-		End If
+		Dim cmd As DBCommand
+		cmd.Initialize
+		cmd.Name = "select_usuario_guna_GV2_10" 'Antes select_usuario_guna_GV2_1
+		cmd.Parameters = Array As Object(user.Text.Trim, pass.Text.Trim)
+		reqManager.ExecuteQuery(cmd , 0, "usuario_10")
+'		If IMEI = "" Then
+'			Dim cmd As DBCommand
+'			cmd.Initialize
+'			cmd.Name = "select_usuario_guna_GV2_10" 'Antes select_usuario_guna_GV2_1
+'			cmd.Parameters = Array As Object(user.Text.Trim, pass.Text.Trim)
+'			reqManager.ExecuteQuery(cmd , 0, "usuario_10")
+'		Else
+'			If IMEI = "" Then
+'				Dim cmd As DBCommand
+'				cmd.Initialize
+'				cmd.Name = "select_usuario_guna_GV2_10"
+'				cmd.Parameters = Array As Object(user.Text.Trim, pass.Text.Trim)
+'				reqManager.ExecuteQuery(cmd , 0, "usuario_10")
+'			Else
+'				Dim cmd As DBCommand
+'				cmd.Initialize
+'				cmd.Name = "select_usuario_guna_GV2_10" 'Antes select_usuario_guna_GV2
+'				cmd.Parameters = Array As Object(user.Text.Trim, pass.Text.trim)
+'				Log("Mandamos: "&user.Text&"|"& pass.Text)
+'				reqManager.ExecuteQuery(cmd , 0, "usuario_10")
+'			End If
+'		End If
 		Dim cmd As DBCommand
 		cmd.Initialize
 		cmd.Name = "select_version_GV2"
@@ -456,8 +474,8 @@ End Sub
 Sub JobDone(Job As HttpJob)
 	Log(Job.Success)
 	If Job.Success = False Then
-		LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red)
-		ToastMessageShow("Error: " & Job.ErrorMessage, True)
+		LogColor("Error: " & Job.tag & " : " & Subs.parseHTTPError(Job.ErrorMessage), Colors.red)
+'		ToastMessageShow("Error: " & Job.ErrorMessage, True)
 	Else
 		LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green)  'Mod por CHV - 211027
 		If Job.JobName = "DBRequest" Then
@@ -520,8 +538,18 @@ Sub JobDone(Job As HttpJob)
 					Dim name As String = records(result.Columns.Get("USUARIO"))
 					Dim ID_ALMACEN As String = records(result.Columns.Get("CAT_LO_AGENCIA"))
 					Dim IMEI_BASE As String = records(result.Columns.Get("CAT_LO_IDTELEFONO"))
+					Private version As String =  records(result.Columns.Get("CAT_AL_VERSION"))
+					Private versionador As String =  records(result.Columns.Get("CAT_AL_VERSIONADOR"))
+					Private actualizarAplicacion As String =  records(result.Columns.Get("CAT_AL_ACTUALIZACION"))
 				Next
+				skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("VERSION_NUEVA"))
+				skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("VERSION_NUEVA", version))
+				skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("FORZAR_ACTUALIZACION"))
+				skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("FORZAR_ACTUALIZACION", actualizarAplicacion))
+'				skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("VERSION_NUEVA"))
+'				skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("VERSION_NUEVA", version))
 				Log("|"&name&"|")
+				Log($">>>>  GUARDAMOS NUEVA VERSION: ${version}, ${actualizarAplicacion}"$)
 				paso1 = 1
 				IMEI_BASE = ""
 				IMEI = ""
@@ -740,6 +768,7 @@ Sub i_engrane_Click
 	lv_server.AddSingleLine("http://keymon.lat:1782")
 	If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1782")
 	l_server.Text = Starter.server
+	et_server.Text = Starter.server
 	Subs.panelVisible(p_appUpdate,0,0)
 	p_appUpdate.Height = Root.Height
 	c = skmt.ExecQuery("SELECT HABILITADA FROM IMPRESORA")
@@ -750,10 +779,19 @@ Sub i_engrane_Click
 	If c.RowCount = 0 Then
 		skmt.ExecNonQuery2("INSERT INTO GPS VALUES (?)", Array As Object(0))
 	End If
+	If user.Text.Trim = "KMTS1" Then
+		p_importarBDWA.Visible = True
+	Else
+		p_importarBDWA.Visible = False
+	End If
 End Sub

 Sub b_regesar_Click
 	Subs.panelVisible(p_Main,0,0)
+	skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("DBReqServer"))
+	skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("DBReqServer", et_server.Text))
+	Starter.server =  et_server.Text
+	Starter.reqManager.Initialize(Me, et_server.Text)
 End Sub

 Sub i_engrane_LongClick
@@ -763,6 +801,9 @@ End Sub
 Private Sub lv_server_ItemClick (Position As Int, Value As Object)
 	Starter.server = Value
 	l_server.Text = Value
+	et_server.Text = Value
+	skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("DBReqServer"))
+	skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("DBReqServer", Value))
 	Starter.reqManager.Initialize(Me, Value)
 	ToastMessageShow("Servidor modificado", False)
 End Sub
@@ -963,3 +1004,9 @@ End Sub
 Private Sub b_actualizacion_Click
 	CallSubDelayed(appUpdater, "download_newApk")
 End Sub
+
+Private Sub cb_importarBDWA_CheckedChange(Checked As Boolean)
+'	LogColor($"cb_importarBDWA_CheckedChange = ${Checked}"$, Colors.Red)
+	Starter.skmt.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'IMPORTAR_BD_WA'")
+	Starter.skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('IMPORTAR_BD_WA', '${Checked}')"$)
+End Sub