From 37426d7adbbeef89ffcd72c19edeb877561fc8b8 Mon Sep 17 00:00:00 2001 From: Jose Alberto Guerra Ugalde Date: Mon, 22 Jul 2024 20:08:07 -0600 Subject: [PATCH] - VERSION 4.07.20 - Se cambio la base de datos que se manda al FTP, por error se estaba mandando desde "DirAssets" y debe de ser "DirInternal". --- Lanterna2.b4a | 7 ++++++- Lanterna2.b4a.meta | 2 +- Principal.bas | 2 +- updateAvailable.bas | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Lanterna2.b4a b/Lanterna2.b4a index 3038834..fa5eebb 100644 --- a/Lanterna2.b4a +++ b/Lanterna2.b4a @@ -90,7 +90,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Lanterna #VersionCode: 1 - #VersionName: 4.07.16 + #VersionName: 4.07.20 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: landscape #CanInstallToExternalStorage: False @@ -208,6 +208,11 @@ Sub Activity_Resume Starter.imprimirTicket = ia importaBDDesdeWhatsApp + 'Esto para cambiar los tamaños y posiciones para pantallas chicas (celuar). + If GetDeviceLayoutValues.ApproximateScreenSize < 6 Then + l_version.Top = 20dip + l_version.Left = 10dip + End If End Sub Sub Activity_KeyPress (key As Int) As Boolean diff --git a/Lanterna2.b4a.meta b/Lanterna2.b4a.meta index cc77b63..3c9bc8b 100644 --- a/Lanterna2.b4a.meta +++ b/Lanterna2.b4a.meta @@ -28,6 +28,6 @@ ModuleClosedNodes6=3,6 ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Main,i_logo_LongClick,419,0,Principal,imprimeResumenGrupos,2238,6,appUpdater,Process_Globals,74,0,Principal,b_cierraAdmin_Click,1614,6,Principal,sftp1_UploadProgress,4542,0,Principal,sftp1_UploadCompleted,4550,0,Principal,sftp1_PromptYesNo,4534,0,Principal,sftp1_ShowMessage,4539,0,Visual Designer,principal.bal,-100,1,Principal,Process_Globals,28,0 +NavigationStack=Visual Designer,principal.bal,-100,1,Principal,Process_Globals,28,0,Principal,Activity_Create,214,0,Main,Process_Globals,30,0,Main,i_conf_Click,214,0,Main,Activity_Resume,124,3,updateAvailable,Activity_Resume,43,0,Visual Designer,login.bal,-100,3,updateAvailable,ofreceActualizacion,55,2,Principal,b_cierraAdmin_Click,1614,6 SelectedBuild=0 VisibleModules=7,6,8,1 diff --git a/Principal.bas b/Principal.bas index 420db3d..d8ec223 100644 --- a/Principal.bas +++ b/Principal.bas @@ -1618,7 +1618,7 @@ Private Sub b_cierraAdmin_Click ToastMessageShow("¡Es necesario que NO haya mesas abiertas para realizar el cierre!", True) End If DateTime.DateFormat = "yyMMdd_HHmmss" - sftp1.UploadFile(File.DirAssets, "kmt.db", $"/Lanterna/kmt_Lanterna_${DateTime.Date(DateTime.Now)}.db"$) 'Requiere la libreria "JSch" (https://www.b4x.com/android/forum/threads/android-sftp-based-on-jsch-tutorial.26994/) para SFTP. + sftp1.UploadFile(File.DirInternal, "kmt.db", $"/Lanterna/kmt_Lanterna_${DateTime.Date(DateTime.Now)}.db"$) 'Requiere la libreria "JSch" (https://www.b4x.com/android/forum/threads/android-sftp-based-on-jsch-tutorial.26994/) para SFTP. End Sub Private Sub b_cierraAdmin_LongClick diff --git a/updateAvailable.bas b/updateAvailable.bas index 82503cf..16dad14 100644 --- a/updateAvailable.bas +++ b/updateAvailable.bas @@ -59,7 +59,7 @@ public Sub CanRequestPackageInstalls As Boolean End Sub Sub ofreceActualizacion - If Msgbox2(appUpdater.newApp.newMsg,"Actualización disponible","Si","","No",Null) = DialogResponse.Positive Then 'ignore + If Msgbox2(appUpdater.newApp.newMsg,"Actualización disponible","Actualizar","","Cancelar",Null) = DialogResponse.Positive Then 'ignore ' StartService(DownloadService) CallSubDelayed(appUpdater, "download_newApk") End If