diff --git a/B4A/AREstrategias.b4a b/B4A/AREstrategias.b4a index 8cd3141..dcae4a4 100644 --- a/B4A/AREstrategias.b4a +++ b/B4A/AREstrategias.b4a @@ -60,7 +60,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~AddPermission("android.permission.MANAGE_EXTERNAL_STORAGE") Module1=appUpdater Module10=Subs Module11=Tracker @@ -82,7 +82,7 @@ Version=12.5 #AdditionalJar: com.google.android.gms:play-services-location #ApplicationLabel: AREstrategicas #VersionCode: 1 - #VersionName: 3.06.15 + #VersionName: 3.10.09 'SupportedOrientations possible values: unspecified, landscape or portrait. #SupportedOrientations: portrait #CanInstallToExternalStorage: False diff --git a/B4A/AREstrategias.b4a.meta b/B4A/AREstrategias.b4a.meta index 99401ed..eadda53 100644 --- a/B4A/AREstrategias.b4a.meta +++ b/B4A/AREstrategias.b4a.meta @@ -34,6 +34,6 @@ ModuleClosedNodes6= ModuleClosedNodes7= ModuleClosedNodes8= ModuleClosedNodes9= -NavigationStack=c_datos,b_guardar_Click,2082,0,c_datos,B4XPage_Appear,423,0,B4XMainPage,b_actualizar_app_Click,218,0,appUpdater,Process_Globals,80,0,c_datos,Camera1_PictureTaken,1754,0,c_datos,ImageView1_Click,1869,0,c_datos,ImageView4_Click,1869,0,c_datos,Class_Globals,129,4,c_datos,B4XPage_Created,186,0,c_datos,B4XPage_CloseRequest,2182,1,c_datos,GPS_LocationChanged,2170,0 +NavigationStack=CameraExClass2,Camera_Ready,94,0,CameraExClass2,FindCamera,32,0,c_datos,Class_Globals,102,0,c_datos,cb_socioeconomico_SelectedIndexChanged,1640,0,c_datos,ImageView4_Click,1868,0,c_datos,ImageView1_Click,1838,0,c_datos,WobbleMenu1_Tab3Click,813,0,c_datos,InitializeCamera2,1643,0,c_datos,cb_vivienda_SelectedIndexChanged,1623,0,Main,Globals,25,0 SelectedBuild=0 VisibleModules=9,2,4,3,10,7,6,11,1,5 diff --git a/B4A/C_principal.bas b/B4A/C_principal.bas index 46fc580..506f11d 100644 --- a/B4A/C_principal.bas +++ b/B4A/C_principal.bas @@ -507,6 +507,19 @@ Sub JobDone(Job As HttpJob) Next End If + + Dim resultado As DBResult = reqManager.HandleJob(Job) + If resultado.Tag.As(String).IndexOf("ins_ENUEVOSPendientes_head_") > -1 Then + Private cliente As String= resultado.Tag + cliente = cliente.SubString(cliente.IndexOf("_")+24) + Log($"Cliente1:${cliente}"$) + Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ENVIADO = ? WHERE CREDITO = ?", Array As String("1",cliente)) + For Each records() As Object In resultado.Rows + For Each k As String In resultado.Columns.Keys + Log(resultado.Tag & ": " & k & ": " & records(resultado.Columns.Get(k))) + Next + Next + End If End If @@ -544,8 +557,8 @@ Private Sub b_enviar_Click cmd.Initialize cmd.Name = "insert_gestion_AR" cmd.Parameters = Array As Object(c.GetString("CREDITO"), c.GetString("PRODUCTO"), c.GetString("VISITADOR"), c.GetString("RESULTADO"), c.GetString("CODIGO_RES"), c.GetString("PARENTESCO"), c.GetString("COMENTARIOS"), c.GetString("FECHA"), c.GetString("LONGITUD"), c.GetString("LATUTUD"), c.GetString("FECHACAPTURA"), c.GetString("AGENCIA"), c.GetString("FECHA_PROMESA"), c.GetString("MONTO_PROMESA"), c.GetString("TIPO_DOMICILIO"), c.GetString("NIVEL_SOCIO"), c.GetString("CARACTERISTICAS"), c.GetString("NIVELES"), foto1, foto2, foto3, foto4, c.GetString("NOMBRE_ATIENDE"), c.GetString("CODIGO_ACCION"), c.GetString("ACCION"), c.GetString("DIAS_ACCION"), c.GetString("PUNTOS_REF")) - B4XPages.MainPage.reqManager.ExecuteCommand(cmd, "insert_gestion_AREstrategicas") - Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ENVIADO = ? WHERE CREDITO = ?", Array As String("1",c.GetString("CREDITO"))) + reqManager.ExecuteCommand(cmd , $"ins_ENUEVOSPendientes_head_${c.GetString("CREDITO")}"$) + Next MsgboxAsync("Datos enviados.","") c.Close diff --git a/B4A/CameraExClass2.bas b/B4A/CameraExClass2.bas index bc84bf4..cf3a43e 100644 --- a/B4A/CameraExClass2.bas +++ b/B4A/CameraExClass2.bas @@ -51,7 +51,7 @@ Private Sub FindCamera (frontCamera As Boolean) As CameraInfoAndId Array As String("java.lang.int", "android.hardware.Camera$CameraInfo")) r.target = cameraInfo Log("facing: " & r.GetField("facing") & ", " & cameraValue) - If r.GetField("facing") = cameraValue Then + If r.GetField("facing") = cameraValue Then ci.cameraInfo = r.target ci.Id = i Return ci @@ -144,8 +144,8 @@ End Sub Public Sub CommitParameters 'Try - r.target = nativeCam - r.RunMethod4("setParameters", Array As Object(parameters), Array As String("android.hardware.Camera$Parameters")) + r.target = nativeCam + r.RunMethod4("setParameters", Array As Object(parameters), Array As String("android.hardware.Camera$Parameters")) 'Catch ' ToastMessageShow("Error setting parameters.", True) ' Log(LastException) @@ -277,24 +277,24 @@ Public Sub PreviewImageToJpeg(data() As Byte, quality As Int) As Byte() End Sub Public Sub GetSupportedFocusModes As List - r.target = parameters - Return r.RunMethod("getSupportedFocusModes") + r.target = parameters + Return r.RunMethod("getSupportedFocusModes") End Sub Public Sub SetContinuousAutoFocus - Dim modes As List = GetSupportedFocusModes - If modes.IndexOf("continuous-picture") > -1 Then - SetFocusMode("continuous-picture") - Else If modes.IndexOf("continuous-video") > -1 Then - SetFocusMode("continuous-video") - Else - Log("Continuous focus mode is not available") - End If + Dim modes As List = GetSupportedFocusModes + If modes.IndexOf("continuous-picture") > -1 Then + SetFocusMode("continuous-picture") + Else If modes.IndexOf("continuous-video") > -1 Then + SetFocusMode("continuous-video") + Else + Log("Continuous focus mode is not available") + End If End Sub Public Sub SetFocusMode(Mode As String) - r.target = parameters - r.RunMethod2("setFocusMode", Mode, "java.lang.String") + r.target = parameters + r.RunMethod2("setFocusMode", Mode, "java.lang.String") End Sub Public Sub GetFocusDistances As Float() @@ -306,7 +306,7 @@ End Sub Public Sub GetSupportedPictureFormats As List r.target = parameters - Return r.RunMethod("getSupportedPictureFormats") + Return r.RunMethod("getSupportedPictureFormats") End Sub 'This method should only be called if you need to immediately release the camera. 'For example if you need to start another application that depends on the camera. @@ -330,23 +330,23 @@ Private Sub Camera_FocusDone (Success As Boolean) End Sub Public Sub IsZoomSupported As Boolean - r.target = parameters - Return r.RunMethod("isZoomSupported") + r.target = parameters + Return r.RunMethod("isZoomSupported") End Sub Public Sub GetMaxZoom As Int - r.target = parameters - Return r.RunMethod("getMaxZoom") + r.target = parameters + Return r.RunMethod("getMaxZoom") End Sub Public Sub getZoom() As Int - r.target = parameters - Return r.RunMethod("getZoom") + r.target = parameters + Return r.RunMethod("getZoom") End Sub Public Sub setZoom(ZoomValue As Int) - r.target = parameters - r.RunMethod2("setZoom", ZoomValue, "java.lang.int") + r.target = parameters + r.RunMethod2("setZoom", ZoomValue, "java.lang.int") End Sub Public Sub getExposureCompensation As Int diff --git a/B4A/Files/mainpage.bal b/B4A/Files/mainpage.bal index 23e131b..70535cb 100644 Binary files a/B4A/Files/mainpage.bal and b/B4A/Files/mainpage.bal differ diff --git a/B4A/Starter.bas b/B4A/Starter.bas index 2c148fc..919713b 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:1788" '"http://keymon.lat:1788" "http://11.0.0.196:1782" "http://keymon.lat:1783" "http://11.0.0.48:1783" ""' CAMBIAR HACIA AFUERA O DENTRO DE LA OFNA + Dim DBReqServer As String = "http://keymon.lat:1781" '"http://keymon.lat:1788" "http://11.0.0.196:1782" "http://keymon.lat:1783" "http://11.0.0.48:1783" ""' 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/c_datos.bas b/B4A/c_datos.bas index 4c1d93f..29a8a9c 100644 --- a/B4A/c_datos.bas +++ b/B4A/c_datos.bas @@ -34,7 +34,7 @@ Sub Class_Globals Dim cuenta As String Dim device As Phone Dim MES1 As ManageExternalStorage - + Dim x As Int = 0 'Datos generales Private l_nombreg As Label Private l_rfc As Label @@ -268,6 +268,15 @@ Private Sub B4XPage_Appear p_resultado.Height = Root.Height cuenta = B4XPages.MainPage.principal.lb.Text Log (cuenta) + ImageView1.Bitmap = LoadBitmap(File.DirAssets,"icon_22-[convertido].png") + ImageView2.Bitmap = LoadBitmap(File.DirAssets,"icon_22-[convertido].png") + ImageView3.Bitmap = LoadBitmap(File.DirAssets,"icon_22-[convertido].png") + ImageView4.Bitmap = LoadBitmap(File.DirAssets,"icon_22-[convertido].png") + nombrefoto = "0" + nombrefoto1 = "0" + nombrefoto2 = "0" + nombrefoto3 = "0" + x = 0 c = Starter.skmt.ExecQuery2("SELECT NOMBRE, RFC, CURP, CALLE, N_EXT, N_INT, ALCALDIA, MUNICIPIO, ENTIDAD, CP, SEXO, FECHA_NACIMIENTO, EDAD, EMAIL from HIST_DATOS_GENERALES WHERE CREDITO = ?" , Array As String (cuenta)) c.Position = 0 @@ -1619,7 +1628,7 @@ Private Sub cb_vivienda_SelectedIndexChanged (Index As Int) End If c.Close Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET TIPO_DOMICILIO = ? WHERE CREDITO = ? AND ESTATUS = 1", Array As String(cb_vivienda.SelectedItem, cuenta)) -End Sub + End Sub Private Sub cb_socioeconomico_SelectedIndexChanged (Index As Int) Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ESTATUS = ? WHERE CREDITO = ? AND ESTATUS <> 2", Array As String("1", cuenta)) @@ -1679,14 +1688,80 @@ Sub Camera1_Ready (Success As Boolean) End Sub Sub Camera1_PictureTaken (Data()As Byte) + If x = 1 Then + DateTime.DateFormat="ddMMyyyyHHmmss" + nombrefoto = DateTime.Now & "_FOTO1.jpg" + teclado.HideKeyboard + fototomada = nombrefoto + Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ESTATUS = ? WHERE CREDITO = ? AND ESTATUS <> 2", Array As String("1", cuenta)) + c = Starter.skmt.ExecQuery2("SELECT ESTATUS2 FROM HIST_DATOS_GENERALES WHERE CREDITO = ?",Array As String(cuenta)) + c.Position = 0 + If c.GetString("ESTATUS2") = 2 Then + + Else + Starter.skmt.ExecNonQuery2("UPDATE HIST_DATOS_GENERALES SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) + Starter.skmt.ExecNonQuery2("UPDATE HIST_FINANCIEROS SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) + End If + c.Close + Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET FOTOUNO = ? WHERE CREDITO = ? AND ESTATUS = 1", Array As String(nombrefoto, cuenta)) + Else If x = 2 Then + DateTime.DateFormat="ddMMyyyyHHmmss" + nombrefoto1 = DateTime.Now & "_FOTO2.jpg" + teclado.HideKeyboard + fototomada = nombrefoto1 + Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ESTATUS = ? WHERE CREDITO = ? AND ESTATUS <> 2", Array As String("1", cuenta)) + c = Starter.skmt.ExecQuery2("SELECT ESTATUS2 FROM HIST_DATOS_GENERALES WHERE CREDITO = ?",Array As String(cuenta)) + c.Position = 0 + If c.GetString("ESTATUS2") = 2 Then + + Else + Starter.skmt.ExecNonQuery2("UPDATE HIST_DATOS_GENERALES SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) + Starter.skmt.ExecNonQuery2("UPDATE HIST_FINANCIEROS SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) + End If + c.Close + Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET FOTODOS = ? WHERE CREDITO = ? AND ESTATUS = 1", Array As String(nombrefoto1, cuenta)) + Else If x = 3 Then + DateTime.DateFormat="ddMMyyyyHHmmss" + nombrefoto2 = DateTime.Now & "_FOTO3.jpg" + teclado.HideKeyboard + fototomada = nombrefoto2 + Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ESTATUS = ? WHERE CREDITO = ? AND ESTATUS <> 2", Array As String("1", cuenta)) + c = Starter.skmt.ExecQuery2("SELECT ESTATUS2 FROM HIST_DATOS_GENERALES WHERE CREDITO = ?",Array As String(cuenta)) + c.Position = 0 + If c.GetString("ESTATUS2") = 2 Then + + Else + Starter.skmt.ExecNonQuery2("UPDATE HIST_DATOS_GENERALES SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) + Starter.skmt.ExecNonQuery2("UPDATE HIST_FINANCIEROS SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) + End If + c.Close + Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET FOTOTRES = ? WHERE CREDITO = ? AND ESTATUS = 1", Array As String(nombrefoto2, cuenta)) + Else If x = 4 Then + DateTime.DateFormat="ddMMyyyyHHmmss" + nombrefoto3 = DateTime.Now & "_FOTO4.jpg" + teclado.HideKeyboard + fototomada = nombrefoto3 + Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ESTATUS = ? WHERE CREDITO = ? AND ESTATUS <> 2", Array As String("1", cuenta)) + c = Starter.skmt.ExecQuery2("SELECT ESTATUS2 FROM HIST_DATOS_GENERALES WHERE CREDITO = ?",Array As String(cuenta)) + c.Position = 0 + If c.GetString("ESTATUS2") = 2 Then + + Else + Starter.skmt.ExecNonQuery2("UPDATE HIST_DATOS_GENERALES SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) + Starter.skmt.ExecNonQuery2("UPDATE HIST_FINANCIEROS SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) + End If + c.Close + c.Close + Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET FOTOCUATRO = ? WHERE CREDITO = ? AND ESTATUS = 1", Array As String(nombrefoto3, cuenta)) + End If Log("tome foto") Dim filename As String = fototomada Dim Dirp As String = File.DirRootExternal Dim Dir As String Dim Dir2 As String Try - File.MakeDir(Dirp,"/Arestrategicas") - Dir = "/Arestrategicas" + File.MakeDir(Dirp,"/nuevotorrado") + Dir = "/nuevotorrado" Log("creado en promotoria " & Dirp & Dir) Catch Dir = "" @@ -1702,14 +1777,19 @@ Sub Camera1_PictureTaken (Data()As Byte) Log("creado en raiz") End Try + camEx2.SavePictureToFile(Data, Dirp&Dir, filename) camEx2.StartPreview 'restart preview - ToastMessageShow("Picture saved." & CRLF & "File size: " & File.Size(Dir, filename) & Dir &"," & filename, True) +' ToastMessageShow("Picture saved." & CRLF & "File size: " & File.Size(Dir, filename) & Dir &"," & filename, True) Log("Picture saved." & CRLF & "File size: " & File.Size(Dir, filename) & Dir &"," & filename) p_camara.Visible = False + Log(nombrefoto) + Log(nombrefoto1) + Log(nombrefoto2) + Log(nombrefoto3) - If nombrefoto <> 0 Then + If nombrefoto <> "0" Then Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirRootExternal & Dir, filename, 300, 450, True) Dim out As OutputStream = File.OpenOutput(File.DirRootExternal & Dir & Dir2, filename, True) img.WriteToStream(out, 100, "PNG") @@ -1717,7 +1797,7 @@ Sub Camera1_PictureTaken (Data()As Byte) ImageView1.Bitmap = LoadBitmap(File.DirRootExternal & Dir & Dir2,nombrefoto) End If - If nombrefoto1 <> 0 Then + If nombrefoto1 <> "0" Then Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirRootExternal & Dir, filename, 300, 450, True) Dim out As OutputStream = File.OpenOutput(File.DirRootExternal & Dir & Dir2, filename, False) img.WriteToStream(out, 100, "PNG") @@ -1725,7 +1805,7 @@ Sub Camera1_PictureTaken (Data()As Byte) ImageView2.Bitmap = LoadBitmap(File.DirRootExternal & Dir& Dir2,nombrefoto1) End If - If nombrefoto2 <> 0 Then + If nombrefoto2 <> "0" Then Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirRootExternal & Dir, filename, 300, 450, True) Dim out As OutputStream = File.OpenOutput(File.DirRootExternal & Dir & Dir2, filename, False) img.WriteToStream(out, 100, "PNG") @@ -1733,7 +1813,7 @@ Sub Camera1_PictureTaken (Data()As Byte) ImageView3.Bitmap = LoadBitmap(File.DirRootExternal & Dir& Dir2,nombrefoto2) End If - If nombrefoto3 <> 0 Then + If nombrefoto3 <> "0" Then Dim img As B4XBitmap = xui.LoadBitmapResize(File.DirRootExternal & Dir, filename, 300, 450, True) Dim out As OutputStream = File.OpenOutput(File.DirRootExternal & Dir & Dir2, filename, False) img.WriteToStream(out, 100, "PNG") @@ -1763,88 +1843,35 @@ Private Sub StopCamera2 End Sub Private Sub ImageView1_Click -' foto = 2 - DateTime.DateFormat="ddMMyyyyHHmmss" + + x = 1 InitializeCamera2 p_camara.Visible = True - nombrefoto = DateTime.Now & "_FOTO1.jpg" - teclado.HideKeyboard - fototomada = nombrefoto - Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ESTATUS = ? WHERE CREDITO = ? AND ESTATUS <> 2", Array As String("1", cuenta)) - c = Starter.skmt.ExecQuery2("SELECT ESTATUS2 FROM HIST_DATOS_GENERALES WHERE CREDITO = ?",Array As String(cuenta)) - c.Position = 0 - If c.GetString("ESTATUS2") = 2 Then - - Else - Starter.skmt.ExecNonQuery2("UPDATE HIST_DATOS_GENERALES SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) - Starter.skmt.ExecNonQuery2("UPDATE HIST_FINANCIEROS SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) - End If - c.Close - Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET FOTOUNO = ? WHERE CREDITO = ? AND ESTATUS = 1", Array As String(nombrefoto, cuenta)) + End Sub Private Sub ImageView2_Click -' foto = 2 - DateTime.DateFormat="ddMMyyyyHHmmss" + + x = 2 InitializeCamera2 p_camara.Visible = True - nombrefoto1 = DateTime.Now & "_FOTO2.jpg" - teclado.HideKeyboard - fototomada = nombrefoto1 - Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ESTATUS = ? WHERE CREDITO = ? AND ESTATUS <> 2", Array As String("1", cuenta)) - c = Starter.skmt.ExecQuery2("SELECT ESTATUS2 FROM HIST_DATOS_GENERALES WHERE CREDITO = ?",Array As String(cuenta)) - c.Position = 0 - If c.GetString("ESTATUS2") = 2 Then - - Else - Starter.skmt.ExecNonQuery2("UPDATE HIST_DATOS_GENERALES SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) - Starter.skmt.ExecNonQuery2("UPDATE HIST_FINANCIEROS SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) - End If - c.Close - Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET FOTODOS = ? WHERE CREDITO = ? AND ESTATUS = 1", Array As String(nombrefoto1, cuenta)) + End Sub Private Sub ImageView3_Click -' foto = 2 - DateTime.DateFormat="ddMMyyyyHHmmss" + + x = 3 InitializeCamera2 p_camara.Visible = True - nombrefoto2 = DateTime.Now & "_FOTO3.jpg" - teclado.HideKeyboard - fototomada = nombrefoto2 - Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ESTATUS = ? WHERE CREDITO = ? AND ESTATUS <> 2", Array As String("1", cuenta)) - c = Starter.skmt.ExecQuery2("SELECT ESTATUS2 FROM HIST_DATOS_GENERALES WHERE CREDITO = ?",Array As String(cuenta)) - c.Position = 0 - If c.GetString("ESTATUS2") = 2 Then - - Else - Starter.skmt.ExecNonQuery2("UPDATE HIST_DATOS_GENERALES SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) - Starter.skmt.ExecNonQuery2("UPDATE HIST_FINANCIEROS SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) - End If - c.Close - Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET FOTOTRES = ? WHERE CREDITO = ? AND ESTATUS = 1", Array As String(nombrefoto2, cuenta)) + End Sub Private Sub ImageView4_Click -' foto = 2 - DateTime.DateFormat="ddMMyyyyHHmmss" + + x = 4 InitializeCamera2 p_camara.Visible = True - nombrefoto3 = DateTime.Now & "_FOTO4.jpg" - teclado.HideKeyboard - fototomada = nombrefoto3 - Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET ESTATUS = ? WHERE CREDITO = ? AND ESTATUS <> 2", Array As String("1", cuenta)) - c = Starter.skmt.ExecQuery2("SELECT ESTATUS2 FROM HIST_DATOS_GENERALES WHERE CREDITO = ?",Array As String(cuenta)) - c.Position = 0 - If c.GetString("ESTATUS2") = 2 Then - - Else - Starter.skmt.ExecNonQuery2("UPDATE HIST_DATOS_GENERALES SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) - Starter.skmt.ExecNonQuery2("UPDATE HIST_FINANCIEROS SET ESTATUS = ?, ESTATUS2 = ? WHERE CREDITO = ?", Array As String("Trabajando", "1", cuenta)) - End If - c.Close - c.Close - Starter.skmt.ExecNonQuery2("UPDATE HIST_VISITA SET FOTOCUATRO = ? WHERE CREDITO = ? AND ESTATUS = 1", Array As String(nombrefoto3, cuenta)) + End Sub Private Sub b_guardar_Click @@ -2142,6 +2169,7 @@ Private Sub B4XPage_CloseRequest As ResumableSub If p_camara.Visible Then p_camara.Visible = False + StopCamera2 Else p_w1.Visible = False