diff --git a/Files/detalle_promo.bal b/Files/detalle_promo.bal index 14ef3fb..673a2bc 100644 Binary files a/Files/detalle_promo.bal and b/Files/detalle_promo.bal differ diff --git a/Files/fila.bal b/Files/fila.bal index edc036b..abd04b0 100644 Binary files a/Files/fila.bal and b/Files/fila.bal differ diff --git a/Files/info_gral.bal b/Files/info_gral.bal index 9e8be1c..e9262dc 100644 Binary files a/Files/info_gral.bal and b/Files/info_gral.bal differ diff --git a/Files/login.bal b/Files/login.bal index 1427d2b..d61c213 100644 Binary files a/Files/login.bal and b/Files/login.bal differ diff --git a/Files/pedido.bal b/Files/pedido.bal index defff34..94d96cc 100644 Binary files a/Files/pedido.bal and b/Files/pedido.bal differ diff --git a/Files/productos.bal b/Files/productos.bal index 00a4ba6..5c919a4 100644 Binary files a/Files/productos.bal and b/Files/productos.bal differ diff --git a/Files/seleccion.bal b/Files/seleccion.bal index e3c1327..726508c 100644 Binary files a/Files/seleccion.bal and b/Files/seleccion.bal differ diff --git a/Files/tarjeta.bal b/Files/tarjeta.bal index 16f2936..7177e19 100644 Binary files a/Files/tarjeta.bal and b/Files/tarjeta.bal differ diff --git a/Starter.bas b/Starter.bas index 7d38909..a964fb3 100644 --- a/Starter.bas +++ b/Starter.bas @@ -32,6 +32,7 @@ Sub Process_Globals Public SharedFolder As String 'Para actualizar apk Dim cedisLocation As Location Dim reqManager As DBRequestManager + Dim server As String End Sub Sub Service_Create @@ -98,7 +99,7 @@ Sub ENVIA_ULTIMA_GPS Dim skmt As SQL Dim cmd As DBCommand Dim reqManager As DBRequestManager - reqManager.Initialize(Me, Main.server) + reqManager.Initialize(Me, server) skmt.Initialize(ruta,"kmt.db", True) ' Log("server: "&Main.server) diff --git a/intmex_reparto.b4a b/intmex_reparto.b4a index 133c0e3..69c4732 100644 --- a/intmex_reparto.b4a +++ b/intmex_reparto.b4a @@ -1,4 +1,4 @@ -Build1=Default,intmex_rep.keymon.com.mx +Build1=Default,intmex_rep.keymon.com.mx,HU2_PUBLIC File1=alert2.png File10=foto.bal File11=guardagestion.bal @@ -104,7 +104,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 /////////////////////~\n~~\n~'/////////////////////// App Updating ////////////////~\n~ AddManifestText(~\n~ )~\n~ AddApplicationText(~\n~ ~\n~ ~\n~ ~\n~ )~\n~ CreateResource(xml, provider_paths,~\n~ ~\n~ ~\n~ ~\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: 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 @@ -136,7 +136,7 @@ Version=12.8 #Region Project Attributes #ApplicationLabel: Intmex-Reparto #VersionCode: 1 - #VersionName: 4.08.05 + #VersionName: 5.06.13.1 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -207,10 +207,10 @@ Sub Globals Private b_regesar As Button Private p_serverList As Panel Public Provider As FileProvider + Private l_version As Label End Sub Sub Activity_Create(FirstTime As Boolean) - ' If File.ExternalWritable Then ' ruta = Starter.rp.GetSafeDirDefaultExternal("") ' Else @@ -228,7 +228,14 @@ Sub Activity_Create(FirstTime As Boolean) Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS PAGARES (PA_ALMACEN TEXT, PA_RUTA_REP TEXT, PA_RUTAPREV TEXT, PA_FECHA_PREV TEXT, PA_CAPTURA TEXT, PA_MONTO TEXT, PA_USUARIO TEXT, PA_CLIENTE TEXT)") Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS wayPoints (codigo TEXT, indice INT)") - Dim server As String = "http://187.189.244.154:1781" + Dim server As String = "http://keymon.net:1781" + Private s As Cursor = Starter.skmt.ExecQuery("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'SERVER'") + Log(s.RowCount) + If s.RowCount > 0 Then + s.Position = 0 + Log("Ponemos el servidor desde CAT_VARIABLES: " & s.GetString("CAT_VA_VALOR")) + server = s.GetString("CAT_VA_VALOR") + End If ' Dim server As String = "http://11.0.0.107:1781" ' server = "http://10.0.0.205:1782" ' server = "http://11.0.0.44:1782" @@ -276,7 +283,6 @@ Sub Activity_Resume Wait For Activity_PermissionResult (Permission As String, resultC As Boolean) Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE) Wait For Activity_PermissionResult (Permission As String, resultC As Boolean) - ' CallSubDelayed(FirebaseMessaging, "SubscribeToTopics") End Sub @@ -301,7 +307,6 @@ Sub Entrar_Click 'existe = 1 If existe = 0 Then 'skmt.ExecNonQuery("delete from usuarioa") - Dim cmd As DBCommand cmd.Initialize cmd.Name = "select_usuario_INTMEX_REPG" @@ -338,13 +343,8 @@ Sub JobDone(Job As HttpJob) Dim result As DBResult = reqManager.HandleJob(Job) If result.Tag = "agencia" Then 'query tag For Each records() As Object In result.Rows - Dim ID_ALMACEN As String = records(result.Columns.Get("ID_ALMACEN")) - - - Next - End If End If @@ -392,8 +392,14 @@ Sub Activity_KeyPress (key As Int) As Boolean Return False End Sub - Private Sub i_engrane_Click + Private s As Cursor = Starter.skmt.ExecQuery("select * from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'SERVER'") + Log(s.RowCount) + If s.RowCount > 0 Then + s.Position = 0 + Log(s.GetString("CAT_VA_VALOR")) + et_server.Text = s.GetString("CAT_VA_VALOR") + End If p_appUpdate.Width = Activity.Width p_appUpdate.Height = Activity.Height Subs.centraPanel(p_serverList, Activity.Width) @@ -403,8 +409,8 @@ Private Sub i_engrane_Click 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") + lv_server.AddSingleLine("http://keymon.net:1781") + If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://192.99.93.204:1781") ' l_server.Text = Starter.server et_server.Text = server Subs.panelVisible(p_appUpdate, 0, 0) @@ -438,15 +444,21 @@ 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) + 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)) + Log(et_server.text) + Starter.server = et_server.text + server = et_server.text + If logger Then Log("Inicializamos reqManager con " & server) + reqManager.Initialize(Me, server) + LogColor($"ReqServer = ${server}"$, Colors.red) ' reinicializaReqManager -' p_appUpdate.Visible = False -'' Entrar.Visible = True + p_appUpdate.Visible = False +' Entrar.Visible = True +End Sub + +Private Sub lv_server_ItemClick (Position As Int, Value As Object) + Log(Value) + et_server.text = Value End Sub \ No newline at end of file diff --git a/intmex_reparto.b4a.meta b/intmex_reparto.b4a.meta index 95956c0..741b562 100644 --- a/intmex_reparto.b4a.meta +++ b/intmex_reparto.b4a.meta @@ -46,7 +46,7 @@ ModuleBreakpoints6= ModuleBreakpoints7= ModuleBreakpoints8= ModuleBreakpoints9= -ModuleClosedNodes0= +ModuleClosedNodes0=5,9,10 ModuleClosedNodes1= ModuleClosedNodes10= ModuleClosedNodes11= @@ -56,7 +56,7 @@ ModuleClosedNodes14= ModuleClosedNodes15= ModuleClosedNodes16= ModuleClosedNodes17= -ModuleClosedNodes18=6,7,8,9 +ModuleClosedNodes18=3,6,7,8,9,10,11,13 ModuleClosedNodes19=3,4,5,6,7,8 ModuleClosedNodes2= ModuleClosedNodes20= @@ -70,6 +70,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=seleccion,e_ruta_EnterPressed,1051,0,fila,ListView1_ItemLongClick,247,0,fila,Guardado,274,0,fila,b_cancred_Click,588,4,Main,Activity_Create,93,0,fila,b_acred_Click,627,2,fila,gest_Click,319,6,seleccion,Subir_Click,470,6,nopago,Activity_Create,50,0,nopago,Activity_Resume,65,6 +NavigationStack=Historico,Globals,29,0,Starter,Service_TaskRemoved,75,0,Main,Activity_Create,83,6,seleccion,connecta_Click,1079,2,seleccion,JobDone,1009,0,seleccion,Activity_Resume,190,3,seleccion,Activity_Create,171,5,Diseñador Visual,tarjeta.bal,-100,2,Diseñador Visual,seleccion.bal,-100,6,Main,b_server_Click,310,0 SelectedBuild=0 -VisibleModules=19,23,20,18,4,5,8,15,6,9 +VisibleModules=19,23,20,18,4,5,8,15,6,9,13,11 diff --git a/seleccion.bas b/seleccion.bas index 4366c70..1d96075 100644 --- a/seleccion.bas +++ b/seleccion.bas @@ -96,12 +96,14 @@ Sub Globals Private Btn_Ubicar_Ru As Button Dim cargo As String Private p_principal As Panel + Private l_version As Label End Sub Sub Activity_Create(FirstTime As Boolean) EJECUTANDO=1 If FirstTime Then reqManager.Initialize(Me, Main.server) + Log(Main.server) 'reqManager.Initialize(Me,"http://201.99.139.28:1782") 'reqManager.Initialize(Me,"http://177.244.63.54:1782") 'reqManager.Initialize(Me,"http://keymon.com.mx:1782") @@ -191,6 +193,7 @@ End Sub Sub Activity_Resume reqManager.Initialize(Me, Main.server) + Log("-------> " & Main.server) Subs.centraPanel(p_principal, Activity.Width) c=Starter.skmt.ExecQuery("select noversion from version") c.Position=0 @@ -342,6 +345,8 @@ Sub Activity_Resume If c.RowCount > 0 Then RUTA_T = c.GetString("RUTAA") Main.rutaPreventa = RUTA_T c.Close + l_version.Text = Application.VersionName + l_version.Left = Activity.Width - l_version.Width End Sub Sub IsConnectedToInternet As Boolean 'ignore @@ -1066,7 +1071,7 @@ Sub Activity_KeyPress (key As Int) As Boolean End Sub Sub connecta_Click - imei = p.GetDeviceId + imei = "" ' p.GetDeviceId conn = "1" Dim cmd As DBCommand cmd.Initialize