16/11/23 - Cambios en manifiesto y carga de día

- Se agrego una linea en el manifiesto para cuando manda el error de "Failed resolution of: Lorg/apache/http/ProtocolVersion"
- Se agregó al cargar dia un panel que muestre el avance de la descarga.
- Se cambio el color del texto de la mayoria de los botones a blanco.

DBRequestManager.bas

@@ -227,6 +227,7 @@ Public Sub HandleJob(Job As HttpJob) As DBResult
 '	Log("HandleJob: " & (DateTime.Now - start))'Comentado por CHV - 211112
 	Return table
 End Sub
+
 'Reads a file and returns the file as a bytes array.
 Public Sub FileToBytes(Dir As String, FileName As String) As Byte()
 	Dim out As OutputStream

Durakelo_reparto.b4a

@@ -67,16 +67,17 @@ Group=Default Group
 Library1=baqrcode
 Library10=gps
 Library11=javaobject
-Library12=phone
+Library12=okhttputils2
-Library13=randomaccessfile
+Library13=phone
-Library14=reflection
+Library14=randomaccessfile
-Library15=runtimepermissions
+Library15=reflection
-Library16=serial
+Library16=runtimepermissions
-Library17=sql
+Library17=serial
-Library18=togglelibrary
+Library18=sql
-Library19=zxing_scanner
+Library19=togglelibrary
 Library2=batteryprogressview
-Library20=okhttputils2
+Library20=zxing_scanner
+Library21=ime
 Library3=bitmapcreator
 Library4=byteconverter
 Library5=camera
@@ -84,7 +85,7 @@ Library6=core
 Library7=fusedlocationprovider
 Library8=googlemaps
 Library9=googlemapsextras
-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: http://www.basic4ppc.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="28"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true" ~\n~    android:smallScreens="true" ~\n~    android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~AddApplicationText(<activity android:name="com.google.zxing.client.android.CaptureActivity"~\n~android:screenOrientation="landscape" ~\n~android:configChanges="orientation|keyboardHidden"~\n~android:theme="@android:style/Theme.NoTitleBar.Fullscreen"~\n~android:windowSoftInputMode="stateAlwaysHidden">~\n~</activity>)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PHONE_STATE"~\n~  android:maxSdkVersion="19" />~\n~)~\n~AddApplicationText(~\n~<meta-data~\n~  android:name="com.google.android.geo.API_KEY"~\n~  android:value="AIzaSyBlBnx3O-DncOSv3oFIp-12wgujOYYcl-U"/>~\n~  <meta-data android:name="com.google.android.gms.version"~\n~   android:value="@integer/google_play_services_version" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~  android:maxSdkVersion="19" />~\n~)~\n~'''' para el teclado~\n~	SetActivityAttribute(main, android:windowSoftInputMode, adjustResize|stateHidden)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~~\n~
+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: http://www.basic4ppc.com/forum/showthread.php?p=78136~\n~AddManifestText(~\n~<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="28"/>~\n~<supports-screens android:largeScreens="true" ~\n~    android:normalScreens="true" ~\n~    android:smallScreens="true" ~\n~    android:anyDensity="true"/>)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~AddApplicationText(<activity android:name="com.google.zxing.client.android.CaptureActivity"~\n~android:screenOrientation="landscape" ~\n~android:configChanges="orientation|keyboardHidden"~\n~android:theme="@android:style/Theme.NoTitleBar.Fullscreen"~\n~android:windowSoftInputMode="stateAlwaysHidden">~\n~</activity>)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.READ_PHONE_STATE"~\n~  android:maxSdkVersion="19" />~\n~)~\n~AddApplicationText(~\n~<meta-data~\n~  android:name="com.google.android.geo.API_KEY"~\n~  android:value="AIzaSyBlBnx3O-DncOSv3oFIp-12wgujOYYcl-U"/>~\n~  <meta-data android:name="com.google.android.gms.version"~\n~   android:value="@integer/google_play_services_version" />~\n~)~\n~AddManifestText(~\n~<uses-permission~\n~  android:name="android.permission.WRITE_EXTERNAL_STORAGE"~\n~  android:maxSdkVersion="19" />~\n~)~\n~'''' para el teclado~\n~	SetActivityAttribute(main, android:windowSoftInputMode, adjustResize|stateHidden)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~'Si al cargar un mapa de google manda este error "java.lang.NoClassDefFoundError: Failed resolution of: Lorg/apache/http/ProtocolVersion". agregar la siguiente linea:~\n~AddApplicationText(<uses-library android:name="org.apache.http.legacy" android:required="false"/>)
 Module1=BatteryUtilities
 Module10=gestion
 Module11=Historico
@@ -107,14 +108,14 @@ Module7=detalle_promo
 Module8=fila
 Module9=foto
 NumberOfFiles=32
-NumberOfLibraries=20
+NumberOfLibraries=21
 NumberOfModules=21
 Version=12.5
 @EndOfDesignText@
 #Region  Project Attributes 
 	#ApplicationLabel: Durakelo-Reparto
 	#VersionCode: 1
-	#VersionName: 3.11.06
+	#VersionName: 3.11.16
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
 	#CanInstallToExternalStorage: False

Durakelo_reparto.b4a.meta

@@ -64,6 +64,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=3,6,8,17,18,19
 ModuleClosedNodes9=
-NavigationStack=MAPA_RUTAS,MapFragment1_Ready,146,0,seleccion,JobDone,626,6,seleccion,cargar_Click,549,6,Main,Activity_Create,58,0,Diseñador Visual,fila.bal,-100,1,Starter,pe_BatteryChanged,43,0,colonia,Activity_Resume,64,5,colonia,ListView1_ItemClick,141,2,colonia,BUSCA_TextChanged,195,2,Main,Process_Globals,37,0
+NavigationStack=Visual Designer,login.bal,-100,1,Visual Designer,mapa.bal,-100,2,Visual Designer,mapa_rutas.bal,-100,1,Visual Designer,nopago.bal,-100,2,Visual Designer,nuevocliente.bal,-100,2,Visual Designer,pedido.bal,-100,2,Visual Designer,seleccion.bal,-100,1,Visual Designer,tarjeta.bal,-100,2,Visual Designer,telefonos.bal,-100,1,seleccion,JobDone,935,6
 SelectedBuild=0
-VisibleModules=18,21,10,9,12,8,4,14,11,2,17
+VisibleModules=18,21,4,17,6

seleccion.bas

@@ -24,7 +24,7 @@ Sub Globals
 	'These global variables will be redeclared each time the activity is created.
 	'These variables can only be accessed from this module.
 	Dim trabajar As Button
-	
+	dim ime as ime
 	Dim c As Cursor
 	Dim d As Cursor
 	Dim b As Cursor
@@ -93,6 +93,9 @@ Sub Globals
 	Dim HORAINGRESO As String
 	
 	
+	Private p_cargando As Panel
+	Private p_cargando2 As Panel
+	Private l_cargando As Label
 End Sub
 
 Sub Activity_Create(FirstTime As Boolean)
@@ -176,7 +179,7 @@ Sub Activity_Create(FirstTime As Boolean)
 		skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_VALOR,CAT_VA_DESCRIPCION)  VALUES (?,?)" , Array As String(DateTime.Time(DateTime.Now),"HoraIngreso"))
 	End If
 	DateTime.TimeFormat = "HH:mm:ss"
-
+	p_cargando2.Left = (Activity.Width / 2) - (p_cargando2.Width / 2)
 End Sub
 
 Sub IsConnectedToInternet As Boolean
@@ -195,6 +198,7 @@ End Sub
 
 
 Sub Activity_Resume
+	Log("eresume")
 	c=skmt.ExecQuery("select noversion from version")
 	c.Position=0
 	HORAINGRESO ="000000"
@@ -221,6 +225,7 @@ Sub Activity_Resume
 		Listo5 = 0
 		inve = 0
 		img2.Visible =False
+		p_cargando.Visible = False
 	End If
 	DateTime.DateFormat = "MM/dd/yyyy"
 	fecha=DateTime.Date(DateTime.Now)
@@ -474,7 +479,10 @@ Sub Subir_Click
 End Sub
 
 Sub cargar_Click
-	img2.Visible =True
+'	img2.Visible =True
+	p_cargando.Visible = True
+	p_cargando.Elevation = 100
+	p_cargando.BringToFront
 	EJECUTANDO = 1
 
 	'c=skmt.ExecQuery("CREATE TABLE kmt_info (pr_cd_credito NUMERIC,pr_cd_nombre TEXT,pr_cd_calle TEXT,pr_cd_numero TEXT,pr_cd_num_int TEXT,pr_cd_entrecalle1 TEXT,pr_cd_entrecalle2 TEXT,pr_cd_colonia TEXT,pr_cd_poblacion TEXT,pr_cd_edo TEXT,pr_cd_cp TEXT,pr_cd_zona TEXT,pr_cf_credito NUMERIC,pr_cf_saldotot NUMERIC,pr_cf_saldooper NUMERIC,pr_cf_saldof1 NUMERIC, pr_cf_penalizacion NUMERIC)")
@@ -621,7 +629,9 @@ Sub cargar_Click
 	'cmd.Parameters = Array As Object(usuario)
 	'reqManager.ExecuteQuery(cmd , 0, "telefonos")
 	ToastMessageShow("Se Actualizaran los datos, Este proceso podria tardar hasta un minuto, gracias" , True)
+	l_cargando.Text = $"Procesos pendientes: ${reqManager.reqsList.Size}"$
 End Sub
+
 Sub JobDone(Job As HttpJob)
 	If reqManager.reqsList.IsInitialized Then 'Si tenemos lista de requests, la procesamos.
 		If reqManager.reqsList.IndexOf(Job.tag) <> -1 Then
@@ -665,6 +675,7 @@ Sub JobDone(Job As HttpJob)
 					ToastMessageShow("Datos Actualizados." , True)
 					Activity_Resume
 					img2.Visible=False
+					p_cargando.Visible = False
 					EJECUTANDO=0
 				End If
 			End If
@@ -694,6 +705,7 @@ Sub JobDone(Job As HttpJob)
 					ToastMessageShow("Datos Actualizados." , True)
 					Activity_Resume
 					img2.Visible=False
+					p_cargando.Visible = False
 					EJECUTANDO=0
 				End If
 			End If
@@ -723,11 +735,13 @@ Sub JobDone(Job As HttpJob)
 					ToastMessageShow("Datos Actualizados." , True)
 					Activity_Resume
 					img2.Visible=False
+					p_cargando.Visible = False
 					EJECUTANDO=0
 				Else If Listo4 = 1 And Listo3 = 1 And inve = 1 Then
 					ToastMessageShow("Datos Actualizados." , True)
 					Activity_Resume
 					img2.Visible=False
+					p_cargando.Visible = False
 					EJECUTANDO=0
 				End If
 			End If
@@ -760,6 +774,7 @@ Sub JobDone(Job As HttpJob)
 					ToastMessageShow("Datos Actualizados." , True)
 					Activity_Resume
 					img2.Visible=False
+					p_cargando.Visible = False
 					EJECUTANDO=0
 				End If
 			End If
@@ -770,7 +785,7 @@ Sub JobDone(Job As HttpJob)
 			If RESULT.Tag = "punteo" Then 'query tag
 				Log("punteo")
 				For Each records() As Object In RESULT.Rows
-					Log("punteo2")
+'					Log("punteo2")
 					Dim HV_CLIENTE As String = records(RESULT.Columns.Get("HV_CLIENTE"))
 					Dim HV_LONG As String = records(RESULT.Columns.Get("HV_LONG"))
 					Dim HV_LAT As String = records(RESULT.Columns.Get("HV_LAT"))
@@ -808,6 +823,7 @@ Sub JobDone(Job As HttpJob)
 					ToastMessageShow("Datos Actualizados." , True)
 					Activity_Resume
 					img2.Visible=False
+					p_cargando.Visible = False
 					EJECUTANDO=0
 				End If
 			End If
@@ -926,6 +942,8 @@ Sub JobDone(Job As HttpJob)
 		End If
 		Job.Release
 	End If
+	LogColor($"${reqManager.reqsList.Size}${CRLF}${list2text(reqManager.reqsList)}"$, Colors.Red)
+	l_cargando.Text = $"Procesos pendientes: ${reqManager.reqsList.Size}${CRLF}${CRLF}${list2text(reqManager.reqsList)}"$
 End Sub
 
 Sub Activity_KeyPress (key As Int) As Boolean
@@ -940,6 +958,7 @@ Sub Activity_KeyPress (key As Int) As Boolean
 End Sub
 
 Sub connecta_Click
+	ime.HideKeyboard
 	imei = "" 'p.GetDeviceId
 	conn = "1"
 	Dim cmd As DBCommand
@@ -983,6 +1002,7 @@ End Sub
 
 Sub inv_Click
 	img2.Visible =True
+	p_cargando.Visible = True
 	EJECUTANDO = 1
 	inve = 1
 	skmt.ExecNonQuery("delete from cat_gunaprod")
@@ -1025,6 +1045,7 @@ Sub t1_tick
 	cmd.Parameters = Array As Object(ALMACEN,l_ruta.text)
 	reqManager.ExecuteQuery(cmd , 0, "valida_pedidoc")
 	img2.Visible=False
+	p_cargando.Visible = False
 	t1.Enabled = False
 End Sub
 
@@ -1088,3 +1109,19 @@ Sub e_ruta_TextChanged (Old As String, New As String)
 		Log(LastException)
 	End Try
 End Sub
+
+Private Sub p_cargando_Click
+	
+End Sub
+
+Sub list2text(a As List)
+	Private elTexto As String = ""
+	For i = 0 To a.Size - 1
+		If i > 0 Then
+			elTexto = elTexto & ", " & a.Get(i)
+		Else
+			elTexto = elTexto & a.Get(i)
+		End If
+	Next
+	Return elTexto
+End Sub