diff --git a/Durakelo_reparto.b4a b/Durakelo_reparto.b4a index c608563..874403a 100644 --- a/Durakelo_reparto.b4a +++ b/Durakelo_reparto.b4a @@ -115,7 +115,7 @@ Version=12.5 #Region Project Attributes #ApplicationLabel: Durakelo-Reparto #VersionCode: 1 - #VersionName: 3.11.16 + #VersionName: 3.11.19 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False @@ -167,6 +167,7 @@ Sub Globals Dim paso1 As String Private IMEN As Label Dim IMEI As String + Private l_version As Label End Sub Sub Activity_Create(FirstTime As Boolean) @@ -191,12 +192,12 @@ Sub Activity_Create(FirstTime As Boolean) ' "http://keymon.com.mx:1782" End If Activity.LoadLayout("login") + l_version.Text = Application.VersionName Dim P As PhoneId IMEN.Text = "" 'P.GetDeviceId IMEI = "" 'P.GetDeviceId skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS RUTAA (RUTAA TEXT)") - End Sub Sub Activity_Resume diff --git a/Durakelo_reparto.b4a.meta b/Durakelo_reparto.b4a.meta index b57d987..9416059 100644 --- a/Durakelo_reparto.b4a.meta +++ b/Durakelo_reparto.b4a.meta @@ -52,7 +52,7 @@ ModuleClosedNodes14= ModuleClosedNodes15= ModuleClosedNodes16=9 ModuleClosedNodes17= -ModuleClosedNodes18= +ModuleClosedNodes18=10 ModuleClosedNodes19= ModuleClosedNodes2= ModuleClosedNodes20= @@ -64,10 +64,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8=3,6,8,17,18,19 ModuleClosedNodes9= -<<<<<<< HEAD -NavigationStack=seleccion,JobDone,626,6,Main,Activity_Create,58,0,Starter,pe_BatteryChanged,43,0,colonia,Activity_Resume,64,5,colonia,ListView1_ItemClick,141,2,colonia,BUSCA_TextChanged,195,2,DiseƱador Visual,fila.bal,-100,2,Main,Process_Globals,30,0,Starter,ENVIA_ULTIMA_GPS,62,0,seleccion,cargar_Click,535,6 -======= -NavigationStack=Visual Designer,login.bal,-100,1,Visual Designer,mapa.bal,-100,2,Visual Designer,mapa_rutas.bal,-100,1,Visual Designer,nopago.bal,-100,2,Visual Designer,nuevocliente.bal,-100,2,Visual Designer,pedido.bal,-100,2,Visual Designer,seleccion.bal,-100,1,Visual Designer,tarjeta.bal,-100,2,Visual Designer,telefonos.bal,-100,1,seleccion,JobDone,935,6 ->>>>>>> 8fcae350507f27b4d1f396c01e70a8aad755cd6c +NavigationStack=seleccion,Activity_Create,154,6,Visual Designer,seleccion.bal,-100,6,Starter,ENVIA_ULTIMA_GPS,54,0,Starter,Process_Globals,12,0,Main,Activity_Create,69,6,Visual Designer,login.bal,-100,6,Main,Globals,57,0,Visual Designer,mapa_rutas.bal,-100,5,MAPA_RUTAS,Activity_Create,64,6,MAPA_RUTAS,Globals,56,0 SelectedBuild=0 -VisibleModules=18,21,4,17,6 +VisibleModules=1,9,10,17,12 diff --git a/Files/login.bal b/Files/login.bal index ac52a1e..f584e4f 100644 Binary files a/Files/login.bal and b/Files/login.bal differ diff --git a/Files/mapa_rutas.bal b/Files/mapa_rutas.bal index dfcb856..eb1640d 100644 Binary files a/Files/mapa_rutas.bal and b/Files/mapa_rutas.bal differ diff --git a/Files/seleccion.bal b/Files/seleccion.bal index 5ce4736..2522ae1 100644 Binary files a/Files/seleccion.bal and b/Files/seleccion.bal differ diff --git a/MAPA_RUTAS.bas b/MAPA_RUTAS.bas index c0cc702..d1fe67a 100644 --- a/MAPA_RUTAS.bas +++ b/MAPA_RUTAS.bas @@ -58,8 +58,7 @@ Sub Globals Dim GoogleMapEXTRA As GoogleMapsExtras Dim CODIGO As String Private SEMANA As String - - + Private l_version As Label End Sub Sub Activity_Create(FirstTime As Boolean) @@ -73,7 +72,8 @@ Sub Activity_Create(FirstTime As Boolean) If(FirstTime) Then GPS.Initialize("GPS") End If - + l_version.Text = Application.VersionName + l_version.Left = Activity.Width - l_version.Width - 10 If MapFragment1.IsGooglePlayServicesAvailable = False Then ToastMessageShow("Please install Google Play Services.", True) End If diff --git a/Starter.bas b/Starter.bas index ccf7071..f7404b3 100644 --- a/Starter.bas +++ b/Starter.bas @@ -16,7 +16,7 @@ Sub Process_Globals Public FLP As FusedLocationProvider Dim pe As PhoneEvents Dim Timer1 As Timer - Dim Interval As Int = 15 + Dim Interval As Int = 300 End Sub Sub Service_Create diff --git a/seleccion.bas b/seleccion.bas index 285ef52..479229f 100644 --- a/seleccion.bas +++ b/seleccion.bas @@ -24,7 +24,7 @@ Sub Globals 'These global variables will be redeclared each time the activity is created. 'These variables can only be accessed from this module. Dim trabajar As Button - dim ime as ime + Dim ime As IME Dim c As Cursor Dim d As Cursor Dim b As Cursor @@ -96,6 +96,7 @@ Sub Globals Private p_cargando As Panel Private p_cargando2 As Panel Private l_cargando As Label + Private l_version As Label End Sub Sub Activity_Create(FirstTime As Boolean) @@ -180,19 +181,18 @@ Sub Activity_Create(FirstTime As Boolean) End If DateTime.TimeFormat = "HH:mm:ss" p_cargando2.Left = (Activity.Width / 2) - (p_cargando2.Width / 2) + l_version.Text = Application.VersionName + l_version.Left = Activity.Width - l_version.Width - 10 End Sub Sub IsConnectedToInternet As Boolean Dim r As Reflector - r.Target = r.GetContext r.Target = r.RunMethod2("getSystemService", "connectivity", "java.lang.String") r.Target = r.RunMethod("getActiveNetworkInfo") - If r.Target <> Null Then Return r.RunMethod("isConnectedOrConnecting") End If - Return False End Sub