diff --git a/B4A/NUEVO_TORRADO.b4a b/B4A/NUEVO_TORRADO.b4a index 429d860..51173be 100644 --- a/B4A/NUEVO_TORRADO.b4a +++ b/B4A/NUEVO_TORRADO.b4a @@ -64,7 +64,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~'End of default text.~\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~'/////////////////////// 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~ +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~'End of default text.~\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~'/////////////////////// 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~ Module1=appUpdater Module10=Subs Module11=Tracker @@ -86,7 +86,7 @@ Version=12.5 #AdditionalJar: com.google.android.gms:play-services-location #ApplicationLabel: Nuevo Torrado #VersionCode: 1 - #VersionName: 3.10.04 + #VersionName: 3.11.07 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/NUEVO_TORRADO.b4a.meta b/B4A/NUEVO_TORRADO.b4a.meta index 63bee89..8efee8b 100644 --- a/B4A/NUEVO_TORRADO.b4a.meta +++ b/B4A/NUEVO_TORRADO.b4a.meta @@ -34,6 +34,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=C_principal,Class_Globals,0,0,c_datos,Class_Globals,0,0,c_datos,ImageView1_Click,1437,2,c_datos,B4XPage_Appear,257,0,c_datos,Camera1_PictureTaken,1416,6,c_datos,b_foto_Click,1427,0,c_datos,StopCamera2,1430,0,c_datos,B4XPage_CloseRequest,1743,0,c_datos,InitializeCamera2,1241,0,c_datos,cb_socioeconomico_SelectedIndexChanged,1240,0 +NavigationStack=Starter,Service_Start,37,0,Subs,revisaBD,23,4,B4XMainPage,b_enviarbd_Click,210,1,C_UpdateAvailable,Class_Globals,0,0,c_datos,Class_Globals,0,0,c_datos,Camera1_PictureTaken,1338,0,Tracker,flp_LocationChanged,172,0,c_datos,b_guardar_Click,1522,6,Starter,Process_Globals,10,2,B4XMainPage,ImageView5_Click,165,0,B4XMainPage,JobDone,148,0 SelectedBuild=0 VisibleModules=9,1,2,4,3,5,6,7,8,10 diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 3779547..2d0ebb1 100644 --- a/B4A/Starter.bas +++ b/B4A/Starter.bas @@ -14,7 +14,7 @@ Sub Process_Globals 'These variables can be accessed from all modules. Public rp As RuntimePermissions Dim reqManager As DBRequestManager - Dim DBReqServer As String = "http://keymon.lat:1781" '"http://keymon.lat:1781" "http://11.0.0.134:1782" ' CAMBIAR HACIA AFUERA O DENTRO DE LA OFNA + Dim DBReqServer As String = "http://keymon.lat:1783" '"http://keymon.lat:1781" "http://11.0.0.134:1782" ' CAMBIAR HACIA AFUERA O DENTRO DE LA OFNA ' Dim server As String = "http://10.0.0.205:1782" Dim rutaBD As String = File.DirInternal Dim skmt As SQL diff --git a/B4A/Subs.bas b/B4A/Subs.bas index 360e391..0b1be9a 100644 --- a/B4A/Subs.bas +++ b/B4A/Subs.bas @@ -13,6 +13,7 @@ End Sub 'Revisa que exista la BD y si es necesario crea algunas tablas dentro de ella Sub revisaBD 'ignore + Log(Starter.rutaBD) If Not(File.Exists(Starter.rutaBD, "kmt.db")) Then File.Copy(File.DirAssets, "kmt.db", Starter.rutaBD, "kmt.db") If Not(Starter.skmt.IsInitialized) Then Starter.skmt.Initialize(Starter.rutaBD, "kmt.db", True) diff --git a/B4A/appUpdater.bas b/B4A/appUpdater.bas index 8897807..a42ef2a 100644 --- a/B4A/appUpdater.bas +++ b/B4A/appUpdater.bas @@ -242,8 +242,8 @@ Sub fileProvider_init Dim p As Phone If p.SdkVersion >= 24 Or File.ExternalWritable = False Then UseFileProvider = True - SharedFolder = File.Combine(File.DirInternal, "shared") - If Not(File.IsDirectory(File.DirInternal,"shared")) Then + SharedFolder = File.Combine(File.DirRootExternal, "shared") + If Not(File.IsDirectory(File.DirRootExternal,"shared")) Then File.MakeDir("", SharedFolder) End If Else diff --git a/B4A/c_datos.bas b/B4A/c_datos.bas index e61c772..5930f9d 100644 --- a/B4A/c_datos.bas +++ b/B4A/c_datos.bas @@ -240,6 +240,18 @@ Private Sub B4XPage_Created (Root1 As B4XView) End If End If + Log("------------------------------------- INICIO") + Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE) + Log("------------------------------------- AQUI ANDO") + Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean) + Log("------------------------------------- SI PASE") + If Result Then + Log("con permisos para escritura") + Else + Log("------------------------------------- NO PASE") + ToastMessageShow("No permission almacenamiento externo!!!", True) + End If + Log("------------------------------------- terminado") End Sub Private Sub B4XPage_Appear @@ -390,9 +402,17 @@ Private Sub B4XPage_Appear Else If l.GetString("CUENTA") > 0 Then - - m = Starter.skmt.ExecQuery2("SELECT * FROM HIST_VISITA WHERE CREDITO = ? AND ESTATUS = 1 OR ESTATUS = 0",Array As String(cuenta)) + + + m = Starter.skmt.ExecQuery2("SELECT * FROM HIST_VISITA WHERE CREDITO = ? AND (ESTATUS = 1 OR ESTATUS = 0)",Array As String(cuenta)) m.Position = 0 + Log(m.GetString("FOTOUNO")) + LogColor(nombrefoto, Colors.Red) + nombrefoto = m.GetString("FOTOUNO") + nombrefoto1 = m.GetString("FOTODOS") + nombrefoto2 = m.GetString("FOTOTRES") + nombrefoto3 = m.GetString("FOTOCUATRO") + LogColor(nombrefoto, Colors.Blue) Log(cuenta) e = Starter.skmt.ExecQuery("SELECT PARENTESCO, NUMERO, NUME FROM CAT_PARENTESCO order by 3") Dim Items2 As List @@ -605,9 +625,11 @@ Private Sub B4XPage_Appear If m.GetString("FOTOUNO") = "0" Then ImageView1.Bitmap = LoadBitmap(File.DirAssets,"icon_22-[convertido].png") + Log("NO CARGUE FOTO") Else ImageView1.Bitmap = LoadBitmap(File.DirRootExternal & Dir & Dir2,m.GetString("FOTOUNO")) nombrefoto = m.GetString("FOTOUNO") + Log("CARGUE FOTO "& m.GetString("FOTOUNO")) End If If m.GetString("FOTODOS") = "0" Then @@ -679,7 +701,7 @@ Sub WobbleMenu1_Tab3Click ' frontCamera = camEx2.Front ' Log("inicializamos Camara") Else - ToastMessageShow("No permission!!!", True) + ToastMessageShow("No permission camara!!!", True) End If Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE) @@ -687,7 +709,7 @@ Sub WobbleMenu1_Tab3Click If Result Then Log("con permisos para escritura") Else - ToastMessageShow("No permission!!!", True) + ToastMessageShow("No permission almacenamiento externo!!!", True) End If Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_READ_EXTERNAL_STORAGE) @@ -695,7 +717,7 @@ Sub WobbleMenu1_Tab3Click If Result Then Log("con permisos para escritura") Else - ToastMessageShow("No permission!!!", True) + ToastMessageShow("No permission lectura!!!", True) End If p_w1.Visible = False @@ -1253,14 +1275,14 @@ Private Sub InitializeCamera2 frontCamera = camEx2.Front Log("inicializamos Camara") Else - ToastMessageShow("No permission!!!", True) + ToastMessageShow("No permission camara!!!", True) End If Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_WRITE_EXTERNAL_STORAGE) Wait For B4XPage_PermissionResult (Permission As String, Result As Boolean) If Result Then Log("conpermisos para escritura") Else - ToastMessageShow("No permission!!!", True) + ToastMessageShow("No permission escritura!!!", True) End If Starter.rp.CheckAndRequest(Starter.rp.PERMISSION_READ_EXTERNAL_STORAGE) @@ -1268,7 +1290,7 @@ Private Sub InitializeCamera2 If Result Then Log("conpermisos para escritura") Else - ToastMessageShow("No permission!!!", True) + ToastMessageShow("No permission lectura!!!", True) End If End Sub @@ -1504,7 +1526,7 @@ Private Sub b_guardar_Click j.Position = 0 End If - DateTime.DateFormat = "dd/MM/yyyy" + DateTime.DateFormat = "MM/dd/yyyy" DateTime.TimeFormat = "HH:mm:ss" Dim fecha_captura As String = DateTime.Date(DateTime.Now) Dim hora_captura As String = DateTime.Time(DateTime.Now) @@ -1560,7 +1582,7 @@ Private Sub b_guardar_Click j = Starter.skmt.ExecQuery2("SELECT CO_RESULTADO FROM CAT_RESULTADO_IL WHERE CO_RDESCRIPCION = ?",Array As String(cb_resultado.SelectedItem)) j.Position = 0 End If - DateTime.DateFormat = "dd/MM/yyyy" + DateTime.DateFormat = "MM/dd/yyyy" DateTime.TimeFormat = "HH:mm:ss" Dim fecha_captura As String = DateTime.Date(DateTime.Now) Dim hora_captura As String = DateTime.Time(DateTime.Now) @@ -1620,7 +1642,7 @@ Private Sub b_guardar_Click j = Starter.skmt.ExecQuery2("SELECT CO_RESULTADO FROM CAT_RESULTADO_IL WHERE CO_RDESCRIPCION = ?",Array As String(cb_resultado.SelectedItem)) j.Position = 0 End If - DateTime.DateFormat = "dd/MM/yyyy" + DateTime.DateFormat = "MM/dd/yyyy" DateTime.TimeFormat = "HH:mm:ss" Dim fecha_captura As String = DateTime.Date(DateTime.Now) Dim hora_captura As String = DateTime.Time(DateTime.Now) @@ -1680,7 +1702,7 @@ Private Sub b_guardar_Click j = Starter.skmt.ExecQuery2("SELECT CO_RESULTADO FROM CAT_RESULTADO_IL WHERE CO_RDESCRIPCION = ?",Array As String(cb_resultado.SelectedItem)) j.Position = 0 End If - DateTime.DateFormat = "dd/MM/yyyy" + DateTime.DateFormat = "MM/dd/yyyy" DateTime.TimeFormat = "HH:mm:ss" Dim fecha_captura As String = DateTime.Date(DateTime.Now) Dim hora_captura As String = DateTime.Time(DateTime.Now) diff --git a/B4XMainPage.bas b/B4XMainPage.bas index 54e772a..b97bdff 100644 --- a/B4XMainPage.bas +++ b/B4XMainPage.bas @@ -169,8 +169,8 @@ End Sub Private Sub ImageView5_Click p_configuracion.Visible = True lv_server.Clear - lv_server.AddSingleLine("http://keymon.lat:1781") - If Usuario.Text = "KMTS1" Then lv_server.AddSingleLine("http://11.0.0.134:1782") + lv_server.AddSingleLine("http://keymon.lat:1783") + If Usuario.Text = "KMTS1" Then lv_server.AddSingleLine("http://11.0.0.134:1783") ' l_server.Text = Starter.server et_server.Text = Starter.DBReqServer l_version.Visible = False