MYS: add support for cold menu slots (change to paper cup -22-), SGP: move cashless reset & add delay to cashless cancel btn & WIP full screen video
This commit is contained in:
parent
b141606ecf
commit
ddcb4273c5
26 changed files with 10029 additions and 6780 deletions
|
|
@ -24,8 +24,8 @@
|
|||
|
||||
Var PreScaleCanculate = 100
|
||||
DEBUGVAR VendingCashless
|
||||
CashlessReq FAIL ""
|
||||
Var WaitForStableCashlessState = 3
|
||||
|
||||
Var WaitForStableCashlessState = 0
|
||||
DEBUGVAR WaitForStableCashlessState
|
||||
|
||||
|
||||
|
|
@ -480,6 +480,9 @@
|
|||
Var CancelContinue = 0
|
||||
|
||||
Var QR_POPUP = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment/img_tap_card_5_sec.png"
|
||||
|
||||
Var CountDownAllowCancel = 5
|
||||
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
|
@ -810,8 +813,6 @@
|
|||
DEBUGVAR UserChoosePayment
|
||||
DEBUGVAR VendingCashless
|
||||
|
||||
If WaitForStableCashlessState = 0 Then
|
||||
|
||||
If UserChoosePayment = "CreditCashless" Then
|
||||
If VendingCashless = "READY" Then
|
||||
Var QRCODE99 = ""
|
||||
|
|
@ -843,14 +844,6 @@
|
|||
Var UserChoosePayment = "CreditCashless"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
|
||||
DEBUGVAR "Get EventCashless while not stable"
|
||||
DEBUGVAR WaitForStableCashlessState
|
||||
DEBUGVAR VendingCashless
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -874,16 +867,12 @@
|
|||
<EventTimeout>
|
||||
|
||||
DEBUGVAR VendingCashless
|
||||
DEBUGVAR CountDownAllowCancel
|
||||
|
||||
If WaitForStableCashlessState > 0 Then
|
||||
DEBUGVAR WaitForStableCashlessState
|
||||
Var LOADING_STATE = "Enable"
|
||||
Var WaitForStableCashlessState = WaitForStableCashlessState - 1
|
||||
Else
|
||||
Var LOADING_STATE = "Invisible"
|
||||
If CountDownAllowCancel > 0 Then
|
||||
Var CountDownAllowCancel = CountDownAllowCancel - 1
|
||||
EndIf
|
||||
|
||||
|
||||
If ReadyForBrew = "false" Then
|
||||
SAVELOG "Back to main1"
|
||||
DEBUGVAR UserChoosePayment
|
||||
|
|
@ -1656,6 +1645,7 @@ If alphaState = "Invisible" Then
|
|||
DEBUGVAR QR_POPUP
|
||||
Refresh
|
||||
Var alphaState = "Enable"
|
||||
Var CountDownAllowCancel = 5
|
||||
Coin CARD
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -1851,12 +1841,7 @@ EndIf
|
|||
<Filename> QR_POPUP </Filename>
|
||||
</Image>
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 380 </Y>
|
||||
<State> LOADING_STATE </State>
|
||||
<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/alpha.png" </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 267 </X>
|
||||
|
|
@ -1872,7 +1857,13 @@ EndIf
|
|||
<Button>
|
||||
<X> 438 </X>
|
||||
<Y> 1345 </Y>
|
||||
<State> alphaState </State>
|
||||
<State> eval(
|
||||
If CountDownAllowCancel > 0 Then
|
||||
Var return = "Invisible"
|
||||
Else
|
||||
Var return = alphaState
|
||||
EndIf
|
||||
) </State>
|
||||
<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
|
|
|
|||
|
|
@ -343,7 +343,7 @@
|
|||
Var SugarPressPicLv5 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_sugarlevel_sg5.png"
|
||||
Var SugarPressPicLv6 = "ROOT/taobin_project/inter/whatthecup/sgp/image/topping2_en/bp_sugarlevel_sg6.png"
|
||||
|
||||
|
||||
CashlessReq FAIL ""
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue