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 9ca2839..00c16b2 100644 Binary files a/B4A/Files/login.bal and b/B4A/Files/login.bal differ diff --git a/B4A/INTMEX_LL.b4a b/B4A/INTMEX_LL.b4a index d2cde76..c7bf9fa 100644 --- a/B4A/INTMEX_LL.b4a +++ b/B4A/INTMEX_LL.b4a @@ -161,7 +161,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Intmex v1 #VersionCode: 1 - #VersionName: 3.09.07 + #VersionName: 3.11.05 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/INTMEX_LL.b4a.meta b/B4A/INTMEX_LL.b4a.meta index bb0d899..5508055 100644 --- a/B4A/INTMEX_LL.b4a.meta +++ b/B4A/INTMEX_LL.b4a.meta @@ -58,7 +58,7 @@ ModuleClosedNodes0= ModuleClosedNodes1= ModuleClosedNodes10= ModuleClosedNodes11= -ModuleClosedNodes12=6 +ModuleClosedNodes12=1,4,5,6 ModuleClosedNodes13=9,11,15 ModuleClosedNodes14=9,10 ModuleClosedNodes15= @@ -66,7 +66,7 @@ ModuleClosedNodes16= ModuleClosedNodes17= ModuleClosedNodes18= ModuleClosedNodes19= -ModuleClosedNodes2= +ModuleClosedNodes2=5 ModuleClosedNodes20= ModuleClosedNodes21= ModuleClosedNodes22=2 @@ -82,6 +82,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8=1 ModuleClosedNodes9= -NavigationStack=B4XMainPage,b_regesar_Click,669,0,C_Productos,lv_prodsPedido_ItemLongClick,774,0,C_Principal,B4XPage_Created,235,0,C_RespaldoDiario,Initialize,11,6,C_Principal,Class_Globals,12,0,C_Principal,B4XPage_Appear,480,0,C_Principal,Subir_Click,654,0,DBRequestManager,Initialize,22,0,DBRequestManager,PrintTable,267,0,C_Principal,JobDone,934,0 +NavigationStack=C_Principal,cargar_Click,689,0,B4XMainPage,b_importarBD_Click,708,0,B4XMainPage,b_enviarbd_Click,707,0,C_Principal,connecta_Click,1651,6,C_Principal,JobDone,931,1,B4XMainPage,JobDone,428,0,Starter,reinicializaReqManager,119,0,B4XMainPage,lv_server_ItemClick,688,0,B4XMainPage,B4XPage_Appear,247,3,B4XMainPage,Entrar_Click,378,3 SelectedBuild=0 -VisibleModules=2,25,23,12,15,13,4,26,14,8 +VisibleModules=2,25,23,12,15,13,4,26,14,8,19 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 681993b..0422fe4 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -124,5 +124,5 @@ Sub reinicializaReqManager(srv As String) skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("SERVER", srv)) DBReqServer = srv reqManager.Initialize(Me, srv) -' LogColor(srv, Colors.red) + LogColor(srv, Colors.red) End Sub \ No newline at end of file