diff --git a/B4A/Gabinete roit.b4a b/B4A/Gabinete roit.b4a index 3dd198c..e113376 100644 --- a/B4A/Gabinete roit.b4a +++ b/B4A/Gabinete roit.b4a @@ -74,7 +74,7 @@ Library6=bitmapcreator Library7=byteconverter Library8=camera Library9=compressstrings -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~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'SetServiceAttribute(android:requestLegacyExternalStorage, True)~\n~~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~~\n~AddManifestText(~\n~~\n~)~\n~~\n~AddManifestText(~\n~~\n~ )~\n~~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~~\n~'AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~~\n~~\n~'AddManifestText(~\n~')~\n~~\n~~\n~'End of default text.~\n~~\n~'/////////////////////// App Updating ////////////////~\n~' AddManifestText(~\n~' )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\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~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~'AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~'AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~~\n~AddPermission("android.permission.POST_NOTIFICATIONS")~\n~~\n~AddManifestText()~\n~AddPermission(android.permission.INTERNET)~\n~SetApplicationAttribute(android:allowBackup, "false")~\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: 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~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~'SetServiceAttribute(android:requestLegacyExternalStorage, True)~\n~~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText(~\n~~\n~ )~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~~\n~'AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~'AddManifestText(~\n~')~\n~'End of default text.~\n~~\n~'/////////////////////// App Updating ////////////////~\n~' AddManifestText(~\n~' )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\n~ ~\n~ ~\n~ )~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\n~AddManifestText()~\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~CreateResourceFromFile(Macro, JhsIceZxing1.CaturePortrait)~\n~'AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE")~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~~\n~AddPermission("android.permission.POST_NOTIFICATIONS")~\n~AddManifestText()~\n~AddPermission(android.permission.INTERNET)~\n~~\n~SetApplicationAttribute(android:allowBackup, "false")~\n~~\n~~\n~'SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~AddPermission(android.permission.ACCESS_NETWORK_STATE)~\n~ Module1=appUpdater Module10=DBRequestManager Module11=errorManager @@ -99,7 +99,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Gabinete #VersionCode: 1 - #VersionName: 4.03.06 + #VersionName: 4.03.07 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/Gabinete roit.b4a.meta b/B4A/Gabinete roit.b4a.meta index b2303a6..349b3fa 100644 --- a/B4A/Gabinete roit.b4a.meta +++ b/B4A/Gabinete roit.b4a.meta @@ -49,6 +49,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=Subs,fechaKMT,89,0,Starter,Process_Globals,35,0,Starter,Service_Destroy,79,0,Visual Designer,login.bal,-100,3,Visual Designer,errormanager.bal,-100,1,Starter,Application_Error,67,0,errorManager,Activity_Resume,93,5,login,b_inicio_Click,109,0,login,JobDone,145,0,login,b_inicio_LongClick,119,6,Main,Process_Globals,21,0 +NavigationStack=login,JobDone,178,0,B4XMainPage,Timerconteo_tick,95,0,B4XMainPage,B4XPage_Appear,72,1,Main,Process_Globals,19,0,Subs,notiLowReturn,69,0,Subs,IsConnectedToInternet,77,0,login,B4XPage_CloseRequest,193,0,B4XMainPage,CheckAndRequestNotificationPermission,86,0,B4XMainPage,B4XPage_Created,52,0,login,B4XPage_Appear,64,2 SelectedBuild=0 VisibleModules=14,3,12,5,6,10,15,16,11 diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 0f958c7..10ea7d1 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -69,6 +69,12 @@ Sub notiLowReturn(title As String, Body As String, id As Int) As Notification 'i notification.Notify(id) ' Log("notiLowReturn SetInfo") Return notification + +' java.lang.SecurityException: Starting FGS with Type location callerApp=ProcessRecord{d39abd3 32668:gabinete.keymon.lat/u0a261} +' targetSDK=34 requires permissions: all of the permissions allOf=True [android.permission.FOREGROUND_SERVICE_LOCATION] +' any of the permissions allOf=False [android.permission.ACCESS_COARSE_LOCATION, android.permission.ACCESS_FINE_LOCATION] +' And the app must be in the eligible state/exemptions To access the foreground only permission + End Sub Sub IsConnectedToInternet As Boolean 'ignore diff --git a/B4A/login.bas b/B4A/login.bas index 151089f..0023f47 100644 --- a/B4A/login.bas +++ b/B4A/login.bas @@ -58,7 +58,6 @@ Private Sub B4XPage_Created (Root1 As B4XView) End Sub Sub B4XPage_Appear - If Starter.muestraProgreso = 1 Then muestraProgreso("Descargando actualización") Starter.muestraProgreso = 0 @@ -69,7 +68,7 @@ Sub B4XPage_Appear p_adorno.Width = Root.Width * 0.85 p_adorno.Height = Root.Height * 0.80 Log("inicio1") - StartService(Tracker) +' StartService(Tracker) Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_ACCESS_FINE_LOCATION) Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean) If Result Then @@ -103,8 +102,6 @@ Sub B4XPage_Appear ' Else If EsDomingo(newDate) Then ' Log("¡Hoy es Domingo!") ' End If - - End Sub Private Sub b_inicio_Click @@ -185,17 +182,14 @@ Sub JobDone (Job As HttpJob) B4XPages.ShowPage("Supervisor") End If Else If Starter.trabaja = 0 Then + B4XPages.ShowPage("Principal") MsgboxAsync("Hoy es día de descanso","Atención") End If Next ' ToastMessageShow(" Historico Clientes Promociones Actualizado." , True) - End If - End If - End If - End Sub Private Sub B4XPage_CloseRequest As ResumableSub @@ -204,7 +198,6 @@ Private Sub B4XPage_CloseRequest As ResumableSub Else B4XPages.ShowPage("login") End If - ' Return True Return False End Sub diff --git a/B4XMainPage.bas b/B4XMainPage.bas index 9312f29..c1e628a 100644 --- a/B4XMainPage.bas +++ b/B4XMainPage.bas @@ -23,7 +23,7 @@ Version=9.85 Sub Class_Globals Public Root As B4XView Private xui As XUI - Dim timer As Timer +' Dim timer As Timer ' Clases Public login As login Dim principal As C_principal @@ -33,7 +33,6 @@ End Sub Public Sub Initialize ' B4XPages.GetManager.LogEvents = True - End Sub 'This event will be called once, before the page becomes visible. @@ -42,9 +41,9 @@ Private Sub B4XPage_Created (Root1 As B4XView) Root.LoadLayout("MainPage") B4XPages.GetManager.TransitionAnimationDuration = 0 login.Initialize - B4XPages.AddPageAndCreate("login",login.Initialize) - timer.Initialize("Timerconteo",1000) - timer.Enabled = True + B4XPages.AddPageAndCreate("login", login) +' timer.Initialize("Timerconteo",1000) +' timer.Enabled = True principal.Initialize B4XPages.AddPage("Principal", principal) supervisor.Initialize @@ -67,19 +66,17 @@ Private Sub B4XPage_Created (Root1 As B4XView) Else ToastMessageShow("No permission", True) End If - CheckAndRequestNotificationPermission - - End Sub Private Sub B4XPage_Appear - Wait For (CheckAndRequestNotificationPermission) Complete (HasPermission As Boolean) - If HasPermission Then - Log("Con permisos de notificación") - Else - ToastMessageShow("No permission to show notification", True) - End If +' Wait For (CheckAndRequestNotificationPermission) Complete (HasPermission As Boolean) +' If HasPermission Then +' Log("Con permisos de notificación") +' Else +' ToastMessageShow("No permission to show notification", True) +' End If + B4XPages.ShowPage("login") End Sub 'Make sure that targetSdkVersion >= 33 @@ -102,9 +99,9 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub Timerconteo_tick - B4x_Transition.PrepareTransition_FadeOut(xui, Root.Width, Root.Height, Root, login.Root) - B4XPages.ShowPageAndRemovePreviousPages("login") - timer.Enabled = False +' B4x_Transition.PrepareTransition_FadeOut(xui, Root.Width, Root.Height, Root, login.Root) +' B4XPages.ShowPageAndRemovePreviousPages("login") +' timer.Enabled = False End Sub