SGP: add delay page payment init, MYS: fix bug remove cup button not show
This commit is contained in:
parent
93fa5c540b
commit
d28f470fbc
2 changed files with 61 additions and 32 deletions
|
|
@ -25,6 +25,8 @@
|
|||
Var PreScaleCanculate = 100
|
||||
DEBUGVAR VendingCashless
|
||||
CashlessReq FAIL ""
|
||||
Var WaitForStableCashlessState = 3
|
||||
DEBUGVAR WaitForStableCashlessState
|
||||
|
||||
|
||||
Var CashlessPayFlag = 0
|
||||
|
|
@ -706,6 +708,7 @@
|
|||
|
||||
If VendingCashless = "OK" Then
|
||||
DEBUGVAR CashlessCode
|
||||
DEBUGVAR "Ok make::drink"
|
||||
Var Timeout = 0
|
||||
|
||||
Var QRErrorState = "Invisible"
|
||||
|
|
@ -728,7 +731,9 @@
|
|||
DEBUGVAR UserChoosePayment
|
||||
Var UserChoosePayment = ""
|
||||
Open "ROOT/taobin_project/xml/page_thankyou.xml"
|
||||
|
||||
Else
|
||||
DEBUGVAR "VendingCashless get ActOk not ok"
|
||||
DEBUGVAR VendingCashless
|
||||
EndIf
|
||||
|
||||
</EventActionOk>
|
||||
|
|
@ -805,6 +810,8 @@
|
|||
DEBUGVAR UserChoosePayment
|
||||
DEBUGVAR VendingCashless
|
||||
|
||||
If WaitForStableCashlessState = 0 Then
|
||||
|
||||
If UserChoosePayment = "CreditCashless" Then
|
||||
If VendingCashless = "READY" Then
|
||||
Var QRCODE99 = ""
|
||||
|
|
@ -836,6 +843,14 @@
|
|||
Var UserChoosePayment = "CreditCashless"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
|
||||
DEBUGVAR "Get EventCashless while not stable"
|
||||
DEBUGVAR WaitForStableCashlessState
|
||||
DEBUGVAR VendingCashless
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -860,6 +875,14 @@
|
|||
|
||||
DEBUGVAR VendingCashless
|
||||
|
||||
If WaitForStableCashlessState > 0 Then
|
||||
DEBUGVAR WaitForStableCashlessState
|
||||
Var LOADING_STATE = "Enable"
|
||||
Var WaitForStableCashlessState = WaitForStableCashlessState - 1
|
||||
Else
|
||||
Var LOADING_STATE = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
If ReadyForBrew = "false" Then
|
||||
SAVELOG "Back to main1"
|
||||
|
|
@ -1828,7 +1851,12 @@ 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>
|
||||
|
|
|
|||
|
|
@ -662,6 +662,9 @@
|
|||
READ_FILE "/mnt/sdcard/enable_load_lang_fast" ENABLE_LOAD_LANG_V2
|
||||
STRCONTAIN "1" ENABLE_LOAD_LANG_V2 UseLoadLangV2
|
||||
|
||||
; very-big-btn-init
|
||||
Var UseVeryBigRemoveCupButton = "false"
|
||||
|
||||
|
||||
;inter-page-board
|
||||
If CountryName = "Malaysia" Then
|
||||
|
|
@ -1282,8 +1285,6 @@
|
|||
Var btnRemoveCupY = 630
|
||||
Var btnRemoveCupYNotPageBoard = 500
|
||||
|
||||
Var UseVeryBigRemoveCupButton = "false"
|
||||
|
||||
If UseVeryBigRemoveCupButton = "true" Then
|
||||
Var btnRemoveCupX = 580
|
||||
Var btnRemoveCupY = 530
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue