diff --git a/Files/engrane.jpg b/Files/engrane.jpg new file mode 100644 index 0000000..01159de Binary files /dev/null and b/Files/engrane.jpg differ diff --git a/Files/login.bal b/Files/login.bal index 15e3c44..4ea61d5 100644 Binary files a/Files/login.bal and b/Files/login.bal differ diff --git a/intmex_reparto.b4a b/intmex_reparto.b4a index 6e2653a..fad1753 100644 --- a/intmex_reparto.b4a +++ b/intmex_reparto.b4a @@ -1,43 +1,44 @@ Build1=Default,intmex_rep.keymon.com.mx File1=alert2.png -File10=guardagestion.bal -File11=guna_viejo.png -File12=guna_viejo2.png -File13=info_gral.bal -File14=infonavit1.jpg -File15=itembuttonblue.png -File16=kelloggs.png -File17=keymon_logo.png -File18=kmt.db -File19=login.bal +File10=foto.bal +File11=guardagestion.bal +File12=guna_viejo.png +File13=guna_viejo2.png +File14=info_gral.bal +File15=infonavit1.jpg +File16=itembuttonblue.png +File17=kelloggs.png +File18=keymon_logo.png +File19=kmt.db File2=alerta.jpg -File20=LOGO SANFER.jpg -File21=Logo.jpg -File22=logo_exitus1.jpg -File23=Malo.jpg -File24=mapa.bal -File25=mapa_cliente.bal -File26=mapa_rutas.bal -File27=nopago.bal -File28=nuevocliente.bal -File29=pedido.bal +File20=login.bal +File21=LOGO SANFER.jpg +File22=Logo.jpg +File23=logo_exitus1.jpg +File24=Malo.jpg +File25=mapa.bal +File26=mapa_cliente.bal +File27=mapa_rutas.bal +File28=nopago.bal +File29=nuevocliente.bal File3=buscar.bal -File30=planfia_logo.png -File31=planfia_logo_old.png -File32=planfia_logo_old2.png -File33=productos.bal -File34=profina.jpg -File35=PROFINA.png -File36=seleccion.bal -File37=sync.png -File38=tarjeta.bal -File39=telefonos.bal +File30=pedido.bal +File31=planfia_logo.png +File32=planfia_logo_old.png +File33=planfia_logo_old2.png +File34=productos.bal +File35=profina.jpg +File36=PROFINA.png +File37=seleccion.bal +File38=sync.png +File39=tarjeta.bal File4=dbc.png +File40=telefonos.bal File5=detalle_promo.bal File6=durakelo1.png -File7=fila.bal -File8=fondo_kmt.jpg -File9=foto.bal +File7=engrane.jpg +File8=fila.bal +File9=fondo_kmt.jpg FileGroup1=Default Group FileGroup10=Default Group FileGroup11=Default Group @@ -72,6 +73,7 @@ FileGroup37=Default Group FileGroup38=Default Group FileGroup39=Default Group FileGroup4=Default Group +FileGroup40=Default Group FileGroup5=Default Group FileGroup6=Default Group FileGroup7=Default Group @@ -92,6 +94,7 @@ Library19=sql Library2=baqrcode Library20=togglelibrary Library21=zxing_scanner +Library22=fileprovider Library3=byteconverter Library4=camera Library5=compressstrings @@ -99,7 +102,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~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~'End of default text.~\n~~\n~''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~'End of default text.~\n~ ~\n~ '''''''''''PUSH~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddManifestText()~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText(~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~AddManifestText()~\n~'/////////////// FLP y FBMessageing MOD Inicia /////////////////////~\n~'CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~'CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~'CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~'CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'/////////////// FLP y FBMessageing MOD Termina ///////////////////// +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~~\n~)~\n~SetApplicationAttribute(android:icon, "@drawable/icon")~\n~SetApplicationAttribute(android:label, "$LABEL$")~\n~'End of default text.~\n~~\n~''''' CAMBIA LA CLAVE API~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~'End of default text.~\n~ ~\n~ '''''''''''PUSH~\n~CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~AddManifestText()~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText(~\n~) 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~AddManifestText()~\n~'/////////////// FLP y FBMessageing MOD Inicia /////////////////////~\n~'CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~'CreateResourceFromFile(Macro, FirebaseAnalytics.Firebase)~\n~'CreateResourceFromFile(Macro, FirebaseAnalytics.FirebaseAnalytics)~\n~'CreateResourceFromFile(Macro, FirebaseNotifications.FirebaseNotifications)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'/////////////// FLP y FBMessageing MOD Termina /////////////////////~\n~~\n~'/////////////////////// App Updating ////////////////~\n~ AddManifestText(~\n~ )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ) Module1=BatteryUtilities Module10=gestion Module11=Historico @@ -123,15 +126,15 @@ Module6=DBRequestManager Module7=detalle_promo Module8=fila Module9=foto -NumberOfFiles=39 -NumberOfLibraries=21 +NumberOfFiles=40 +NumberOfLibraries=22 NumberOfModules=23 Version=12.5 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Intmex-Reparto #VersionCode: 1 - #VersionName: 4.04.20 + #VersionName: 4.05.08 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -193,9 +196,19 @@ Sub Globals Private Label1 As Label Dim server As String Private p_principal As Panel + Private p_appUpdate As Panel + Private lv_server As ListView + Private et_server As EditText + Private b_server As Button + Private b_apk As Button + Private b_envioBD As Button + Private b_regesar As Button + Private p_serverList As Panel + Public Provider As FileProvider End Sub Sub Activity_Create(FirstTime As Boolean) + ' If File.ExternalWritable Then ' ruta = Starter.rp.GetSafeDirDefaultExternal("") ' Else @@ -233,6 +246,8 @@ Sub Activity_Create(FirstTime As Boolean) End Sub Sub Activity_Resume + Log("provider") + Provider.Initialize Subs.centraPanel(p_principal, Activity.Width) Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_ACCESS_FINE_LOCATION) Wait For Activity_PermissionResult (Permission As String, Result As Boolean) @@ -372,3 +387,62 @@ Sub Activity_KeyPress (key As Int) As Boolean ' Returning False signals the system to handle the key Return False End Sub + + +Private Sub i_engrane_Click + p_appUpdate.Width = Activity.Width + p_appUpdate.Height = Activity.Height + Subs.centraPanel(p_serverList, Activity.Width) + Subs.centraBoton(b_server, Activity.Width) + Subs.centraBoton(b_apk, Activity.Width) + Subs.centraBoton(b_envioBD, Activity.Width) + Subs.centraBoton(b_regesar, Activity.Width) + Subs.centraBoton(b_server, p_serverList.Width) + lv_server.Clear + 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 = server + Subs.panelVisible(p_appUpdate, 0, 0) +End Sub + +Private Sub b_regesar_Click + p_principal.Visible = True + p_appUpdate.Visible = False +End Sub + +Private Sub b_envioBD_Click +' copiaDB +' Sleep(1000) + Dim FileName As String = "kmt.db" + 'copy the shared file to the shared folder + Log("xxxxxx:"&Provider.SharedFolder) + Sleep(1000) + File.Copy(File.DirInternal, FileName, Provider.SharedFolder, FileName) + Dim email As Email + email.To.Add("soporte@keymonsoft.com") + email.Subject = "Base de datos para revisión" + email.Attachments.Add(Provider.GetFileUri(FileName)) +' email.Attachments.Add(Provider.GetFileUri(FileName)) 'second attachment + Dim in As Intent = email.GetIntent + in.Flags = 1 'FLAG_GRANT_READ_URI_PERMISSION + StartActivity(in) +End Sub + +Private Sub b_apk_Click + +End Sub + +Private Sub b_server_Click +' Log("Guardar servidor") +' Starter.skmt.ExecNonQuery2("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = ?", Array As Object ("SERVER")) +' Starter.skmt.ExecNonQuery2("INSERT INTO CAT_VARIABLES(CAT_VA_DESCRIPCION, CAT_VA_VALOR) VALUES (?,?)", Array As Object ("SERVER",et_server.text)) +' Starter.server = et_server.text +' Starter.server = B4XPages.MainPage.server +' If logger Then Log("Inicializamos reqManager con " & B4XPages.MainPage.server) +' reqManager.Initialize(Me, B4XPages.MainPage.server) +' LogColor($"ReqServer = ${B4XPages.MainPage.server}"$, Colors.red) +' reinicializaReqManager +' p_appUpdate.Visible = False +'' Entrar.Visible = True +End Sub \ No newline at end of file diff --git a/intmex_reparto.b4a.meta b/intmex_reparto.b4a.meta index f323ab2..7d7f01f 100644 --- a/intmex_reparto.b4a.meta +++ b/intmex_reparto.b4a.meta @@ -70,6 +70,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8=2,7,11 ModuleClosedNodes9= -NavigationStack=Starter,ENVIA_ULTIMA_GPS,110,0,Main,Process_Globals,28,0,seleccion,Activity_Resume,185,3,seleccion,Subir_Click,464,6,seleccion,cargar_Click,483,0,Subs,revisaBD,191,0,Main,Activity_Create,77,0,MAPA_RUTAS,MapFragment1_Ready,140,6,colonia,traeTodosAVisitar,556,4,colonia,ListView1_ItemClick,194,6 +NavigationStack=seleccion,Subir_Click,445,6,seleccion,cargar_Click,486,0,Main,Activity_Create,76,0,Main,i_engrane_Click,262,2,Main,b_envioBD_Click,277,0,Main,Globals,73,0,Main,Activity_Resume,116,0,Diseñador Visual,login.bal,-100,6,Main,b_server_Click,302,1,Main,b_regesar_Click,277,0 SelectedBuild=0 VisibleModules=19,23,20,18,4,5,8,15,6,9 diff --git a/seleccion.bas b/seleccion.bas index f1e2fa3..81c54a9 100644 --- a/seleccion.bas +++ b/seleccion.bas @@ -457,15 +457,19 @@ Sub Subir_Click 'Buscamos ordenes a reprogramar. Dim r As Cursor =Starter.skmt.ExecQuery("select * from noventa where nv_reprogramar = 1") If r.RowCount > 0 Then - Log("Enviamos reprogramados: " & r.RowCount) - For rx = 0 To r.RowCount - 1 - r.Position = rx - Dim cmd As DBCommand - cmd.Initialize - cmd.Name = "insert_reparto_reprogramar_INTMEX" - cmd.Parameters = Array As Object(r.GetString("NV_CLIENTE"),r.GetString("NV_REPROGRAMAR")) - reqManager.ExecuteCommand(cmd , "ins_reprogramar") - Next + Dim o As Cursor = Starter.skmt.ExecQuery2("select HVD_FECHA, CAT_CL_RUTA FROM HIST_VENTAS INNER JOIN on kmt_info on HVD_CLIENTE = cat_cl_codigo WHERE HVD_CLIENTE = ?",Array As String(r.GetString("NV_CLIENTE"))) + If o.RowCount > 0 Then + o.Position = 0 + Log("Enviamos reprogramados: " & r.RowCount) + For rx = 0 To r.RowCount - 1 + r.Position = rx + Dim cmd As DBCommand + cmd.Initialize + cmd.Name = "insert_reparto_reprogramar2_INTMEX" + cmd.Parameters = Array As Object(r.GetString("NV_CLIENTE"),r.GetString("NV_REPROGRAMAR"),o.GetString("HVD_FECHA"),o.GetString("CAT_CL_RUTA"),ALMACEN) + reqManager.ExecuteCommand(cmd , "ins_reprogramar") + Next + End If End If r.Close 'd.Position=0