From adab335f3ea3709f59d7b7ceeb4fb1043443fb9b Mon Sep 17 00:00:00 2001 From: cheveguerra Date: Wed, 4 Oct 2023 20:28:32 -0600 Subject: [PATCH] =?UTF-8?q?4/10/23=20-=20Actualizaci=C3=B3n=20en=20el=20ma?= =?UTF-8?q?nifiesto=20y=20en=20el=20dise=C3=B1o.=20-=20Se=20modifico=20la?= =?UTF-8?q?=20declaracion=20de=20la=20libreria=20ReplyAuto=20para=20que=20?= =?UTF-8?q?incluya=20"android:exported=3D"true"",=20esta=20modificaci?= =?UTF-8?q?=C3=B3n=20es=20necesaria=20para=20Android=2012+=20-=20Se=20camb?= =?UTF-8?q?ian=20tama=C3=B1os=20y=20posicion=20de=20paneles=20para=20que?= =?UTF-8?q?=20se=20adapten=20a=20la=20pantalla=20del=20movil=20(pantalla?= =?UTF-8?q?=20principal).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- B4A/B4XMainPage.bas | 24 ++++--- B4A/C_Principal.bas | 144 ++++++++++++++++++++++------------------ B4A/Files/login.bal | Bin 12593 -> 12593 bytes B4A/Files/principal.bal | Bin 68308 -> 68639 bytes B4A/KelloggsV4.b4a | 4 +- B4A/KelloggsV4.b4a.meta | 6 +- B4A/kms_helperSubs.bas | 15 ++--- 7 files changed, 104 insertions(+), 89 deletions(-) diff --git a/B4A/B4XMainPage.bas b/B4A/B4XMainPage.bas index d4659a6..204e8d0 100644 --- a/B4A/B4XMainPage.bas +++ b/B4A/B4XMainPage.bas @@ -140,6 +140,7 @@ Private Sub B4XPage_Created (Root1 As B4XView) B4XPages.AddPage("Historico", historico) checklist.Initialize B4XPages.AddPage("CheckList", checklist) + Panel1.Top = 0 : Panel1.left = 0 ruta = Starter.ruta ruta = File.DirInternal Starter.tiempos.Initialize @@ -302,9 +303,11 @@ Private Sub B4XPage_Created (Root1 As B4XView) ' If Result Then Log("Tenemos permisos de bluetooth.") ' Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") ' Log("Check phone state: " & rp.Check(rp.PERMISSION_READ_PHONE_STATE)) +End Sub +Sub B4XPage_Appear MES1.Initialize(Me, "MES1") - ' get the device SDK version +' Get the device SDK version Dim SdkVersion As Int = device.SdkVersion ' Choose which permission to request in order to access external storgage If SdkVersion < 30 Then @@ -317,18 +320,13 @@ Private Sub B4XPage_Created (Root1 As B4XView) ' Log("SDK = " & SdkVersion & " : Requesting MANAGE_EXTERNAL_STORAGE permission") ' Log("On Entry MANAGE_EXTERNAL_STORAGE = " & MES1.HasPermission) If Not(MES1.HasPermission) Then - Dim r As String = Msgbox2("This app requires access to all files, please enable the option", "Manage All Files", "OK", "", "", Null) - If r = DialogResponse.POSITIVE Then - MES1.GetPermission -' Wait For Msgbox_Result(Res As Int) + MsgboxAsync("This app requires access to all files, please enable the option", "Manage All Files") + Wait For Msgbox_Result(Res As Int) ' Log("Getting permission") - Wait For MES_StorageAvailable - End If + MES1.GetPermission + Wait For MES_StorageAvailable End If End If -End Sub - -Sub B4XPage_Appear ' server = "http://keymon.com.mx:1782" ' server = "http://201.99.139.28:1782" ' server = "http://177.244.63.54:1782" @@ -387,6 +385,10 @@ End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. +Sub pass_EnterPressed + Entrar_Click +End Sub + Sub Entrar_Click DateTime.DateFormat = "yyyyMMdd" If user.Text = "ALTERNO" Then @@ -433,7 +435,7 @@ Sub Entrar_Click Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_version_KELL" - Starter.reqManager.ExecuteQuery(cmd , 0, "version") + reqManager.ExecuteQuery(cmd , 0, "version") Else Subs.iniciaActividad("Principal") ' B4XPages.ShowPage("Principal") diff --git a/B4A/C_Principal.bas b/B4A/C_Principal.bas index 7f3ff46..595ac35 100644 --- a/B4A/C_Principal.bas +++ b/B4A/C_Principal.bas @@ -187,6 +187,7 @@ Sub Class_Globals Private admin As BluetoothAdmin Public BluetoothState, ConnectionState As Boolean Private ion As Object + Private p_centrado As Panel End Sub 'You can add more parameters here. @@ -202,9 +203,9 @@ Private Sub B4XPage_Created (Root1 As B4XView) 'load the layout to Root Root.LoadLayout("principal") EJECUTANDO=1 - Dim ruta As String +' Dim ruta As String img2.Visible =False - ruta = File.DirInternal +' ruta = File.DirInternal DateTime.DateFormat = "MM/dd/yyyy" fecha=DateTime.Date(DateTime.Now) c=Starter.db.ExecQuery2("select CAT_CO_CONFIGURACION from CAT_CODIGOS where CAT_CO_PONDERACION =1 AND CAT_CO_ACCION = ?", Array As String("SERVER")) @@ -260,66 +261,23 @@ Private Sub B4XPage_Created (Root1 As B4XView) End If kh.Initialize(Me, "kh") kh.RD_Init - Log("XXXXXXXXXXXXXXXXXXXXXXXXX REVISAMOS PERMISOS DE BT - APPEAR -") - StartBluetooth - Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") - -End Sub - -Private Sub StartBluetooth - If admin.IsEnabled = False Then - Wait For (EnableBluetooth) Complete (Success As Boolean) - If Success = False Then - ToastMessageShow("Failed to enable bluetooth", True) - End If - End If - BluetoothState = admin.IsEnabled - StateChanged -End Sub - -Private Sub StateChanged -' btnSearchForDevices.Enabled = BluetoothState -' btnAllowConnection.Enabled = BluetoothState -' ChatPage1.btnSend.Enabled = ConnectionState -End Sub - -Private Sub EnableBluetooth As ResumableSub - ToastMessageShow("Enabling Bluetooth adapter...", False) - Dim ph As Phone - If ph.SdkVersion >= 31 Then - Log(31) - rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT") - Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean) - Log(Result) - If Result = False Then Return False - If ph.SdkVersion >= 33 Then - Log(33) - Dim in As Intent - in.Initialize("android.bluetooth.adapter.action.REQUEST_ENABLE", "") - StartActivityForResult(in) - Wait For ion_Event (MethodName As String, Args() As Object) - Return admin.IsEnabled - End If - End If - Return admin.Enable -End Sub - -Private Sub StartActivityForResult(i As Intent) - Dim jo As JavaObject = GetBA - ion = jo.CreateEvent("anywheresoftware.b4a.IOnActivityResult", "ion", Null) - jo.RunMethod("startActivityForResult", Array As Object(ion, i)) -End Sub - -Sub GetBA As Object - Dim jo As JavaObject = Me - Return jo.RunMethod("getBA", Null) + P_RESUMEN.Top = 0 : P_RESUMEN.Left = 0 'Panel Resumen + Panel5.Top = 0 : Panel5.Left = 0 ' Panel Resumen Acumualado + p_downloadPDF.Top = 0 : p_downloadPDF.left = 0 + P1.Width = GetDeviceLayoutValues.Width + P1.Height = GetDeviceLayoutValues.Height + P1.Top = 0 : P1.left = 0 'Panel de cargar dia + Subs.centraPanel(p_centrado, Root.Width) 'Panel de cargar dia 2 End Sub 'You can see the list of page related events in the B4XPagesManager object. The event name is B4XPage. Sub B4XPage_Appear + Log("XXXXXXXXXXXXXXXXXXXXXXXXX REVISAMOS PERMISOS DE BT - APPEAR -") + StartBluetooth + Log("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX") If Not(kh.CheckNotificationAccess) Then - Msgbox2Async($"Se necesita acceso a las notificaciones, haga clic en "Aceptar" y en la siguiente pantalla permita el acceso a la aplicación "${Application.LabelName}"."$, "Permisos necesarios", "Aceptar", "Cancelar", "", Null, True) + Msgbox2Async($"Se necesita acceso a las notificaciones, haga clic en "Aceptar" y en la siguiente pantalla permita el acceso a la aplicación "${Application.LabelName}"."$, "Permisos necesarios", "Aceptar", "", "", Null, True) Wait For Msgbox_Result (resultado As Int) If resultado = DialogResponse.POSITIVE Then Dim In As Intent @@ -599,8 +557,6 @@ Sub cargar_Click Btn_CheckList.Visible=False ' P1.Visible = True ' P1.BringToFront - P1.Width = GetDeviceLayoutValues.Width - P1.Height = GetDeviceLayoutValues.Height Subs.panelVisible(P1, 0, 0) trabajar.Visible = False B_PROXIMA.Visible =False @@ -892,8 +848,6 @@ Sub cargar_Click trabajar.Visible=False inv.Visible = False If Starter.marcaCel <> "LGE" Then ToastMessageShow("Se Actualizarán los datos. Este proceso podria tardar hasta un minuto, gracias" , True) - - End If End Sub @@ -904,7 +858,7 @@ Sub JobDone(Job As HttpJob) If Job.Success = False Then If logger Then LogColor("** " & Job.Tag & " Error: " & Job.ErrorMessage, Colors.Red) ' Mod by CHV - 211116 If Job.ErrorMessage = "STREAM" Then - contador_strem = contador_strem +1 + contador_strem = contador_strem + 1 If CARGA = "SUBIR" Then PB1.Progress = PB1.Progress + 1 If PB1.Progress > 100 Then @@ -1354,7 +1308,7 @@ Sub JobDone(Job As HttpJob) PB2.Progress = 100 S_CP.Text = "LISTO" End If - Listo3 =1 + Listo3 = 1 If Listo1 =1 And Listo2 =1 And Listo3 = 1 And Listo4 = 1 Then B4XPage_Appear img2.Visible=False @@ -1912,6 +1866,18 @@ Sub JobDone(Job As HttpJob) Next Starter.db.TransactionSuccessful Starter.db.EndTransaction + + If PB2.Progress = 0 Then + PB2.Progress = 30 + S_CP.Text = "CARGANDO" + ELSE If PB2.Progress = 30 Then + PB2.Progress = 60 + ELSE IF PB2.Progress = 60 Then + PB2.Progress = 80 + ELSE IF PB2.Progress = 80 Then + PB2.Progress = 100 + S_CP.Text = "LISTO" + End If ' c=skmt.ExecQuery("select CAT_GP_CLASIF, COUNT(*) AS CUANTOS from CAT_GUNAPROD GROUP BY CAT_GP_CLASIF order by CAT_GP_CLASIF asc") ' c.Position=0 ' skmt.ExecNonQuery("DELETE FROM COUNT_GUNAPROD") @@ -1940,6 +1906,8 @@ Sub JobDone(Job As HttpJob) ''' FIN CARGA PEDIDO DOE End If + + If PB2.Progress = 100 Then S_CP.Text = "LISTO" Job.Release End Sub @@ -3139,4 +3107,54 @@ End Sub Private Sub Resumen_LongClick ToastMessageShow("Enviamos UTR", True) CallSubDelayed(Starter, "ENVIA_ULTIMA_GPS") -End Sub \ No newline at end of file +End Sub + + +Private Sub StartBluetooth + If admin.IsEnabled = False Then + Wait For (EnableBluetooth) Complete (Success As Boolean) + If Success = False Then + ToastMessageShow("Failed to enable bluetooth", True) + End If + End If + BluetoothState = admin.IsEnabled + StateChanged +End Sub + +Private Sub StateChanged +' btnSearchForDevices.Enabled = BluetoothState +' btnAllowConnection.Enabled = BluetoothState +' ChatPage1.btnSend.Enabled = ConnectionState +End Sub + +Private Sub EnableBluetooth As ResumableSub + ToastMessageShow("Enabling Bluetooth adapter...", False) + Dim ph As Phone + If ph.SdkVersion >= 31 Then + Log(31) + rp.CheckAndRequest("android.permission.BLUETOOTH_CONNECT") + Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean) + Log(Result) + If Result = False Then Return False + If ph.SdkVersion >= 33 Then + Log(33) + Dim in As Intent + in.Initialize("android.bluetooth.adapter.action.REQUEST_ENABLE", "") + StartActivityForResult(in) + Wait For ion_Event (MethodName As String, Args() As Object) + Return admin.IsEnabled + End If + End If + Return admin.Enable +End Sub + +Private Sub StartActivityForResult(i As Intent) + Dim jo As JavaObject = GetBA + ion = jo.CreateEvent("anywheresoftware.b4a.IOnActivityResult", "ion", Null) + jo.RunMethod("startActivityForResult", Array As Object(ion, i)) +End Sub + +Sub GetBA As Object + Dim jo As JavaObject = Me + Return jo.RunMethod("getBA", Null) +End Sub diff --git a/B4A/Files/login.bal b/B4A/Files/login.bal index da11282ffe647ab7ba73129f68b4e5f8fb038add..0a25ffea8fb0b2bf5703163644800d6c1ba59865 100644 GIT binary patch delta 32 ocmdm(v@vOeya;njO3LH}dGX2i{6d?(MZ!3lLKrtMmhBS;0Jq}`F#rGn delta 24 gcmdm(v@vOeyvSr#ex1$UB4M0N3=EqW%k~Ka0BTeRga7~l diff --git a/B4A/Files/principal.bal b/B4A/Files/principal.bal index f810c55f0fd9f7b8b6b5b17ee3aca3f4d9f8a263..663e374aaa990e5d7450ce29e4eba04c09f95395 100644 GIT binary patch delta 5043 zcmaJ_3tW`N7H1X&cG2BsA(dD701_VoYYDm_V3v9 z^KMoOnto|zXluHf7?vrbD88(s%;#ih{O#YIEEJ9c)G+)cb^F;7d&oRgiBn$?L$kB?5tOq=!h>=cV7Et@ll zu};Qi5iV<1T8`P0I^9<7K8>-BwxOQ4+@E`!=JTl)QY)gik=mwK{ST?Xnc5a=5;X_@ zBkC7X8=cqTPPk`Nrl!q` z_MqO=$>S2oJ)i7F-4U}>W~7ZzPn#FjA5RDLK(~NLFe9L+ryI>Bo1Yqu;(!E$k-H&1 zGc|2aTK4Sp%#=B4SQ!x7y%{r{n>cz%lqdZRF(-{Qk4{WhQ9o&&*G7|lEEyCC*TG4-&>5-E)NLZbNvrm?L zO>)?=S%nMXkvMRD5ynTCds$o2xqS&YH7H*YhfOh+?0_w2pes`qb+F|Q8p~*S%#_Sn znJqX@P?0-mpl$NtH9frMKX~|1*xt<*jZ+4pX=`sxNi<-|C{M&c3}QQR@YTM!l43xg z%qN2Q#tAg<@cm}vn2SpQ?}Vuk72$`Xc{*Hd2tmT4XV~X>Ib*c$bDHf%t)rek>YYe2 zcVjj*WQ@SYX(kj-)!?~b!cmbK#CD;<(i7S&wQg4%p0KQF9}Cfh?tat}y63`@)ytZo zW{-1qSe0rfb4ffN%t%Igx{-ElA}VM4p~Lj%8D=NNV_{A+B4LF*_xno@u6gOncxt8* zk>&D?CBvDkYPym3QscLu^z#@}m+%j@4vf1)eE^A*9_jZLC%9-ifzNlPCZ>5#st?eo zl`mY7Sl7$C*n??d&NNXl2*s>a_^s3#EBtm)n7@BkECt6HzBKl=z<%8hR$l6umy8rJ z8cmDQsG1$pv9*=(%nVlTbh1T_g4yIE3aEWUx?u5O9}yFgp`Ivywo5^{J3E9^MjvcV zi9?qxEqT4$&@lF`*wj(I)R;ZhXx*V&Z0(z_sRAuadSL+6{;{sVBkS7H4L^Co>bK8-6shF7^#ZC%n zrGTCi&{GOD!I3_>SXvjwPUB!%20J6xRoWOwy`rc^!`um{2x1f>rUDVG#B*`^buq_AzUtU%8&HY1MV*k3!3C8s7i^Ka@!u%mBOu{E>cw;?Q zo$&>E4j0exb#Orsg_XJQNLc+ZZeZ{cBj+yLPDFcX)NwdNq>YE5;iiw5FVUzZmWtS|}zehg2-EqR>IB++d=*$7!04 zEi^SI78$9^ar*pC@?IU=@c{A)-+6PBIHeh>+77M-(L*+J!8H6G#w|aw< zB7#Tt4`x1ytQ~=bPbB860Dap7J|ciSK9yK!1=zVgU>5=G_L;=GD!{Jo0sRCpzgS}a z3edkjU;qae?37rbf(vX97bFB)KDXoJUGbP_2|1h9*b`quxPhJ zu8!)B`?s~2^MxH-_QYf6ZUcVXqf8&zeGQN8H9Le<+=xMz-HvVh;$g`%;NCt3nRF`# z4SVhI+usk>s|`X=#(rhmp(p1{iG?W32x)H_p<)@A_h+iY=m5+PP(8-5GsO?Vbq3vI z&J0MXi$+a}9rjXRB<$`Zw5kub)oPpe)$@#n3$^+rKRTbR)vhc+AMPZLht$x}<~zoU zgOaMZ98vFnqs6uo14Yzv)pc@`d3c-}0Nu)SR7c~GwK@Pr$S2S=t6WRJo{SMVAc~?d??@9zVHmqk!in=5x zHUjgV8ZD}V=P#K|+_hC>T8hFLXS`4|`GOj{U(-}$#+bW_n!a1t*Hl@GuDs$O8IjD3P00=B%S35-n?9IZ>- z#6NR}vPsq`H#P#hA4qFopaZgWDLuv?s@J|nk3?SRwmp2uQF>owNO{~3nPCR~i%yaz zGvtTGu06x-%*>Tq3mJ>ko7-Y|eVekUql#@{Eagwer8vQx>+e)<+-f$BpZOWqr`+kd zpbM}nm9pIODCKa3#zM~%@jA~3OQ8od{Xd~}uD>p`bSD<75Bl`B=$*MysE+N8;Ne=(&Cj}6!^Zy)PZ)<) delta 5042 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 SuHrAxz7x$qyv+G-wCVqXCw9L8 diff --git a/B4A/KelloggsV4.b4a b/B4A/KelloggsV4.b4a index d06d6ec..aefa230 100644 --- a/B4A/KelloggsV4.b4a +++ b/B4A/KelloggsV4.b4a @@ -136,7 +136,7 @@ Library6=camera Library7=contentresolver 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~'Set activity to Landscape~\n~SetActivityAttribute(foto, android:screenOrientation, "landscape")~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~AddManifestText(~\n~~\n~)~\n~'''' para el teclado~\n~ SetActivityAttribute(main, android:windowSoftInputMode, adjustResize|stateHidden)~\n~ SetApplicationAttribute(android:allowBackup, "false")~\n~ SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~ ~\n~ AddManifestText(~\n~~\n~)~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~ ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~ AddManifestText(~\n~~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText()~\n~'AddManifestText()~\n~'AddManifestText()~\n~'AddManifestText()~\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)~\n~~\n~AddPermission(android.permission.MANAGE_EXTERNAL_STORAGE)~\n~AddManifestText() 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'///////////////////////// FLP Y PUSH /////////////~\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~'//////////////////////////////////////////////////////~\n~'Le da mas memoria a la aplicacion~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~)~\n~CreateResource(xml, provider_paths, ~\n~~\n~ ~\n~ ~\n~ ~\n~~\n~)~\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~AddManifestText()~\n~AddApplicationText(~\n~~\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: 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~'Set activity to Landscape~\n~SetActivityAttribute(foto, android:screenOrientation, "landscape")~\n~AddApplicationText(~\n~~\n~ ~\n~)~\n~AddManifestText(~\n~~\n~)~\n~'''' para el teclado~\n~ SetActivityAttribute(main, android:windowSoftInputMode, adjustResize|stateHidden)~\n~ SetApplicationAttribute(android:allowBackup, "false")~\n~ SetServiceAttribute(Tracker, android:foregroundServiceType, "location")~\n~ ~\n~AddManifestText(~\n~~\n~)~\n~''CreateResourceFromFile(Macro, FirebaseAnalytics.GooglePlayBase)~\n~ 'End of default text.~\n~ ~\n~SetApplicationAttribute(android:usesCleartextTraffic, "true")~\n~ AddManifestText(~\n~~\n~)~\n~AddPermission(android.permission.ACCESS_BACKGROUND_LOCATION)~\n~AddManifestText(~\n~~\n~)~\n~AddManifestText()~\n~'AddManifestText()~\n~'AddManifestText()~\n~'AddManifestText()~\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)~\n~~\n~AddPermission(android.permission.MANAGE_EXTERNAL_STORAGE)~\n~AddManifestText() 'in order to access the device non-resettable identifiers such as IMEI and serial number.~\n~~\n~'///////////////////////// FLP Y PUSH /////////////~\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~'//////////////////////////////////////////////////////~\n~'Le da mas memoria a la aplicacion~\n~SetApplicationAttribute(android:largeHeap, "true")~\n~AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~)~\n~CreateResource(xml, provider_paths, ~\n~~\n~ ~\n~ ~\n~ ~\n~~\n~)~\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~AddApplicationText(~\n~~\n~ ~\n~ ) Module1=B4XMainPage Module10=C_Pedidos Module11=C_Principal @@ -176,7 +176,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Kelloggs Venta #VersionCode: 3000 - #VersionName: 3.09.24 PRUEBA V4 + #VersionName: 3.10.04 PRUEBA V4 #SupportedOrientations: portrait #CanInstallToExternalStorage: False #BridgeLogger:true diff --git a/B4A/KelloggsV4.b4a.meta b/B4A/KelloggsV4.b4a.meta index 1a26da9..d55ac6a 100644 --- a/B4A/KelloggsV4.b4a.meta +++ b/B4A/KelloggsV4.b4a.meta @@ -78,7 +78,7 @@ ModuleClosedNodes2= ModuleClosedNodes20= ModuleClosedNodes21=20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39 ModuleClosedNodes22= -ModuleClosedNodes23=6,7,8,9,10 +ModuleClosedNodes23=7,8,9,10,12,13 ModuleClosedNodes24= ModuleClosedNodes25= ModuleClosedNodes26= @@ -94,6 +94,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=kms_helperSubs,logJobDoneResultados,410,0,kms_helperSubs,CheckNotificationAccess,413,0,C_Principal,descargaCartaPorte,2940,0,C_Principal,cargar_Click,561,0,C_Principal,B4XPage_Appear,321,2,C_Principal,EnableBluetooth,297,0,B4XMainPage,B_SERVER_Click,600,0,B4XMainPage,B4XPage_CloseRequest,520,1,B4XMainPage,JobDone,510,0,C_Principal,GetBA,312,0 +NavigationStack=C_Principal,EnableBluetooth,3133,0,C_Principal,GetBA,3152,0,C_Principal,Class_Globals,184,0,B4XMainPage,Entrar_Click,391,0,C_Principal,StartBluetooth,3100,0,Tracker,Service_Create,43,0,Tracker,Process_Globals,31,0,Visual Designer,principal.bal,-100,6,C_Principal,B4XPage_Appear,280,6,C_Principal,B4XPage_Created,264,6 SelectedBuild=0 -VisibleModules=1,29,11,23,27,14,30,3,4,13,12 +VisibleModules=1,29,11,23,24,14,30,3,4,13,31 diff --git a/B4A/kms_helperSubs.bas b/B4A/kms_helperSubs.bas index 979f055..8d16374 100644 --- a/B4A/kms_helperSubs.bas +++ b/B4A/kms_helperSubs.bas @@ -16,9 +16,9 @@ Sub Class_Globals Dim skmtAttached As Boolean = False '####### MES Vars ###### Private ion As Object - Dim device As Phone - Private mesCallback As Object - Private mesEventName As String +' Dim device As Phone +' Private mesCallback As Object +' Private mesEventName As String Dim RD_Init_IsInitialized As Boolean = False Dim btAdmin As BluetoothAdmin End Sub @@ -38,7 +38,6 @@ End Sub 'RD - Inicializa Respaldo Diario Sub RD_Init - Log("************************** " & safePath) Dim Dirp As String = File.DirRootExternal Dim Dir As String ' Dim Dir2 As String @@ -51,14 +50,10 @@ Sub RD_Init ' Log("creado en raiz") End Try safePath = Dirp & Dir - Log($"Safepath:${safePath}"$) + If Starter.Logger Then Log($"Safepath:${safePath}"$) Private name() As String = Regex.split(" ", Application.LabelName) rkmt.Initialize(safePath,$"${name(0)}.rkmt.km"$, True) skmt.Initialize(File.DirInternal,"kmt.db", False) -' rkmt.ExecNonQuery($"create table if not exists pedidos (pe_folio NUMERIC, pe_desc NUMERIC, pe_costo_sin TEXT, pe_ruta TEXT, pe_cedis TEXT, pe_costo_tot NUMERIC, pe_costou NUMERIC, pe_cant NUMERIC, pe_pronombre TEXT, pe_proid TEXT, pe_cliente TEXT, pe_fecha TEXT, pe_usuario TEXT, pe_envio_ok TEXT)"$) -' rkmt.ExecNonQuery($"create table if not exists inventarios (cat_gp_iniciativa TEXT, cat_gp_tipoprod TEXT, cat_gp_dev TEXT, cat_gp_almacen NUMERIC, cat_gp_id TEXT, cat_gp_nombre TEXT, cat_gp_imp1 TEXT, cat_gp_imp2 TEXT, cat_gp_precio TEXT, cat_gp_clasif TEXT, cat_gp_sts TEXT, cat_gp_tipo TEXT, cat_gp_subtipo TEXT, cat_gp_tipoprod2 TEXT, fecha TEXT)"$) -'' rkmt.ExecNonQuery($"create table if not exists inventarios2 (cat_gp_iniciativa TEXT, cat_gp_tipoprod TEXT, cat_gp_dev TEXT, cat_gp_almacen NUMERIC, cat_gp_id TEXT, cat_gp_nombre TEXT, cat_gp_imp1 TEXT, cat_gp_imp2 TEXT, cat_gp_precio TEXT, cat_gp_clasif TEXT, cat_gp_sts TEXT, cat_gp_tipo TEXT, cat_gp_subtipo TEXT, cat_gp_tipoprod2 TEXT, fecha TEXT)"$) -' rkmt.ExecNonQuery($"create table if not exists paquetes (cat_dp_precio_simptos TEXT, cat_dp_precio TEXT, cat_dp_almacen TEXT, cat_dp_id TEXT, cat_dp_idprod TEXT, cat_dp_tipo TEXT, cat_dp_pzas TEXT, cat_dp_usuario TEXT, cat_dp_fecha TEXT, cat_dp_regalo TEXT, cat_dp_clasif TEXT, fecha TEXT)"$) If chkIfTableExists(skmt, "PEDIDO") Then rkmt.ExecNonQuery($"create table if not exists PEDIDO (${getTableColumnList(skmt, "PEDIDO")}, FECHA TEXT)"$) If chkIfTableExists(skmt, "CAT_DETALLES_PAQ") Then rkmt.ExecNonQuery($"create table if not exists CAT_DETALLES_PAQ (${getTableColumnList(skmt, "CAT_DETALLES_PAQ")}, FECHA TEXT)"$) If chkIfTableExists(skmt, "CAT_GUNAPROD") Then rkmt.ExecNonQuery($"create table if not exists CAT_GUNAPROD (${getTableColumnList(skmt, "CAT_GUNAPROD")}, FECHA TEXT)"$) @@ -66,7 +61,7 @@ Sub RD_Init If chkIfTableExists(skmt, "kmt_info") Then rkmt.ExecNonQuery($"create table if not exists kmt_info (${getTableColumnList(skmt, "kmt_info")}, FECHA TEXT)"$) DateTime.DateFormat = "MM/dd/yyyy" fechaHoy = DateTime.Date(DateTime.Now) - Log("RKMTS: " & rkmt.IsInitialized) + If Starter.Logger Then Log("RKMTS: " & rkmt.IsInitialized) If revisaSkmtAttached And rkmt.IsInitialized Then RD_Init_IsInitialized = True Else RD_Init_IsInitialized = False End Sub