From dbb98c8f272b5b6f683c9fd70590dde423d08cba Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Mon, 6 Nov 2023 10:03:00 -0600 Subject: [PATCH] 5/11/23 - Cambios en engrane para modificar el server directamente --- B4A/B4XMainPage.bas | 22 ++++++++++++++++++++-- B4A/C_Principal.bas | 29 ++++++++++++++++------------- B4A/DBRequestManager.bas | 2 +- B4A/Files/login.bal | Bin 11076 -> 12069 bytes B4A/INTMEX_LL.b4a | 2 +- B4A/INTMEX_LL.b4a.meta | 8 ++++---- B4A/Starter.bas | 2 +- 7 files changed, 43 insertions(+), 22 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index c2e8078..a9acbde 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -99,6 +99,8 @@ Sub Class_Globals Dim ime As IME Dim MES1 As ManageExternalStorage Dim device As Phone + Private et_server As EditText + Private b_guardar As Button End Sub Public Sub Initialize @@ -259,6 +261,7 @@ Sub B4XPage_Appear LogColor($"////////////////// DeviceID: ${DeviceID} ////////////////// "$, Colors.Blue) DBReqServer = Starter.DBReqServer reqManager.Initialize(Me, Starter.DBReqServer) + Log(Starter.DBReqServer) tgl.Initialize() If Not(Starter.gps.GPSEnabled) Then ToastMessageShow("Es necesario tener el GPS encendido", True) @@ -319,6 +322,7 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub Entrar_Click + Log(Starter.DBReqServer) Dim r As Reflector Dim Api As Int Dim PP As Phone @@ -421,9 +425,15 @@ Sub Entrar_Click End Sub Sub JobDone(Job As HttpJob) - Log(Job.Success) + If B4XPages.MainPage.reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos. + If B4XPages.MainPage.reqManager.reqsList.IndexOf(Job.tag) <> -1 Then + B4XPages.MainPage.reqManager.reqsList.RemoveAt(B4XPages.MainPage.reqManager.reqsList.IndexOf(Job.tag)) + LogColor($">>>>>> Quitamos ${Job.tag}"$, Colors.Blue) + End If + LogColor(">>>>>> " & B4XPages.MainPage.reqManager.reqsList.Size & " - " & B4XPages.MainPage.reqManager.reqsList, Colors.Blue) + End If If Job.Success = False Then - ToastMessageShow("Error: " & Job.ErrorMessage, True) + LogColor("Error: " & Job.tag & " : " & Job.ErrorMessage, Colors.red) Else LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211027 If Job.JobName = "DBRequest" Then @@ -662,6 +672,7 @@ End Sub Sub i_engrane_Click lv_server.Clear ime.HideKeyboard + lv_server.AddSingleLine("http://keymon.lat:1781") lv_server.AddSingleLine("http://keymon.lat:1782") If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1782") ' lv_server.AddSingleLine("http://40.123.36.38:1782") @@ -685,6 +696,7 @@ End Sub Private Sub lv_server_ItemClick (Position As Int, Value As Object) Starter.DBReqServer = Value l_server.Text = Value + et_server.Text = Value Starter.reinicializaReqManager(Value) ' Starter.reqManager.Initialize(Me, Value) ToastMessageShow("Servidor modificado", False) @@ -716,3 +728,9 @@ Private Sub b_importarBD_Click B4XPages.MainPage.skmt.Initialize(Starter.ruta,"kmt.db", True) 'Reiniciliza la base de datos con la recien importada. ToastMessageShow("¡BD importada!", False) End Sub + + +Private Sub b_guardar_Click + Starter.reinicializaReqManager(et_server.Text.Trim) + p_appUpdate.Visible = False +End Sub \ No newline at end of file diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 24076fd..e8b9f60 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -333,6 +333,7 @@ Sub B4XPage_Appear If c.GetString("CUANTOS") = 0 Then cmd.Initialize cmd.Name = "select_fecha" + Log( Starter.DBReqServer) B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "fecha") Msgbox("AJUSTAR FECHA","AVISO") 'ignore B4XPage_Appear @@ -953,7 +954,7 @@ Sub JobDone(Job As HttpJob) End If End If Else 'If Job Success then ... - LogColor("JobDone: '" & B4XPages.MainPage.reqManager.HandleJob(Job).tag & "' - Registros: " & B4XPages.MainPage.reqManager.HandleJob(Job).Rows.Size, Colors.Green) 'Mod por CHV - 211027 + LogColor("JobDone: '" & B4XPages.MainPage.reqManager.HandleJob(Job).tag & "' - Registros: " & B4XPages.MainPage.reqManager.HandleJob(Job).Rows.Size, Colors.RGB(0,160,0)) 'Mod por CHV - 211027 'Verificamos que el usuario guardado en BD sea VALIDO. If Job.JobName = "DBRequest" Then Dim RESULT As DBResult = B4XPages.MainPage.reqManager.HandleJob(Job) @@ -1640,6 +1641,7 @@ Private Sub B4XPage_CloseRequest As ResumableSub End Sub Sub connecta_Click + Log( Starter.DBReqServer) B4XPages.MainPage.reqManager.Initialize(Me, Starter.DBReqServer) ime.HideKeyboard connecta1 = connecta1 + 1 @@ -1652,23 +1654,24 @@ Sub connecta_Click B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "version") ' Cuando nos conectamos verificamos que el usuario guardado en BD sea VALIDO. - c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO, PASS from usuarioa") - c.Position=0 - If c.RowCount > 0 And c.GetString("USUARIO") <> "KMTS1" Then - Private usrT As String = c.GetString("USUARIO") - Private passT As String = c.GetString("PASS") - cmd.Initialize - cmd.Name = "select_usuario_guna_INTMEX_1" - cmd.Parameters = Array As Object(usrT, passT) - B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "usuarioA") - End If - c.Close +' c=B4XPages.MainPage.skmt.ExecQuery("select USUARIO, PASS from usuarioa") +' c.Position=0 +' If c.RowCount > 0 And c.GetString("USUARIO") <> "KMTS1" Then +' Private usrT As String = c.GetString("USUARIO") +' Private passT As String = c.GetString("PASS") +' cmd.Initialize +' cmd.Name = "select_usuario_guna_INTMEX_1" +' Log(usrT & "|" & passT) +' cmd.Parameters = Array As Object(usrT, passT) +' B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "usuarioA") +' End If +' c.Close - Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_ruta_INTMEX_6" cmd.Parameters = Array As Object(ALMACEN,e_ruta.text,imei) + Log($"${ALMACEN},${e_ruta.text},${imei}"$) B4XPages.MainPage.reqManager.ExecuteQuery(cmd , 0, "ruta") If e_ruta.Text = "KMTS1" Then diff --git a/B4A/DBRequestManager.bas b/B4A/DBRequestManager.bas index e0e2b63..eb19e28 100644 --- a/B4A/DBRequestManager.bas +++ b/B4A/DBRequestManager.bas @@ -201,7 +201,7 @@ Public Sub HandleJob(Job As HttpJob) As DBResult table.Columns.Initialize table.rows.Initialize table.Tag = Job.Tag - If jobTagAnterior <> Job.Tag Then LogColor("HandleJob: '"&Job.Tag&"'", Colors.Blue) 'Mod por CHV - 211109 + If jobTagAnterior <> Job.Tag Then LogColor("HandleJob: '"&Job.Tag&"'", Colors.RGB(171,70,0)) 'Mod por CHV - 211109 jobTagAnterior = Job.Tag 'Mod por CHV - 211109 If method = "query" Then Dim numberOfColumns As Int = ReadInt(In) diff --git a/B4A/Files/login.bal b/B4A/Files/login.bal index 9ca283925d33bbef6b4417a41340c4c78525ecd2..00c16b20254af093bc13c478f7131d30302a1c76 100644 GIT binary patch delta 565 zcmY+APcOq@9LJxhYE8SEUq)=Pa+|4n12V$&q?Cw z1xR0kL>v~0o0Fp#z)d9nd>a|v;gf#){q<>o{obXn7u8zE*o4TKf@{2_rc@cSl3pt; z=U12WrA)t^-Ar#}^IO?GUGlb@3m>nq!6Q?nV>rbM7@1V&3;S;9CVmhADyRcNP!AeB zu6bPdxB(A=Mqqk8?C~a#N8ruCVr+m#AuXU4w0S%RuPoFKuPoY8$(?&)fd@};>jRmM z+1*^$qPJR|mL$;`7q6sFx0Jsgsv43o8UHQIdGSk)ipd#s_u}*P-C#S>c2Q8ytFxK7 zCD3-%a1Im0f-+Mzq(?(>zU&XKJXGa8LwkCR7wOgvQCjoUlcj|Q@tqWq-E!xE@B8(g zN?MrSJGEdDfeiv~{qhc#wH_Kt^wNQ0&}merGx(&bIG4>a&X4e7oj$vUVC%^~eoQ%g OT6xCF|DT~`cjO1$US-h$ delta 360 zcmZ1)cO;CLm4Sgll7)eR3rH(X*pd>?SacYt17zHFi1~S@A zju(>OT%yFnBwWLYU2>I*4AbNW9k$8;`S~{AQnP0gHo&3MTN7x^aqN