diff --git a/DBRequestManager.bas b/DBRequestManager.bas
index b10711a..f88efe9 100644
--- a/DBRequestManager.bas
+++ b/DBRequestManager.bas
@@ -7,8 +7,8 @@ Version=6.8
'Class module
Sub Class_Globals
Private mTarget As Object
- Type DBResult (Tag As Object, Columns As Map, Rows As List)
- Type DBCommand (Name As String, Parameters() As Object)
+ Type DBResult1 (Tag As Object, Columns As Map, Rows As List)
+ Type DBCommand1 (Name As String, Parameters() As Object)
Private link As String
Private bc As ByteConverter
Private T_NULL = 0, T_STRING = 1, T_SHORT = 2, T_INT = 3, T_LONG = 4, T_FLOAT = 5 _
diff --git a/soporteKMS.b4a b/soporteKMS.b4a
index 6632ead..aca0117 100644
--- a/soporteKMS.b4a
+++ b/soporteKMS.b4a
@@ -25,16 +25,17 @@ Library8=randomaccessfile
Library9=runtimepermissions
ManifestCode='This code will be applied to the manifest file during compilation.~\n~'You do not need to modify it in most cases.~\n~'See this link for for more information: https://www.b4x.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~CreateResourceFromFile(Macro, Themes.DarkTheme)~\n~'End of default text.~\n~SetActivityAttribute(main, android:windowSoftInputMode, adjustPan|stateHidden)
Module1=DBRequestManager
-Module2=Starter
-Module3=Subs
+Module2=DBRequestManagerV2
+Module3=Starter
+Module4=Subs
NumberOfFiles=6
NumberOfLibraries=11
-NumberOfModules=3
+NumberOfModules=4
Version=12.8
@EndOfDesignText@
#Region Project Attributes
#ApplicationLabel: Soporte Keymonsoft
- #VersionName: 5.07.30
+ #VersionName: 5.08.28
'SupportedOrientations possible values: unspecified, landscape or portrait.
#SupportedOrientations: portrait
#CanInstallToExternalStorage: False
@@ -80,6 +81,8 @@ Sub Process_Globals
Dim prodsList As List
' Dim buscarDonde As String = "Usuario"
' Dim buscarQue As String = ""
+ Type DBResult (Tag As Object, Columns As Map, Rows As List)
+ Type DBCommand (Name As String, Parameters() As Object)
End Sub
Sub Globals
@@ -209,6 +212,7 @@ Sub Globals
Dim empresaAA, almacenAA As String
Dim cuantosAbrirAvion As Int = 0
Private p_botonesAA As Panel
+ Dim reqManagerT As DBRequestManagerV2
End Sub
Sub Activity_Create(FirstTime As Boolean)
@@ -311,7 +315,7 @@ End Sub
Sub Activity_Resume
' reqManager.Initialize(Me, DBRS_1782)
- If Starter.mayusculasDesbloqueo = "1" Then cb_usrMayusc.Checked = True
+' If Starter.mayusculasDesbloqueo = "1" Then cb_usrMayusc.Checked = True
Dim label1 As Label = lv_resultadosBusqueda.TwoLinesLayout.Label
label1.TextSize = 13
label1.TextColor = Colors.Black
@@ -518,7 +522,7 @@ Private Sub b_desbloquea_Click
cmd.Name = "update_usuario_guna"
Dim tempUsr As String = et_usuario.Text
tempUsr = tempUsr.Trim 'Quitamos espacios de antes y despues.
- If Starter.mayusculasDesbloqueo = "1" Then tempUsr = tempUsr.ToUpperCase 'Mandamos el usuario en mayusculas.
+' If Starter.mayusculasDesbloqueo = "1" Then tempUsr = tempUsr.ToUpperCase 'Mandamos el usuario en mayusculas.
cmd.Parameters = Array As Object(tempUsr)
Log("Mandamos DBRequest desbloqueo: " & tempUsr)
usrDesbloqueo = tempUsr
@@ -537,7 +541,7 @@ Private Sub b_desbloqueaIntmex_Click
cmd.Name = "desbloqueaUsuarioIntmex"
Dim tempUsr As String = et_usuario.Text
tempUsr = tempUsr.Trim 'Quitamos espacios de antes y despues.
- If Starter.mayusculasDesbloqueo = "1" Then tempUsr = tempUsr.ToUpperCase 'Mandamos el usuario en mayusculas.
+' If Starter.mayusculasDesbloqueo = "1" Then tempUsr = tempUsr.ToUpperCase 'Mandamos el usuario en mayusculas.
cmd.Parameters = Array As Object(tempUsr)
Log("Mandamos DBRequest desbloqueo: " & tempUsr)
usrDesbloqueo = tempUsr
@@ -728,7 +732,7 @@ End Sub
'Detectamos clics en actividad para poner en 'False' la variable 'atrasPresionado' y para ocultar el panel de opciones de desbloqueo.
Sub activity_Click
If atrasPresionado Then atrasPresionado = False
- If p_opcDesbloqueo.Visible Then p_opcDesbloqueo.Visible = False
+' If p_opcDesbloqueo.Visible Then p_opcDesbloqueo.Visible = False
End Sub
Sub Activity_KeyPress (key As Int) As Boolean
@@ -802,6 +806,10 @@ Sub JobDone(Job As HttpJob)
'////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
Else
DBRChecked = True 'Prueba de conexión finalizada.
+ Log(1)
+ If Job.Tag <> "testTraeConexion" Then
+ Log(2)
+
LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211027
If Job.JobName = "DBRequest" Then 'Para desbloquear un usuario Guna.
Dim result As DBResult = reqManager.HandleJob(Job)
@@ -816,6 +824,7 @@ Sub JobDone(Job As HttpJob)
Next
End If
End If
+ Log(2)
If Job.JobName = "DBRequest" Then 'Traemos info de soporte.
Dim result As DBResult = reqManager.HandleJob(Job)
If result.Tag = "pruebaConexion" Then 'query tag
@@ -1362,6 +1371,29 @@ Sub JobDone(Job As HttpJob)
End If
Job.Release
+ Else
+ Log("VERSION2")
+ LogColor("JobDone: '" & reqManagerT.HandleJob(Job).tag & "' - Registros: " & reqManagerT.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211027
+ If Job.JobName = "DBRequest" Then 'Para desbloquear un usuario Guna.
+ Dim resultado As DBResult = reqManagerT.HandleJob(Job)
+ If resultado.Tag = "testTraeConexion" Then 'query tag
+ Private n, r As String
+ For Each records() As Object In resultado.Rows
+ LogColor($"====== ${resultado.Tag} - REGISTROS = ${resultado.Rows.Size}"$, Colors.RGB(215,37,0))
+ For Each k As String In resultado.Columns.Keys
+ LogColor(k & " = " & records(resultado.Columns.Get(k)), Colors.RGB(215,37,0))
+ If k = "CONEXION" Then
+ n = "CONEXION"
+ r = records(resultado.Columns.Get(k))
+ End If
+ Next
+ Next
+ Toast($"${n}: ${r}"$, 0)
+ End If
+ End If
+ End If
+
+
End If
End Sub
@@ -1394,21 +1426,21 @@ End Sub
'Mostramos u ocultamos el panel de opciones de desbloqueo.
Sub b_desbloquea_longClick
- If p_opcDesbloqueo.Visible Then
- p_opcDesbloqueo.Visible = False
- Else
- p_opcDesbloqueo.Visible = True
- End If
+' If p_opcDesbloqueo.Visible Then
+' p_opcDesbloqueo.Visible = False
+' Else
+' p_opcDesbloqueo.Visible = True
+' End If
End Sub
'Si se modifica el checkbox de "Forzar mayusculas" de las opciones de desbloqueo, guardamos la configuración.
Private Sub cb_usrMayusc_CheckedChange(Checked As Boolean)
- p_opcDesbloqueo.Visible = False
- Private cb As String = "0"
- If cb_usrMayusc.Checked Then cb = "1"
- Starter.mayusculasDesbloqueo = cb
- Starter.confMap.Put("mayusculasDesbloqueo", cb)
- Subs.escribreConf
+' p_opcDesbloqueo.Visible = False
+' Private cb As String = "0"
+' If cb_usrMayusc.Checked Then cb = "1"
+'' Starter.mayusculasDesbloqueo = cb
+' Starter.confMap.Put("mayusculasDesbloqueo", cb)
+' Subs.escribreConf
End Sub
Private Sub et_usr_TextChanged (Old As String, New As String)
@@ -1891,4 +1923,15 @@ Private Sub b_revisaAA_Click
cmd.Name = $"revisaAvion_${empresaAA}"$
cmd.Parameters = Array As Object(almacenAA, et_rutaAA.text)
reqManager.ExecuteQuery(cmd, 0, $"revisaAvion_${empresaAA}"$, 0)
+End Sub
+
+Private Sub Label1_LongClick
+ Log("Clicked Global")
+' Private reqManagerT As DBRequestManagerV2
+ Private cmd2 As DBCommand
+ cmd2.Initialize
+' reqManagerT.Initialize(Me, "http://192.168.100.20:9000")
+ reqManagerT.Initialize(Me, "http://keymon.net:9010/DB2")
+ cmd2.Name = "traeConexion"
+ reqManagerT.ExecuteQuery(cmd2 , 0, "testTraeConexion", 0)
End Sub
\ No newline at end of file
diff --git a/soporteKMS.b4a.meta b/soporteKMS.b4a.meta
index cbf9401..975a7af 100644
--- a/soporteKMS.b4a.meta
+++ b/soporteKMS.b4a.meta
@@ -2,14 +2,17 @@
ModuleBookmarks1=
ModuleBookmarks2=
ModuleBookmarks3=
+ModuleBookmarks4=
ModuleBreakpoints0=
ModuleBreakpoints1=
ModuleBreakpoints2=
ModuleBreakpoints3=
+ModuleBreakpoints4=
ModuleClosedNodes0=2
ModuleClosedNodes1=
-ModuleClosedNodes2=1
-ModuleClosedNodes3=1,9,11
-NavigationStack=Main,WobbleMenu1_Tab5Click,416,4,Main,Process_Globals,31,0,Main,Activity_Create,271,0,Main,WobbleMenu1_Tab1Click,314,0,Main,Globals,53,0,Main,b_desbloqueaIntmex_Click,498,3,Diseñador Visual,layout1.bal,-100,6,Main,WobbleMenu1_Tab7Click,478,0,Main,b_desbloquea_Click,490,0,Main,JobDone,728,6
+ModuleClosedNodes2=
+ModuleClosedNodes3=1
+ModuleClosedNodes4=1,9,11
+NavigationStack=Main,Label1_LongClick,1901,6,Main,Activity_Resume,282,0,Main,b_desbloquea_Click,489,0,Main,b_desbloqueaIntmex_Click,508,0,Starter,Process_Globals,10,0,Diseñador Visual,layout1.bal,-100,4,Subs,procesaConfiguracion,140,0,Main,activity_Click,699,0,Main,b_desbloquea_longClick,1393,0,Main,cb_usrMayusc_CheckedChange,1402,0,Main,Globals,84,0
SelectedBuild=0
-VisibleModules=2,3,1
+VisibleModules=3,4,1,2