This commit is contained in:
kong 2021-01-27 13:52:22 +07:00
parent f60ec66fd1
commit 2f001bbbd2
2 changed files with 72 additions and 66 deletions

View file

@ -188,7 +188,7 @@
<EventEnd> <EventEnd>
;SAVELOG ShowButtonClick ;SAVELOG ShowButtonClick
;Var CountDownShowButton = 35 Var CountDownShowButton = 35
Var CountDownPauseVideo = 6 Var CountDownPauseVideo = 6
Refresh Refresh
</EventEnd> </EventEnd>

View file

@ -146,6 +146,11 @@
Var CountDownBrewing = CountDownBrewing - 1 Var CountDownBrewing = CountDownBrewing - 1
If Simulation = "true" Then
If CountDownBrewing = 0 Then
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
EndIf
If Timeout = 4 Then If Timeout = 4 Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3" PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
@ -256,36 +261,19 @@
If MachineState_Result = 1 Then If MachineState_Result = 1 Then
If waitAckPay = 0 Then If waitAckPay = 0 Then
Var waitAckPay = 1 Var waitAckPay = 1
Var Timeout = 0 Var Timeout = 0
Var ProcessText = "" Var ProcessText = ""
Var TelephoneNumber = "0899999999" Var TelephoneNumber = "0899999999"
Var ServiceType = "coffee" Var ServiceType = "coffee"
Var ServiceCredit = SelectDrink Var ServiceCredit = SelectDrink
Var SuggestID = "" Var SuggestID = ""
If PayWithQR = 0 Then If PayWithQR = 0 Then
If CodeChannel = 1 Then If CodeChannel = 1 Then
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + CodeNumber
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + VendingCode
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + SelectDrink
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + BoxID
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + "S"
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + CodeNumber
Var SessionID2 = SessionID2 + "/"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
If CodeChannel = 2 Then
Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + "" Var SessionID2 = SessionID2 + CodeNumber
Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + VendingCode Var SessionID2 = SessionID2 + VendingCode
Var SessionID2 = SessionID2 + "/" Var SessionID2 = SessionID2 + "/"
@ -300,26 +288,43 @@
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else Else
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate If CodeChannel = 2 Then
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + ""
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + VendingCode
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + SelectDrink
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + BoxID
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + "S"
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + CodeNumber
Var SessionID2 = SessionID2 + "/"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
EndIf
EndIf EndIf
EndIf
Else
If ChangeFlag2 = 1 Then
Var TelephoneNumber = "0899999999"
Var VendingDiscount = 0
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else Else
;no wait ack pay If ChangeFlag2 = 1 Then
Var waitAckPay = 0 Var TelephoneNumber = "0899999999"
EndIf Var VendingDiscount = 0
Var VendingCampaign = 0
Var ServiceType = "credit"
Var SessionID2 = SelectDrink
Var ServiceCredit = "coffee"
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
;no wait ack pay
Var waitAckPay = 0
EndIf
EndIf EndIf
EndIf EndIf
@ -659,27 +664,28 @@
;</EventClick> ;</EventClick>
;</Button> ;</Button>
;<Button> <Button>
;<X> 870 </X> <X> 870 </X>
;<Y> 1860 </Y> <Y> 1860 </Y>
;<Width> 200 </Width> <Width> 200 </Width>
;<Height> 50 </Height> <Height> 50 </Height>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
;<EventClick> <EventClick>
; Var countClick2 = countClick2 + 1 Var countClick2 = countClick2 + 1
; If countClick2 = 3 Then If countClick2 = 3 Then
;
; EndIf EndIf
;
; If countClick2 = 5 Then If countClick2 = 5 Then
; Var countClick2 = 0 Var countClick2 = 0
; Var HaveCup = "true" Var HaveCup = "true"
; Var MachineStage = "drink-success" Var MachineStage = "drink-success"
; EndIf Open "ROOT/taobin_project/xml/page_drinkok.xml"
; Refresh EndIf
;</EventClick> Refresh
;</Button> </EventClick>
</Button>
; ;
;<Text> ;<Text>
;<X> 0 </X> ;<X> 0 </X>