cheveguerra/Durakelo
1
0
Fork 0
mirror of https://github.com/KeymonSoft/Durakelo.git synced 2026-04-20 04:39:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/KeymonSoft/Durakelo

Browse Source 
# Conflicts:
#	B4A/Durakelo.b4a.meta
This commit is contained in:
cvaldes1201
2024-01-31 10:41:29 -06:00
parent 88f693759d bad7453a8e
commit 65c6bb87ab
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
B4A/C_Cliente.bas
View File

@@ -833,7 +833,7 @@ Sub B_IMP2_Click
c.Close c.Close
End If End If
LogColor(perfil,Colors.Magenta) LogColor(perfil,Colors.Magenta)
Log(1)
c=Starter.skmt.ExecQuery("select USUARIO from usuarioa") c=Starter.skmt.ExecQuery("select USUARIO from usuarioa")
c.Position=0 c.Position=0
usuario = c.GetString("USUARIO") usuario = c.GetString("USUARIO")
@@ -847,17 +847,17 @@ Sub B_IMP2_Click
c.Close c.Close
ProgressDialogShow("Imprimiendo, un momento ...") ProgressDialogShow("Imprimiendo, un momento ...")
' Printer1.DisConnect Printer1.DisConnect
If Not(Printer1.IsConnected) Then If Not(Printer1.IsConnected) Then
Log("conectando 1") Log("conectando 1")
Printer1.Connect Printer1.Connect
Private cont As Int = 0 Private cont As Int = 0
Do While Not(impresoraConectada) Do While Not(impresoraConectada)
' Log("conectando ...")
Sleep(1000) Sleep(1000)
cont = cont + 1 cont = cont + 1
If cont = 2 Then Printer1.Connect 'Tratamos de reconectar Log("x")
If cont > 3 Then impresoraConectada = True If cont = 7 Then Printer1.Connect 'Tratamos de reconectar
If cont > 15 Then impresoraConectada = True
Loop Loop
Sleep(500) Sleep(500)
impresoraConectada = False impresoraConectada = False
@@ -866,11 +866,10 @@ Sub B_IMP2_Click
Printer1.Connect Printer1.Connect
Private cont As Int = 0 Private cont As Int = 0
Do While Not(impresoraConectada) Or Not(Printer1.IsConnected) Do While Not(impresoraConectada) Or Not(Printer1.IsConnected)
' Log("conectando ...")
Sleep(1000) Sleep(1000)
cont = cont + 1 cont = cont + 1
If cont = 2 Then Printer1.Connect If cont = 2 Then Printer1.Connect
If cont > 3 Then impresoraConectada = True If cont > 4 Then impresoraConectada = True
Loop Loop
Sleep(500) Sleep(500)
impresoraConectada = False impresoraConectada = False

4
B4A/Durakelo.b4a.meta
View File

@@ -70,6 +70,10 @@ ModuleClosedNodes6=
ModuleClosedNodes7= ModuleClosedNodes7=
ModuleClosedNodes8= ModuleClosedNodes8=
ModuleClosedNodes9= ModuleClosedNodes9=
<<<<<<< .mine
NavigationStack=Diseñador Visual,Cliente.bal,-100,1,C_Cliente,B4XPage_Appear,204,6,Starter,Timer1_Tick,67,0,Starter,ENVIA_ULTIMA_GPS,91,0,Starter,Process_Globals,20,0,C_Productos,Class_Globals,0,0,C_Principal,trabajar_Click,437,0,C_Principal,connecta_Click,1957,0,C_Cliente,Class_Globals,0,0,C_Cliente,gest_Click,438,0,C_Cliente,B_VENTA_Click,1230,0 NavigationStack=Diseñador Visual,Cliente.bal,-100,1,C_Cliente,B4XPage_Appear,204,6,Starter,Timer1_Tick,67,0,Starter,ENVIA_ULTIMA_GPS,91,0,Starter,Process_Globals,20,0,C_Productos,Class_Globals,0,0,C_Principal,trabajar_Click,437,0,C_Principal,connecta_Click,1957,0,C_Cliente,Class_Globals,0,0,C_Cliente,gest_Click,438,0,C_Cliente,B_VENTA_Click,1230,0
=======
NavigationStack=C_Cliente,Class_Globals,145,0,C_Principal,cargar_Click,958,0,C_Cliente,B_INV_Click,1117,0,C_Cliente,GPS_LocationChanged,362,0,C_Cliente,gest_Click,434,0,C_Cliente,B_VENTA_Click,1226,0,C_Cliente,B_IMP2_Click,846,5,C_Cliente,initialize,149,0,C_Cliente,Printer1_Connected,1344,1,C_Cliente,B_EXIBI_Click,1322,0
>>>>>>> .theirs
SelectedBuild=0 SelectedBuild=0
VisibleModules=21,2,9,18,7,10,22,11,23,4 VisibleModules=21,2,9,18,7,10,22,11,23,4