diff --git a/xml/page_board.xml b/xml/page_board.xml
index 3d0d7a62..9f07042b 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -188,7 +188,7 @@
;SAVELOG ShowButtonClick
- ;Var CountDownShowButton = 35
+ Var CountDownShowButton = 35
Var CountDownPauseVideo = 6
Refresh
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index e4dddfcc..70c0acea 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -146,6 +146,11 @@
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
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
@@ -256,36 +261,19 @@
If MachineState_Result = 1 Then
If waitAckPay = 0 Then
- Var waitAckPay = 1
- Var Timeout = 0
- Var ProcessText = ""
+ Var waitAckPay = 1
+ Var Timeout = 0
+ Var ProcessText = ""
- Var TelephoneNumber = "0899999999"
- Var ServiceType = "coffee"
- Var ServiceCredit = SelectDrink
- Var SuggestID = ""
+ Var TelephoneNumber = "0899999999"
+ Var ServiceType = "coffee"
+ Var ServiceCredit = SelectDrink
+ Var SuggestID = ""
- If PayWithQR = 0 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
+ If PayWithQR = 0 Then
+ If CodeChannel = 1 Then
Var SessionID2 = SessionID2 + "/"
- Var SessionID2 = SessionID2 + ""
+ Var SessionID2 = SessionID2 + CodeNumber
Var SessionID2 = SessionID2 + "/"
Var SessionID2 = SessionID2 + VendingCode
Var SessionID2 = SessionID2 + "/"
@@ -300,26 +288,43 @@
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
Else
- Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
- EndIf
- EndIf
+ 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 + "/"
-
- 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
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+ Else
+ Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+ EndIf
+ EndIf
+
+
Else
- ;no wait ack pay
- Var waitAckPay = 0
+ 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
+ ;no wait ack pay
+ Var waitAckPay = 0
+ EndIf
+
EndIf
-
- EndIf
EndIf
@@ -659,27 +664,28 @@
;
;
-;
+
;
;
; 0