diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index e70b70d..7533ac2 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -30,7 +30,7 @@ Sub Class_Globals Public clientes As C_Clientes 'Antes Colonia Public cliente As C_Cliente 'Antes fila Public productos As C_Productos 'Antes colonia2 -' Public updateAvailable As C_updateAvailable + Public updateAvailable As C_updateAvailable '' Public mapas As C_Mapas '' Public nuevoCliente As C_NuevoCliente Public ticketsDia As C_TicketsDia 'Antes buscar @@ -123,6 +123,8 @@ Private Sub B4XPage_Created (Root1 As B4XView) B4XPages.AddPage("NoVenta", noVenta) nota.Initialize B4XPages.AddPage("Nota", nota) + updateAvailable.Initialize + B4XPages.AddPage("updateAvailable", updateAvailable) promos.Initialize B4XPages.AddPage("Promos", promos) historico.Initialize @@ -186,6 +188,10 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear + If Starter.muestraProgreso = 1 Then + muestraProgreso("Descargando actualización") + Starter.muestraProgreso = 0 + End If l_version.Text = Application.VersionName ' server = "http://10.0.0.205:1782" @@ -496,4 +502,17 @@ Private Sub b_envioBD_Click Dim in As Intent = email.GetIntent in.Flags = 1 'FLAG_GRANT_READ_URI_PERMISSION StartActivity(in) +End Sub + +Sub b_apk_Click + StartService(appUpdater) +End Sub + +Sub muestraProgreso(mensaje As String) + ProgressDialogShow(mensaje) +End Sub + +'appUpdater - Ocultamos el anuncio de que se esta descargando el nuevo apk +Sub ocultaProgreso + ProgressDialogHide End Sub \ No newline at end of file diff --git a/B4A/C_updateAvailable.bas b/B4A/C_updateAvailable.bas index 36fa8d1..8bd6e51 100644 --- a/B4A/C_updateAvailable.bas +++ b/B4A/C_updateAvailable.bas @@ -18,7 +18,56 @@ End Sub Private Sub B4XPage_Created (Root1 As B4XView) Root = Root1 'load the layout to Root - + Root.Color = Colors.Transparent End Sub -'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. \ No newline at end of file +Sub B4XPage_Appear + Try + Do While Not(CanRequestPackageInstalls) + MsgboxAsync($"Por favor permita que ${Application.PackageName} instale actualizaciones"$, "Instalar actualización") + Wait For Msgbox_Result(Result As Int) + Dim in As Intent + in.Initialize("android.settings.MANAGE_UNKNOWN_APP_SOURCES", "package:" & Application.PackageName) + StartActivity(in) + Loop + Catch + Log("updateAvailable() Error - " & LastException.Message) + End Try + If appUpdater.newApp.update Then + ofreceActualizacion + Else + sinActualizacion + End If +End Sub + +'//////////////////////////////////////////////////////////////////////////////////////////// +'//// Esta es una actividad usada por el servicio appUpdater para mostrar notificaciones +'//// cuando hay alguna actualizacion de apk. +'//////////////////////////////////////////////////////////////////////////////////////////// + + +public Sub CanRequestPackageInstalls As Boolean + ' // https://www.b4x.com/android/forum/threads/version-safe-apk-installation.87667/#content + Dim ctxt As JavaObject + ctxt.InitializeContext + Dim PackageManager As JavaObject = ctxt.RunMethod("getPackageManager", Null) + Return PackageManager.RunMethod("canRequestPackageInstalls", Null) +End Sub + +Sub ofreceActualizacion + If Msgbox2(appUpdater.newApp.newMsg,"Actualización disponible","Si","","No",Null) = DialogResponse.Positive Then 'ignore +' StartService(DownloadService) + CallSubDelayed(appUpdater, "download_newApk") + End If + B4XPages.MainPage.ocultaProgreso + StartActivity(Main) +' Activity.Finish + B4XPages.ShowPage("Login") +End Sub + +Sub sinActualizacion + Msgbox(appUpdater.newApp.okMsg, "Aplicación al corriente") 'ignore +' StartActivity(Main) + B4XPages.MainPage.ocultaProgreso + B4XPages.ShowPage("Login") +End Sub \ No newline at end of file diff --git a/B4A/Durakelo.b4a b/B4A/Durakelo.b4a index 0a63416..3764ee7 100644 --- a/B4A/Durakelo.b4a +++ b/B4A/Durakelo.b4a @@ -1,369 +1,370 @@ Build1=Default,durakelo.keymon.com.mx,HU2_PUBLIC File1=alcancia.png File10=Clientes.bal -File100=marker-azul-66.png -File101=marker-azul-67.png -File102=marker-azul-68.png -File103=marker-azul-69.png -File104=marker-azul-7.png -File105=marker-azul-70.png -File106=marker-azul-71.png -File107=marker-azul-72.png -File108=marker-azul-73.png -File109=marker-azul-74.png +File100=marker-azul-65.png +File101=marker-azul-66.png +File102=marker-azul-67.png +File103=marker-azul-68.png +File104=marker-azul-69.png +File105=marker-azul-7.png +File106=marker-azul-70.png +File107=marker-azul-71.png +File108=marker-azul-72.png +File109=marker-azul-73.png File11=detalle_promo.bal -File110=marker-azul-75.png -File111=marker-azul-76.png -File112=marker-azul-77.png -File113=marker-azul-78.png -File114=marker-azul-79.png -File115=marker-azul-8.png -File116=marker-azul-80.png -File117=marker-azul-81.png -File118=marker-azul-82.png -File119=marker-azul-83.png +File110=marker-azul-74.png +File111=marker-azul-75.png +File112=marker-azul-76.png +File113=marker-azul-77.png +File114=marker-azul-78.png +File115=marker-azul-79.png +File116=marker-azul-8.png +File117=marker-azul-80.png +File118=marker-azul-81.png +File119=marker-azul-82.png File12=durakelo.png -File120=marker-azul-84.png -File121=marker-azul-85.png -File122=marker-azul-86.png -File123=marker-azul-87.png -File124=marker-azul-88.png -File125=marker-azul-89.png -File126=marker-azul-9.png -File127=marker-azul-90.png -File128=marker-azul-91.png -File129=marker-azul-92.png +File120=marker-azul-83.png +File121=marker-azul-84.png +File122=marker-azul-85.png +File123=marker-azul-86.png +File124=marker-azul-87.png +File125=marker-azul-88.png +File126=marker-azul-89.png +File127=marker-azul-9.png +File128=marker-azul-90.png +File129=marker-azul-91.png File13=durakelo_192x192.png -File130=marker-azul-93.png -File131=marker-azul-94.png -File132=marker-azul-95.png -File133=marker-azul-96.png -File134=marker-azul-97.png -File135=marker-azul-98.png -File136=marker-azul-99.png -File137=marker-rojo-0.png -File138=marker-rojo-1.png -File139=marker-rojo-10.png +File130=marker-azul-92.png +File131=marker-azul-93.png +File132=marker-azul-94.png +File133=marker-azul-95.png +File134=marker-azul-96.png +File135=marker-azul-97.png +File136=marker-azul-98.png +File137=marker-azul-99.png +File138=marker-rojo-0.png +File139=marker-rojo-1.png File14=durakelo1.png -File140=marker-rojo-100.png -File141=marker-rojo-11.png -File142=marker-rojo-12.png -File143=marker-rojo-13.png -File144=marker-rojo-14.png -File145=marker-rojo-15.png -File146=marker-rojo-16.png -File147=marker-rojo-17.png -File148=marker-rojo-18.png -File149=marker-rojo-19.png +File140=marker-rojo-10.png +File141=marker-rojo-100.png +File142=marker-rojo-11.png +File143=marker-rojo-12.png +File144=marker-rojo-13.png +File145=marker-rojo-14.png +File146=marker-rojo-15.png +File147=marker-rojo-16.png +File148=marker-rojo-17.png +File149=marker-rojo-18.png File15=engrane.jpg -File150=marker-rojo-2.png -File151=marker-rojo-20.png -File152=marker-rojo-21.png -File153=marker-rojo-22.png -File154=marker-rojo-23.png -File155=marker-rojo-24.png -File156=marker-rojo-25.png -File157=marker-rojo-26.png -File158=marker-rojo-27.png -File159=marker-rojo-28.png +File150=marker-rojo-19.png +File151=marker-rojo-2.png +File152=marker-rojo-20.png +File153=marker-rojo-21.png +File154=marker-rojo-22.png +File155=marker-rojo-23.png +File156=marker-rojo-24.png +File157=marker-rojo-25.png +File158=marker-rojo-26.png +File159=marker-rojo-27.png File16=engrane3.png -File160=marker-rojo-29.png -File161=marker-rojo-3.png -File162=marker-rojo-30.png -File163=marker-rojo-31.png -File164=marker-rojo-32.png -File165=marker-rojo-33.png -File166=marker-rojo-34.png -File167=marker-rojo-35.png -File168=marker-rojo-36.png -File169=marker-rojo-37.png +File160=marker-rojo-28.png +File161=marker-rojo-29.png +File162=marker-rojo-3.png +File163=marker-rojo-30.png +File164=marker-rojo-31.png +File165=marker-rojo-32.png +File166=marker-rojo-33.png +File167=marker-rojo-34.png +File168=marker-rojo-35.png +File169=marker-rojo-36.png File17=espera.gif -File170=marker-rojo-38.png -File171=marker-rojo-39.png -File172=marker-rojo-4.png -File173=marker-rojo-40.png -File174=marker-rojo-41.png -File175=marker-rojo-42.png -File176=marker-rojo-43.png -File177=marker-rojo-44.png -File178=marker-rojo-45.png -File179=marker-rojo-46.png +File170=marker-rojo-37.png +File171=marker-rojo-38.png +File172=marker-rojo-39.png +File173=marker-rojo-4.png +File174=marker-rojo-40.png +File175=marker-rojo-41.png +File176=marker-rojo-42.png +File177=marker-rojo-43.png +File178=marker-rojo-44.png +File179=marker-rojo-45.png File18=fondo_kmt.jpg -File180=marker-rojo-47.png -File181=marker-rojo-48.png -File182=marker-rojo-49.png -File183=marker-rojo-5.png -File184=marker-rojo-50.png -File185=marker-rojo-51.png -File186=marker-rojo-52.png -File187=marker-rojo-53.png -File188=marker-rojo-54.png -File189=marker-rojo-55.png +File180=marker-rojo-46.png +File181=marker-rojo-47.png +File182=marker-rojo-48.png +File183=marker-rojo-49.png +File184=marker-rojo-5.png +File185=marker-rojo-50.png +File186=marker-rojo-51.png +File187=marker-rojo-52.png +File188=marker-rojo-53.png +File189=marker-rojo-54.png File19=foto.bal -File190=marker-rojo-56.png -File191=marker-rojo-57.png -File192=marker-rojo-58.png -File193=marker-rojo-59.png -File194=marker-rojo-6.png -File195=marker-rojo-60.png -File196=marker-rojo-61.png -File197=marker-rojo-62.png -File198=marker-rojo-63.png -File199=marker-rojo-64.png +File190=marker-rojo-55.png +File191=marker-rojo-56.png +File192=marker-rojo-57.png +File193=marker-rojo-58.png +File194=marker-rojo-59.png +File195=marker-rojo-6.png +File196=marker-rojo-60.png +File197=marker-rojo-61.png +File198=marker-rojo-62.png +File199=marker-rojo-63.png File2=alert2.png File20=guardagestion.bal -File200=marker-rojo-65.png -File201=marker-rojo-66.png -File202=marker-rojo-67.png -File203=marker-rojo-68.png -File204=marker-rojo-69.png -File205=marker-rojo-7.png -File206=marker-rojo-70.png -File207=marker-rojo-71.png -File208=marker-rojo-72.png -File209=marker-rojo-73.png +File200=marker-rojo-64.png +File201=marker-rojo-65.png +File202=marker-rojo-66.png +File203=marker-rojo-67.png +File204=marker-rojo-68.png +File205=marker-rojo-69.png +File206=marker-rojo-7.png +File207=marker-rojo-70.png +File208=marker-rojo-71.png +File209=marker-rojo-72.png File21=guna_viejo.png -File210=marker-rojo-74.png -File211=marker-rojo-75.png -File212=marker-rojo-76.png -File213=marker-rojo-77.png -File214=marker-rojo-78.png -File215=marker-rojo-79.png -File216=marker-rojo-8.png -File217=marker-rojo-80.png -File218=marker-rojo-81.png -File219=marker-rojo-82.png +File210=marker-rojo-73.png +File211=marker-rojo-74.png +File212=marker-rojo-75.png +File213=marker-rojo-76.png +File214=marker-rojo-77.png +File215=marker-rojo-78.png +File216=marker-rojo-79.png +File217=marker-rojo-8.png +File218=marker-rojo-80.png +File219=marker-rojo-81.png File22=infonavit1.jpg -File220=marker-rojo-83.png -File221=marker-rojo-84.png -File222=marker-rojo-85.png -File223=marker-rojo-86.png -File224=marker-rojo-87.png -File225=marker-rojo-88.png -File226=marker-rojo-89.png -File227=marker-rojo-9.png -File228=marker-rojo-90.png -File229=marker-rojo-91.png +File220=marker-rojo-82.png +File221=marker-rojo-83.png +File222=marker-rojo-84.png +File223=marker-rojo-85.png +File224=marker-rojo-86.png +File225=marker-rojo-87.png +File226=marker-rojo-88.png +File227=marker-rojo-89.png +File228=marker-rojo-9.png +File229=marker-rojo-90.png File23=itembuttonblue.png -File230=marker-rojo-92.png -File231=marker-rojo-93.png -File232=marker-rojo-94.png -File233=marker-rojo-95.png -File234=marker-rojo-96.png -File235=marker-rojo-97.png -File236=marker-rojo-98.png -File237=marker-rojo-99.png -File238=marker-verde-0.png -File239=marker-verde-1.png +File230=marker-rojo-91.png +File231=marker-rojo-92.png +File232=marker-rojo-93.png +File233=marker-rojo-94.png +File234=marker-rojo-95.png +File235=marker-rojo-96.png +File236=marker-rojo-97.png +File237=marker-rojo-98.png +File238=marker-rojo-99.png +File239=marker-verde-0.png File24=k.png -File240=marker-verde-10.png -File241=marker-verde-100.png -File242=marker-verde-11.png -File243=marker-verde-12.png -File244=marker-verde-13.png -File245=marker-verde-14.png -File246=marker-verde-15.png -File247=marker-verde-16.png -File248=marker-verde-17.png -File249=marker-verde-18.png -File25=kelloggs.png -File250=marker-verde-19.png -File251=marker-verde-2.png -File252=marker-verde-20.png -File253=marker-verde-21.png -File254=marker-verde-22.png -File255=marker-verde-23.png -File256=marker-verde-24.png -File257=marker-verde-25.png -File258=marker-verde-26.png -File259=marker-verde-27.png -File26=keymon_logo.png -File260=marker-verde-28.png -File261=marker-verde-29.png -File262=marker-verde-3.png -File263=marker-verde-30.png -File264=marker-verde-31.png -File265=marker-verde-32.png -File266=marker-verde-33.png -File267=marker-verde-34.png -File268=marker-verde-35.png -File269=marker-verde-36.png -File27=kmt.db -File270=marker-verde-37.png -File271=marker-verde-38.png -File272=marker-verde-39.png -File273=marker-verde-4.png -File274=marker-verde-40.png -File275=marker-verde-41.png -File276=marker-verde-42.png -File277=marker-verde-43.png -File278=marker-verde-44.png -File279=marker-verde-45.png -File28=login.bal -File280=marker-verde-46.png -File281=marker-verde-47.png -File282=marker-verde-48.png -File283=marker-verde-49.png -File284=marker-verde-5.png -File285=marker-verde-50.png -File286=marker-verde-51.png -File287=marker-verde-52.png -File288=marker-verde-53.png -File289=marker-verde-54.png -File29=logo sanfer.jpg -File290=marker-verde-55.png -File291=marker-verde-56.png -File292=marker-verde-57.png -File293=marker-verde-58.png -File294=marker-verde-59.png -File295=marker-verde-6.png -File296=marker-verde-60.png -File297=marker-verde-61.png -File298=marker-verde-62.png -File299=marker-verde-63.png +File240=marker-verde-1.png +File241=marker-verde-10.png +File242=marker-verde-100.png +File243=marker-verde-11.png +File244=marker-verde-12.png +File245=marker-verde-13.png +File246=marker-verde-14.png +File247=marker-verde-15.png +File248=marker-verde-16.png +File249=marker-verde-17.png +File25=K-b27c0809.png +File250=marker-verde-18.png +File251=marker-verde-19.png +File252=marker-verde-2.png +File253=marker-verde-20.png +File254=marker-verde-21.png +File255=marker-verde-22.png +File256=marker-verde-23.png +File257=marker-verde-24.png +File258=marker-verde-25.png +File259=marker-verde-26.png +File26=kelloggs.png +File260=marker-verde-27.png +File261=marker-verde-28.png +File262=marker-verde-29.png +File263=marker-verde-3.png +File264=marker-verde-30.png +File265=marker-verde-31.png +File266=marker-verde-32.png +File267=marker-verde-33.png +File268=marker-verde-34.png +File269=marker-verde-35.png +File27=keymon_logo.png +File270=marker-verde-36.png +File271=marker-verde-37.png +File272=marker-verde-38.png +File273=marker-verde-39.png +File274=marker-verde-4.png +File275=marker-verde-40.png +File276=marker-verde-41.png +File277=marker-verde-42.png +File278=marker-verde-43.png +File279=marker-verde-44.png +File28=kmt.db +File280=marker-verde-45.png +File281=marker-verde-46.png +File282=marker-verde-47.png +File283=marker-verde-48.png +File284=marker-verde-49.png +File285=marker-verde-5.png +File286=marker-verde-50.png +File287=marker-verde-51.png +File288=marker-verde-52.png +File289=marker-verde-53.png +File29=login.bal +File290=marker-verde-54.png +File291=marker-verde-55.png +File292=marker-verde-56.png +File293=marker-verde-57.png +File294=marker-verde-58.png +File295=marker-verde-59.png +File296=marker-verde-6.png +File297=marker-verde-60.png +File298=marker-verde-61.png +File299=marker-verde-62.png File3=alerta.jpg -File30=Logo_durakelo_192xx192.jpeg -File300=marker-verde-64.png -File301=marker-verde-65.png -File302=marker-verde-66.png -File303=marker-verde-67.png -File304=marker-verde-68.png -File305=marker-verde-69.png -File306=marker-verde-7.png -File307=marker-verde-70.png -File308=marker-verde-71.png -File309=marker-verde-72.png -File31=logo_exitus1.jpg -File310=marker-verde-73.png -File311=marker-verde-74.png -File312=marker-verde-75.png -File313=marker-verde-76.png -File314=marker-verde-77.png -File315=marker-verde-78.png -File316=marker-verde-79.png -File317=marker-verde-8.png -File318=marker-verde-80.png -File319=marker-verde-81.png -File32=MainPage.bal -File320=marker-verde-82.png -File321=marker-verde-83.png -File322=marker-verde-84.png -File323=marker-verde-85.png -File324=marker-verde-86.png -File325=marker-verde-87.png -File326=marker-verde-88.png -File327=marker-verde-89.png -File328=marker-verde-9.png -File329=marker-verde-90.png -File33=Malo.jpg -File330=marker-verde-91.png -File331=marker-verde-92.png -File332=marker-verde-93.png -File333=marker-verde-94.png -File334=marker-verde-95.png -File335=marker-verde-96.png -File336=marker-verde-97.png -File337=marker-verde-98.png -File338=marker-verde-99.png -File339=nota.bal -File34=mapa.bal -File340=NoVenta.bal -File341=nuevocliente.bal -File342=palomita_verde.png -File343=pedido.bal -File344=pedidoitem.bal -File345=planfia_logo.png -File346=planfia_logo_old.png -File347=planfia_logo_old2.png -File348=principal.bal -File349=proditem.bal -File35=mapa_rutas.bal -File350=productos.bal -File351=productos.bal.old -File352=promociones.bal -File353=qr.bal -File354=rechazo.jpg -File355=rojo.png -File356=salma.jpg -File357=salma.png -File358=senial.jpg -File359=sync.png -File36=marker-azul-0.png -File360=tache_rojo.png -File361=telefonos.bal -File362=ticketsDia.bal -File363=Tiendita.jpg -File364=unilever.jpg -File365=verde.png -File37=marker-azul-1.png -File38=marker-azul-10.png -File39=marker-azul-100.png +File30=logo sanfer.jpg +File300=marker-verde-63.png +File301=marker-verde-64.png +File302=marker-verde-65.png +File303=marker-verde-66.png +File304=marker-verde-67.png +File305=marker-verde-68.png +File306=marker-verde-69.png +File307=marker-verde-7.png +File308=marker-verde-70.png +File309=marker-verde-71.png +File31=Logo_durakelo_192xx192.jpeg +File310=marker-verde-72.png +File311=marker-verde-73.png +File312=marker-verde-74.png +File313=marker-verde-75.png +File314=marker-verde-76.png +File315=marker-verde-77.png +File316=marker-verde-78.png +File317=marker-verde-79.png +File318=marker-verde-8.png +File319=marker-verde-80.png +File32=logo_exitus1.jpg +File320=marker-verde-81.png +File321=marker-verde-82.png +File322=marker-verde-83.png +File323=marker-verde-84.png +File324=marker-verde-85.png +File325=marker-verde-86.png +File326=marker-verde-87.png +File327=marker-verde-88.png +File328=marker-verde-89.png +File329=marker-verde-9.png +File33=MainPage.bal +File330=marker-verde-90.png +File331=marker-verde-91.png +File332=marker-verde-92.png +File333=marker-verde-93.png +File334=marker-verde-94.png +File335=marker-verde-95.png +File336=marker-verde-96.png +File337=marker-verde-97.png +File338=marker-verde-98.png +File339=marker-verde-99.png +File34=Malo.jpg +File340=nota.bal +File341=NoVenta.bal +File342=nuevocliente.bal +File343=palomita_verde.png +File344=pedido.bal +File345=pedidoitem.bal +File346=planfia_logo.png +File347=planfia_logo_old.png +File348=planfia_logo_old2.png +File349=principal.bal +File35=mapa.bal +File350=proditem.bal +File351=productos.bal +File352=productos.bal.old +File353=promociones.bal +File354=qr.bal +File355=rechazo.jpg +File356=rojo.png +File357=salma.jpg +File358=salma.png +File359=senial.jpg +File36=mapa_rutas.bal +File360=sync.png +File361=tache_rojo.png +File362=telefonos.bal +File363=ticketsDia.bal +File364=Tiendita.jpg +File365=unilever.jpg +File366=verde.png +File37=marker-azul-0.png +File38=marker-azul-1.png +File39=marker-azul-10.png File4=alerta_amarilla.png -File40=marker-azul-11.png -File41=marker-azul-12.png -File42=marker-azul-13.png -File43=marker-azul-14.png -File44=marker-azul-15.png -File45=marker-azul-16.png -File46=marker-azul-17.png -File47=marker-azul-18.png -File48=marker-azul-19.png -File49=marker-azul-2.png +File40=marker-azul-100.png +File41=marker-azul-11.png +File42=marker-azul-12.png +File43=marker-azul-13.png +File44=marker-azul-14.png +File45=marker-azul-15.png +File46=marker-azul-16.png +File47=marker-azul-17.png +File48=marker-azul-18.png +File49=marker-azul-19.png File5=amarillo.png -File50=marker-azul-20.png -File51=marker-azul-21.png -File52=marker-azul-22.png -File53=marker-azul-23.png -File54=marker-azul-24.png -File55=marker-azul-25.png -File56=marker-azul-26.png -File57=marker-azul-27.png -File58=marker-azul-28.png -File59=marker-azul-29.png +File50=marker-azul-2.png +File51=marker-azul-20.png +File52=marker-azul-21.png +File53=marker-azul-22.png +File54=marker-azul-23.png +File55=marker-azul-24.png +File56=marker-azul-25.png +File57=marker-azul-26.png +File58=marker-azul-27.png +File59=marker-azul-28.png File6=anterior.jpg -File60=marker-azul-3.png -File61=marker-azul-30.png -File62=marker-azul-31.png -File63=marker-azul-32.png -File64=marker-azul-33.png -File65=marker-azul-34.png -File66=marker-azul-35.png -File67=marker-azul-36.png -File68=marker-azul-37.png -File69=marker-azul-38.png +File60=marker-azul-29.png +File61=marker-azul-3.png +File62=marker-azul-30.png +File63=marker-azul-31.png +File64=marker-azul-32.png +File65=marker-azul-33.png +File66=marker-azul-34.png +File67=marker-azul-35.png +File68=marker-azul-36.png +File69=marker-azul-37.png File7=carrito.png -File70=marker-azul-39.png -File71=marker-azul-4.png -File72=marker-azul-40.png -File73=marker-azul-41.png -File74=marker-azul-42.png -File75=marker-azul-43.png -File76=marker-azul-44.png -File77=marker-azul-45.png -File78=marker-azul-46.png -File79=marker-azul-47.png +File70=marker-azul-38.png +File71=marker-azul-39.png +File72=marker-azul-4.png +File73=marker-azul-40.png +File74=marker-azul-41.png +File75=marker-azul-42.png +File76=marker-azul-43.png +File77=marker-azul-44.png +File78=marker-azul-45.png +File79=marker-azul-46.png File8=celltitle.bal -File80=marker-azul-48.png -File81=marker-azul-49.png -File82=marker-azul-5.png -File83=marker-azul-50.png -File84=marker-azul-51.png -File85=marker-azul-52.png -File86=marker-azul-53.png -File87=marker-azul-54.png -File88=marker-azul-55.png -File89=marker-azul-56.png +File80=marker-azul-47.png +File81=marker-azul-48.png +File82=marker-azul-49.png +File83=marker-azul-5.png +File84=marker-azul-50.png +File85=marker-azul-51.png +File86=marker-azul-52.png +File87=marker-azul-53.png +File88=marker-azul-54.png +File89=marker-azul-55.png File9=Cliente.bal -File90=marker-azul-57.png -File91=marker-azul-58.png -File92=marker-azul-59.png -File93=marker-azul-6.png -File94=marker-azul-60.png -File95=marker-azul-61.png -File96=marker-azul-62.png -File97=marker-azul-63.png -File98=marker-azul-64.png -File99=marker-azul-65.png +File90=marker-azul-56.png +File91=marker-azul-57.png +File92=marker-azul-58.png +File93=marker-azul-59.png +File94=marker-azul-6.png +File95=marker-azul-60.png +File96=marker-azul-61.png +File97=marker-azul-62.png +File98=marker-azul-63.png +File99=marker-azul-64.png FileGroup1=Default Group FileGroup10=Default Group FileGroup100=Default Group @@ -660,6 +661,7 @@ FileGroup362=Default Group FileGroup363=Default Group FileGroup364=Default Group FileGroup365=Default Group +FileGroup366=Default Group FileGroup37=Default Group FileGroup38=Default Group FileGroup39=Default Group @@ -731,66 +733,69 @@ FileGroup98=Default Group FileGroup99=Default Group Group=Default Group Library1=b4xpages -Library10=firebaseanalytics -Library11=firebasenotifications -Library12=fusedlocationprovider -Library13=gifdecoder -Library14=googlemaps -Library15=googlemapsextras -Library16=gps -Library17=ime -Library18=javaobject -Library19=json +Library10=fileprovider +Library11=firebaseanalytics +Library12=firebasenotifications +Library13=fusedlocationprovider +Library14=gifdecoder +Library15=googlemaps +Library16=googlemapsextras +Library17=gps +Library18=ime +Library19=javaobject Library2=baqrcode -Library20=okhttputils2 -Library21=phone -Library22=preoptimizedclv -Library23=randomaccessfile -Library24=reflection -Library25=runtimepermissions -Library26=serial -Library27=sql -Library28=xcustomlistview -Library29=zxing_scanner +Library20=json +Library21=okhttputils2 +Library22=phone +Library23=preoptimizedclv +Library24=randomaccessfile +Library25=reflection +Library26=runtimepermissions +Library27=serial +Library28=sql +Library29=xcustomlistview Library3=batteryprogressview -Library30=contentresolver +Library30=zxing_scanner +Library31=appupdating Library4=bitmapcreator Library5=byteconverter Library6=camera Library7=compressstrings -Library8=core -Library9=fileprovider -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.LightTheme)~\n~'End of default text.~\n~~\n~AddApplicationText(~\n~~\n~~\n~)~\n~AddManifestText()~\n~AddManifestText()~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~~\n~~\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~'CreateResourceFromFile(Macro, FirebaseAnalytics.Crashlytics)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'/////////////// FLP y FBMessageing MOD Termina /////////////////////~\n~~\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()~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~SetApplicationAttribute(android:exported, "true")~\n~AddManifestText()~\n~~\n~'Para provider (Envio de base de datos por whatsapp)~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ) -Module1=B4XMainPage -Module10=C_Promos -Module11=C_TicketsDia -Module12=DBRequestManager -Module13=EscPosPrinter -Module14=FileHandler -Module15=FirebaseMessaging -Module16=kms_helperSubs -Module17=ManageExternalStorage -Module18=MAPA_RUTAS -Module19=Starter -Module2=BatteryUtilities -Module20=Subs -Module21=Tracker -Module3=C_Cliente -Module4=C_Clientes -Module5=C_Historico -Module6=C_Nota -Module7=C_NoVenta -Module8=C_Principal -Module9=C_Productos -NumberOfFiles=365 -NumberOfLibraries=30 -NumberOfModules=21 +Library8=contentresolver +Library9=core +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.LightTheme)~\n~'End of default text.~\n~~\n~AddApplicationText(~\n~~\n~~\n~)~\n~AddManifestText()~\n~AddManifestText()~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~~\n~~\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~'CreateResourceFromFile(Macro, FirebaseAnalytics.Crashlytics)~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'/////////////// FLP y FBMessageing MOD Termina /////////////////////~\n~~\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()~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~SetApplicationAttribute(android:exported, "true")~\n~AddManifestText()~\n~~\n~'Para provider (Envio de base de datos por whatsapp)~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\n~ ~\n~ AddManifestText(~\n~ )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\n~ AddPermission(android.permission.REQUEST_INSTALL_PACKAGES)~\n~ AddPermission(android.permission.INTERNET)~\n~ AddPermission(android.permission.INSTALL_PACKAGES)~\n~ AddPermission(android.permission.READ_EXTERNAL_STORAGE)~\n~ AddPermission(android.permission.WRITE_EXTERNAL_STORAGE)~\n~ AddPermission(android.permission.READ_PHONE_STATE)~\n~ AddPermission(android.permission.WAKE_LOCK)~\n~ ~\n~ ~\n~ AddPermission(android.permission.ACCESS_FINE_LOCATION)~\n~AddPermission(android.permission.BLUETOOTH_ADVERTISE)~\n~AddPermission(android.permission.BLUETOOTH_CONNECT)~\n~AddPermission(android.permission.BLUETOOTH_SCAN) +Module1=appUpdater +Module10=C_Productos +Module11=C_Promos +Module12=C_TicketsDia +Module13=C_UpdateAvailable +Module14=DBRequestManager +Module15=EscPosPrinter +Module16=FileHandler +Module17=FirebaseMessaging +Module18=kms_helperSubs +Module19=ManageExternalStorage +Module2=B4XMainPage +Module20=MAPA_RUTAS +Module21=Starter +Module22=Subs +Module23=Tracker +Module3=BatteryUtilities +Module4=C_Cliente +Module5=C_Clientes +Module6=C_Historico +Module7=C_Nota +Module8=C_NoVenta +Module9=C_Principal +NumberOfFiles=366 +NumberOfLibraries=31 +NumberOfModules=23 Version=12.5 @EndOfDesignText@ #Region Project Attributes #ApplicationLabel: Durakelo #VersionCode: 1 - #VersionName: 4.01.14 + #VersionName: 4.01.17 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta index 5405683..256abb0 100644 --- a/B4A/Durakelo.b4a.meta +++ b/B4A/Durakelo.b4a.meta @@ -13,6 +13,8 @@ ModuleBookmarks19= ModuleBookmarks2= ModuleBookmarks20= ModuleBookmarks21= +ModuleBookmarks22= +ModuleBookmarks23= ModuleBookmarks3= ModuleBookmarks4= ModuleBookmarks5= @@ -35,6 +37,8 @@ ModuleBreakpoints19= ModuleBreakpoints2= ModuleBreakpoints20= ModuleBreakpoints21= +ModuleBreakpoints22= +ModuleBreakpoints23= ModuleBreakpoints3= ModuleBreakpoints4= ModuleBreakpoints5= @@ -43,8 +47,8 @@ ModuleBreakpoints7= ModuleBreakpoints8= ModuleBreakpoints9= ModuleClosedNodes0= -ModuleClosedNodes1=2,3,6,7,19 -ModuleClosedNodes10= +ModuleClosedNodes1= +ModuleClosedNodes10=1,3,7,31,35,36,37,38,39,40,41,42 ModuleClosedNodes11= ModuleClosedNodes12= ModuleClosedNodes13= @@ -53,17 +57,19 @@ ModuleClosedNodes15= ModuleClosedNodes16= ModuleClosedNodes17= ModuleClosedNodes18= -ModuleClosedNodes19=1 -ModuleClosedNodes2= -ModuleClosedNodes20=10,12,14,58 -ModuleClosedNodes21= +ModuleClosedNodes19= +ModuleClosedNodes2=3,6,7,19 +ModuleClosedNodes20= +ModuleClosedNodes21=1 +ModuleClosedNodes22=10,12,14,58 +ModuleClosedNodes23= ModuleClosedNodes3= ModuleClosedNodes4= ModuleClosedNodes5= -ModuleClosedNodes6=1,3 -ModuleClosedNodes7= +ModuleClosedNodes6= +ModuleClosedNodes7=1,3 ModuleClosedNodes8= -ModuleClosedNodes9=1,3,7,31,35,36,37,38,39,40,41,42 -NavigationStack=Diseñador Visual,Cliente.bal,-100,4,C_Cliente,Printer1_Connected,1054,0,EscPosPrinter,Connect,104,0,Diseñador Visual,login.bal,-100,2,C_Cliente,B4XPage_Appear,184,0,C_Cliente,B4XPage_Created,166,0,C_Cliente,GPS_LocationChanged,306,0,Subs,procesaPromocion,1003,0,Subs,traePromosVendidas,998,0,B4XMainPage,B_IMPRESORA_Click,431,0 +ModuleClosedNodes9= +NavigationStack=C_Principal,SUBIR_P_Click,2587,0,C_Principal,Subir_Click,520,0,appUpdater,Service_Create,111,0,Diseñador Visual,login.bal,-100,2,appUpdater,Process_Globals,74,0,B4XMainPage,B4XPage_Appear,185,0,C_UpdateAvailable,Class_Globals,0,0,B4XMainPage,B4XPage_Created,120,0,B4XMainPage,Class_Globals,86,0,Main,Create_Menu,69,0 SelectedBuild=0 -VisibleModules=19,1,8,16,6,3,9,20,10,21,13 +VisibleModules=21,2,9,18,7,4,10,22,11,23,15,1,13 diff --git a/B4A/EscPosPrinter.bas b/B4A/EscPosPrinter.bas index dcecefc..1a390d8 100644 --- a/B4A/EscPosPrinter.bas +++ b/B4A/EscPosPrinter.bas @@ -136,37 +136,37 @@ Public Sub Connect As Boolean End Sub -Public Sub Connect2 As Boolean - 'leos -' Serial1.Connect("88:6B:0F:3E:53:9E") -' Return True -' Try -' If Starter.MAC_IMPRESORA = "0" Then - Dim PairedDevices As Map - PairedDevices = Serial1.GetPairedDevices - Dim l As List - l.Initialize - For i = 0 To PairedDevices.Size - 1 - l.Add(PairedDevices.GetKeyAt(i)) - Next - Dim Res As Int - Res = InputList(l, "Choose a printer", -1) 'show list with paired devices 'ignore - If Res <> DialogResponse.CANCEL Then - Serial1.Connect(PairedDevices.Get(l.Get(Res))) 'convert the name to mac address - 'Msgbox(PairedDevices.Get(l.Get(Res)),"mac") - Starter.mac_impresora = PairedDevices.Get(l.Get(Res)) - Return True - End If - Return False -' Else -' Serial1.Connect(Starter.mac_impresora) -' ' Starter.mac_impresora = colonia.MAC_IMPRESORA -' Return True -' End If -' Catch -' Log(LastException) -' End Try -End Sub +'Public Sub Connect2 As Boolean +' 'leos +'' Serial1.Connect("88:6B:0F:3E:53:9E") +'' Return True +'' Try +'' If Starter.MAC_IMPRESORA = "0" Then +' Dim PairedDevices As Map +' PairedDevices = Serial1.GetPairedDevices +' Dim l As List +' l.Initialize +' For i = 0 To PairedDevices.Size - 1 +' l.Add(PairedDevices.GetKeyAt(i)) +' Next +' Dim Res As Int +' Res = InputList(l, "Choose a printer", -1) 'show list with paired devices 'ignore +' If Res <> DialogResponse.CANCEL Then +' Serial1.Connect(PairedDevices.Get(l.Get(Res))) 'convert the name to mac address +' 'Msgbox(PairedDevices.Get(l.Get(Res)),"mac") +' Starter.mac_impresora = PairedDevices.Get(l.Get(Res)) +' Return True +' End If +' Return False +'' Else +'' Serial1.Connect(Starter.mac_impresora) +'' ' Starter.mac_impresora = colonia.MAC_IMPRESORA +'' Return True +'' End If +'' Catch +'' Log(LastException) +'' End Try +'End Sub ' Disconnect the printer diff --git a/B4A/Files/login.bal b/B4A/Files/login.bal index 2eb529d..e059635 100644 Binary files a/B4A/Files/login.bal and b/B4A/Files/login.bal differ diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index 2e09ee1..2449dcc 100644 Binary files a/B4A/Files/principal.bal and b/B4A/Files/principal.bal differ diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 8daecf4..0b8c81f 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -29,8 +29,9 @@ Sub Process_Globals Dim DBReqServer As String = "http://keymon.lat:1781" Dim FECHA_HOY As String Dim tipov As String = "" + Dim muestraProgreso = 0 Dim rutav As String = "0" - dim hayListaPreciosAlt as Boolean = false + Dim hayListaPreciosAlt As Boolean = False End Sub Sub Service_Create