cheveguerra/Mariana-Reparto-V5
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Mariana-Reparto-V5.git synced 2026-04-17 21:06:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

- VERSION 5.06.06

Browse Source 
- Se agregó en MAPA_RUTAS que si la latitus es 'null' (string) no la muestre.
- Se agregó que al iniciar MainPage lea de CAT_VARIABLES el servidor de reqManager.
This commit is contained in:
Jose Alberto Guerra Ugalde
2025-06-07 13:27:28 -06:00
parent 53a706a9d1
commit c0bdd75fd0
4 changed files with 118 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
B4A/B4XMainPage.bas
View File

@@ -223,6 +223,12 @@ Private Sub B4XPage_Created (Root1 As B4XView)
' IMEN.Text = "" 'P.GetDeviceId ' IMEN.Text = "" 'P.GetDeviceId
' IMEI = "" 'P.GetDeviceId ' IMEI = "" 'P.GetDeviceId
' End If ' End If
Dim srv As Cursor = Starter.skmt.ExecQuery("select * from cat_variables where cat_va_descripcion = 'SERVER'")
If srv.RowCount > 0 Then
srv.Position = 0
Starter.server = srv.GetString("CAT_VA_VALOR")
server = srv.GetString("CAT_VA_VALOR")
End If
End Sub End Sub
Sub B4XPage_Appear Sub B4XPage_Appear
@@ -535,8 +541,8 @@ Private Sub i_engrane_Click
Subs.centraBoton(b_regesar, Root.Width) Subs.centraBoton(b_regesar, Root.Width)
Subs.centraBoton(b_server, p_serverList.Width) Subs.centraBoton(b_server, p_serverList.Width)
lv_server.Clear lv_server.Clear
lv_server.AddSingleLine("http://keymon.lat:1782") lv_server.AddSingleLine("http://keymon.net:1781")
If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1782") If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1781")
' l_server.Text = Starter.server ' l_server.Text = Starter.server
et_server.Text = server et_server.Text = server
Subs.panelVisible(p_appUpdate, 0, 0) Subs.panelVisible(p_appUpdate, 0, 0)

209
B4A/MAPA_RUTAS.bas
View File

@@ -125,81 +125,56 @@ Sub MapFragment1_Ready
'''''''----------------------------MARKER AZUL - POR ENTREGAR '''''''----------------------------MARKER AZUL - POR ENTREGAR
Private esteAzul As Int = 0 Private esteAzul As Int = 0
Private esteAzul2 As String Private esteAzul2 As String
If azul = 1 Or todos = 1 Then ' Try
c.IsInitialized If azul = 1 Or todos = 1 Then
c = Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LAT, CAT_CL_LONG, CAT_CL_RUTA from kmt_info where gestion = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA") c.IsInitialized
rutaAnt = "" c = Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LAT, CAT_CL_LONG, CAT_CL_RUTA from kmt_info where gestion = 0 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 and cat_cl_lat <> 'null' AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA")
For i = 0 To c.RowCount -1 rutaAnt = ""
c.Position = i For i = 0 To c.RowCount -1
LatitudRu = c.GetString("CAT_CL_LAT") c.Position = i
LongitudRU = c.GetString("CAT_CL_LONG") LatitudRu = c.GetString("CAT_CL_LAT")
CODIGO=c.GetString("CAT_CL_CODIGO") LongitudRU = c.GetString("CAT_CL_LONG")
Tienda= c.GetString("CAT_CL_NOMBRE") CODIGO=c.GetString("CAT_CL_CODIGO")
ruta = c.GetString("CAT_CL_RUTA") Tienda= c.GetString("CAT_CL_NOMBRE")
If c.GetString("SECUENCIA") = "null" Then ruta = c.GetString("CAT_CL_RUTA")
NumSerie = 0 If c.GetString("SECUENCIA") = "null" Then
Else NumSerie = 0
NumSerie = c.GetString("SECUENCIA") Else
End If NumSerie = c.GetString("SECUENCIA")
Private s As Cursor = Starter.skmt.ExecQuery($"select indice from waypoints where codigo = '${CODIGO}'"$) End If
If s.RowCount > 0 Then Private s As Cursor = Starter.skmt.ExecQuery($"select indice from waypoints where codigo = '${CODIGO}'"$)
s.Position = 0 If s.RowCount > 0 Then
NumSerie = s.GetString("indice") s.Position = 0
End If NumSerie = s.GetString("indice")
If rutaAnt <> ruta Then esteAzul = esteAzul + 1 End If
If rutaAnt <> ruta Then esteAzul = esteAzul + 1
' If esteAzul = 1 Then esteAzul2= NumSerie&"marker-azul.png" ' If esteAzul = 1 Then esteAzul2= NumSerie&"marker-azul.png"
' If esteAzul = 2 Then esteAzul2= NumSerie&"marker-azul1.png" ' If esteAzul = 2 Then esteAzul2= NumSerie&"marker-azul1.png"
' If esteAzul = 3 Then esteAzul2= NumSerie&"marker-azul2.png" ' If esteAzul = 3 Then esteAzul2= NumSerie&"marker-azul2.png"
' If esteAzul = 4 Then esteAzul2= NumSerie&"marker-azul3.png" ' If esteAzul = 4 Then esteAzul2= NumSerie&"marker-azul3.png"
' If esteAzul = 5 Then esteAzul2= NumSerie&"marker-azul4.png" ' If esteAzul = 5 Then esteAzul2= NumSerie&"marker-azul4.png"
If esteAzul = 1 Then esteAzul2= "marker-azul.png" If esteAzul = 1 Then esteAzul2= "marker-azul.png"
If esteAzul = 2 Then esteAzul2= "marker-azul1.png" If esteAzul = 2 Then esteAzul2= "marker-azul1.png"
If esteAzul = 3 Then esteAzul2= "marker-azul2.png" If esteAzul = 3 Then esteAzul2= "marker-azul2.png"
If esteAzul = 4 Then esteAzul2= "marker-azul3.png" If esteAzul = 4 Then esteAzul2= "marker-azul3.png"
If esteAzul = 5 Then esteAzul2= "marker-azul4.png" If esteAzul = 5 Then esteAzul2= "marker-azul4.png"
' MARK_VERDE = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO, Subs.CreateBitmapWithNumber(LoadBitmap(File.DirAssets, "marker-verde.png"), i+350)) ' MARK_VERDE = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO, Subs.CreateBitmapWithNumber(LoadBitmap(File.DirAssets, "marker-verde.png"), i+350))
' Log(ruta & "|" & esteAzul & "|" & esteAzul2) ' Log(ruta & "|" & esteAzul & "|" & esteAzul2)
' Log(NumSerie&" "& Tienda&" --------"& esteAzul2&" --------"&esteAzul) ' Log(NumSerie&" "& Tienda&" --------"& esteAzul2&" --------"&esteAzul)
MARK_AZUL = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO, Subs.CreateBitmapWithNumber(LoadBitmap(File.DirAssets, esteAzul2), NumSerie)) MARK_AZUL = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO, Subs.CreateBitmapWithNumber(LoadBitmap(File.DirAssets, esteAzul2), NumSerie))
MARK_AZUL.Snippet = "R: " & ruta & " - " & Tienda MARK_AZUL.Snippet = "R: " & ruta & " - " & Tienda
rutaAnt = ruta rutaAnt = ruta
Next Next
c .Close c .Close
If MARK_AZUL.IsInitialized Then LIST_AZUL.Add(MARK_AZUL) If MARK_AZUL.IsInitialized Then LIST_AZUL.Add(MARK_AZUL)
End If End If
'''''''----------------------------MARKER VERDE- ENTREGADO '''''''----------------------------MARKER VERDE- ENTREGADO
If verde = 1 Or todos = 1 Then
rutaAnt = ""
c2.IsInitialized
c2=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA from kmt_info where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA")
For i = 0 To c2.RowCount -1
c2.Position = i
LongitudRU = c2.GetString("CAT_CL_LONG")
LatitudRu = c2.GetString("CAT_CL_LAT")
CODIGO=c2.GetString("CAT_CL_CODIGO")
Tienda= c2.GetString("CAT_CL_NOMBRE")
ruta = c2.GetString("CAT_CL_RUTA")
If c2.GetString("SECUENCIA") = "null" Then
NumSerie = 0
Else
NumSerie = c2.GetString("SECUENCIA")
End If
Private s As Cursor = Starter.skmt.ExecQuery($"select indice from waypoints where codigo = '${CODIGO}'"$)
If s.RowCount > 0 Then
s.Position = 0
NumSerie = s.GetString("indice")
End If
MARK_VERDE = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO, Subs.CreateBitmapWithNumber(LoadBitmap(File.DirAssets, "marker-verde.png"), NumSerie))
' MARK_VERDE = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO,LoadBitmapResize(File.DirAssets, NumSerie&"marker-verde.png" ,72, 115, True))
MARK_VERDE.Snippet = "R:" & ruta & ", " & Tienda
Next
Else
If verde = 1 Or todos = 1 Then If verde = 1 Or todos = 1 Then
rutaAnt = "" rutaAnt = ""
c2.IsInitialized c2.IsInitialized
c2=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA from kmt_info where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA") c2=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA from kmt_info where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA")
For i = 0 To c2.RowCount -1 For i = 0 To c2.RowCount -1
c2.Position = i c2.Position = i
LongitudRU = c2.GetString("CAT_CL_LONG") LongitudRU = c2.GetString("CAT_CL_LONG")
@@ -207,61 +182,91 @@ Sub MapFragment1_Ready
CODIGO=c2.GetString("CAT_CL_CODIGO") CODIGO=c2.GetString("CAT_CL_CODIGO")
Tienda= c2.GetString("CAT_CL_NOMBRE") Tienda= c2.GetString("CAT_CL_NOMBRE")
ruta = c2.GetString("CAT_CL_RUTA") ruta = c2.GetString("CAT_CL_RUTA")
MARK_VERDE = gmap.AddMarker2(LatitudRu,LongitudRU, CODIGO,gmap.HUE_GREEN) If c2.GetString("SECUENCIA") = "null" Then
NumSerie = 0
Else
NumSerie = c2.GetString("SECUENCIA")
End If
Private s As Cursor = Starter.skmt.ExecQuery($"select indice from waypoints where codigo = '${CODIGO}'"$)
If s.RowCount > 0 Then
s.Position = 0
NumSerie = s.GetString("indice")
End If
MARK_VERDE = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO, Subs.CreateBitmapWithNumber(LoadBitmap(File.DirAssets, "marker-verde.png"), NumSerie))
' MARK_VERDE = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO,LoadBitmapResize(File.DirAssets, NumSerie&"marker-verde.png" ,72, 115, True))
MARK_VERDE.Snippet = "R:" & ruta & ", " & Tienda MARK_VERDE.Snippet = "R:" & ruta & ", " & Tienda
Next Next
c2 .Close Else
If MARK_VERDE.IsInitialized Then LIST_VERDE.Add(MARK_VERDE) If verde = 1 Or todos = 1 Then
rutaAnt = ""
c2.IsInitialized
c2=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA from kmt_info where gestion = 2 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA")
For i = 0 To c2.RowCount -1
c2.Position = i
LongitudRU = c2.GetString("CAT_CL_LONG")
LatitudRu = c2.GetString("CAT_CL_LAT")
CODIGO=c2.GetString("CAT_CL_CODIGO")
Tienda= c2.GetString("CAT_CL_NOMBRE")
ruta = c2.GetString("CAT_CL_RUTA")
MARK_VERDE = gmap.AddMarker2(LatitudRu,LongitudRU, CODIGO,gmap.HUE_GREEN)
MARK_VERDE.Snippet = "R:" & ruta & ", " & Tienda
Next
c2 .Close
If MARK_VERDE.IsInitialized Then LIST_VERDE.Add(MARK_VERDE)
End If
End If End If
End If
' '''''''----------------------------MARKER ROJO - NO ENTREGADO ' '''''''----------------------------MARKER ROJO - NO ENTREGADO
Private esteRojo As Int = 0 Private esteRojo As Int = 0
Private esteRojo2 As String Private esteRojo2 As String
If rojo = 1 Or todos = 1 Then If rojo = 1 Or todos = 1 Then
rutaAnt = ""
c3.IsInitialized
c3=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA from kmt_info where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA")
For i = 0 To c3.RowCount -1
c3.Position = i
LongitudRU = c3.GetDouble("CAT_CL_LONG")
LatitudRu = c3.GetDouble("CAT_CL_LAT")
Tienda= c3.GetString("CAT_CL_NOMBRE")
ruta = c3.GetString("CAT_CL_RUTA")
CODIGO=c3.GetString("CAT_CL_CODIGO")
If c3.GetString("SECUENCIA") = "null" Then
NumSerie = 0
Else
NumSerie = c3.GetString("SECUENCIA")
End If
Private s As Cursor = Starter.skmt.ExecQuery($"select indice from waypoints where codigo = '${CODIGO}'"$)
If s.RowCount > 0 Then
s.Position = 0
NumSerie = s.GetString("indice")
End If
MARK_ROJO = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO, Subs.CreateBitmapWithNumber(LoadBitmap(File.DirAssets, "marker-rojo.png"), NumSerie))
' MARK_ROJO = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO,LoadBitmapResize(File.DirAssets, NumSerie&"marker-rojo.png" ,72, 115, True))
MARK_ROJO.Snippet= "R:" & ruta & ", " & Tienda
Next
Else
If rojo = 1 Or todos = 1 Then
rutaAnt = "" rutaAnt = ""
c3.IsInitialized c3.IsInitialized
c3=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA from kmt_info where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA") c3=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, IFNULL(SECUENCIA,0) AS SECUENCIA, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA from kmt_info where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA")
For i = 0 To c3.RowCount -1 For i = 0 To c3.RowCount -1
c3.Position = i c3.Position = i
LongitudRU = c3.GetDouble("CAT_CL_LONG") LongitudRU = c3.GetDouble("CAT_CL_LONG")
LatitudRu = c3.GetDouble("CAT_CL_LAT") LatitudRu = c3.GetDouble("CAT_CL_LAT")
Tienda= c3.GetString("CAT_CL_NOMBRE") Tienda= c3.GetString("CAT_CL_NOMBRE")
ruta = c2.GetString("CAT_CL_RUTA") ruta = c3.GetString("CAT_CL_RUTA")
CODIGO=c3.GetString("CAT_CL_CODIGO") CODIGO=c3.GetString("CAT_CL_CODIGO")
MARK_ROJO = gmap.AddMarker2(LatitudRu,LongitudRU, CODIGO,gmap.HUE_RED) If c3.GetString("SECUENCIA") = "null" Then
NumSerie = 0
Else
NumSerie = c3.GetString("SECUENCIA")
End If
Private s As Cursor = Starter.skmt.ExecQuery($"select indice from waypoints where codigo = '${CODIGO}'"$)
If s.RowCount > 0 Then
s.Position = 0
NumSerie = s.GetString("indice")
End If
MARK_ROJO = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO, Subs.CreateBitmapWithNumber(LoadBitmap(File.DirAssets, "marker-rojo.png"), NumSerie))
' MARK_ROJO = gmap.AddMarker3(LatitudRu,LongitudRU,CODIGO,LoadBitmapResize(File.DirAssets, NumSerie&"marker-rojo.png" ,72, 115, True))
MARK_ROJO.Snippet= "R:" & ruta & ", " & Tienda MARK_ROJO.Snippet= "R:" & ruta & ", " & Tienda
Next Next
If MARK_ROJO.IsInitialized Then LIST_ROJO.Add(MARK_ROJO) Else
c3.Close If rojo = 1 Or todos = 1 Then
rutaAnt = ""
c3.IsInitialized
c3=Starter.skmt.ExecQuery("select CAT_CL_CODIGO, CAT_CL_NOMBRE, CAT_CL_LONG, CAT_CL_LAT, CAT_CL_RUTA from kmt_info where gestion = 3 and CAT_CL_LAT is not null and CAT_CL_LONG is not null and CAT_CL_LAT <> 0 and CAT_CL_LONG <> 0 AND CAT_CL_CODIGO <> 63403 order by CAT_CL_RUTA")
For i = 0 To c3.RowCount -1
c3.Position = i
LongitudRU = c3.GetDouble("CAT_CL_LONG")
LatitudRu = c3.GetDouble("CAT_CL_LAT")
Tienda= c3.GetString("CAT_CL_NOMBRE")
ruta = c2.GetString("CAT_CL_RUTA")
CODIGO=c3.GetString("CAT_CL_CODIGO")
MARK_ROJO = gmap.AddMarker2(LatitudRu,LongitudRU, CODIGO,gmap.HUE_RED)
MARK_ROJO.Snippet= "R:" & ruta & ", " & Tienda
Next
If MARK_ROJO.IsInitialized Then LIST_ROJO.Add(MARK_ROJO)
c3.Close
End If
End If End If
End If ' Catch
' Log(LastException)
' End Try
''------------------------------ ''------------------------------
' MARK_CEDIS = gmap.AddMarker3("19.3961802","-99.0784293","CEDIS", LoadBitmap(File.DirAssets, "marker-azul-0.png")) ' MARK_CEDIS = gmap.AddMarker3("19.3961802","-99.0784293","CEDIS", LoadBitmap(File.DirAssets, "marker-azul-0.png"))
' If MARK_VERDE.Visible Or MARK_ROJO.Visible Then ' If MARK_VERDE.Visible Or MARK_ROJO.Visible Then

2
B4A/Mariana_Reparto.b4a
View File

@@ -214,7 +214,7 @@ Version=12.8
#Region Project Attributes #Region Project Attributes
#ApplicationLabel: MARIANA Reparto #ApplicationLabel: MARIANA Reparto
#VersionCode: 1 #VersionCode: 1
#VersionName: 5.03.10 #VersionName: 5.06.06
'SupportedOrientations possible values: unspecified, landscape or portrait. 'SupportedOrientations possible values: unspecified, landscape or portrait.
#SupportedOrientations: portrait #SupportedOrientations: portrait
#CanInstallToExternalStorage: False #CanInstallToExternalStorage: False

4
B4A/Mariana_Reparto.b4a.meta
View File

@@ -91,6 +91,6 @@ ModuleClosedNodes6=
ModuleClosedNodes7= ModuleClosedNodes7=
ModuleClosedNodes8= ModuleClosedNodes8=
ModuleClosedNodes9=8,9 ModuleClosedNodes9=8,9
NavigationStack=C_Cheklist,Class_Globals,0,0,C_Cheklist,ImageView1_Click,360,0,C_Cheklist,StopCamera2,358,0,C_Cheklist,b_foto_Click,350,0,C_Cheklist,Camera1_PictureTaken,332,0,C_Cheklist,Camera1_Ready,233,0,C_Cheklist,B4XPage_CloseRequest,209,0,C_Cheklist,InitializeCamera2,211,0,C_Cheklist,ImageView4_Click,387,0,C_Cheklist,b_guardar_Click,541,0,C_Cheklist,cb_deratras_SelectedIndexChanged,536,0 NavigationStack=Diseñador Visual,login.bal,-100,1,B4XMainPage,b_server_Click,579,0,B4XMainPage,b_apk_Click,576,0,B4XMainPage,JobDone,479,0,B4XMainPage,B4XPage_Created,222,6,C_Principal,JobDone,1762,0,C_Principal,B4XPage_Appear,234,0,MAPA_RUTAS,Activity_KeyPress,356,0,B4XMainPage,i_engrane_Click,528,1,MAPA_RUTAS,MapFragment1_Ready,259,4
SelectedBuild=0 SelectedBuild=0
VisibleModules=1,2,3,4,5,6,7,8,9,10 VisibleModules=28,2,3,4,5,6,7,8,9,10,21,27,16