- add led v4 animations - extend timeout page test color - add elock
button for newui
This commit is contained in:
Pakin
parent
3b1cda6b64
commit
05543413ec
26 changed files with 705 additions and 406 deletions
|
|
@ -6,12 +6,12 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
RootLayoutVisible 3 "hide"
|
||||
|
||||
Var waitAckPay = 0
|
||||
|
||||
Var waitAckPay = 0
|
||||
Var ChangeFlag = 0
|
||||
|
||||
|
||||
If New_Payment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml"
|
||||
Open "ROOT/taobin_project/xml/page_NewBrewing3Conti.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
If CountryName = "Thailand" Then
|
||||
;do not thing
|
||||
Else
|
||||
Var Brewing3ContiXMLFile = CountryRootPath + "/xml/page_brewing3Conti.xml"
|
||||
Var Brewing3ContiXMLFile = CountryRootPath + "/xml/page_brewing3Conti.xml"
|
||||
DEBUGVAR Brewing3ContiXMLFile
|
||||
|
||||
Open Brewing3ContiXMLFile
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
;Var PayCredit = 0
|
||||
|
||||
;inter-image
|
||||
If show_eng = "true" Then
|
||||
If show_eng = "true" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
|
||||
Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
|
||||
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
|
||||
|
|
@ -49,13 +49,13 @@
|
|||
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/page_payment_mmr/page_payment"
|
||||
Var DirImage2 = "ROOT/taobin_project/image/topping_mmr"
|
||||
Var IMG_CNT = "ROOT/taobin_project/image/page_doing_mmr/img2_mmr.png"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MSC" Then
|
||||
If LanguageShow = "MSC" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/page_payment_msc/page_payment"
|
||||
Var DirImage2 = "ROOT/taobin_project/image/topping_msc"
|
||||
EndIf
|
||||
|
|
@ -85,12 +85,12 @@
|
|||
Var EnableTopupCreditBetweenBrew = "Invisible"
|
||||
EndIf
|
||||
|
||||
If EnableSelectMenuBetweenBrew = "Enable" Then
|
||||
If EnableSelectMenuBetweenBrew = "Enable" Then
|
||||
Var EnableSelectMenuBetweenBrewBlink = "Enable"
|
||||
Else
|
||||
Var EnableSelectMenuBetweenBrewBlink = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
|
||||
If Seeker.thankLidFlag = 1 Then
|
||||
|
|
@ -98,8 +98,8 @@
|
|||
Var LidStateX = "Invisible"
|
||||
EndIf
|
||||
|
||||
Var TimeoutWaitPay = 10
|
||||
|
||||
Var TimeoutWaitPay = 10
|
||||
|
||||
Var PayReference = ""
|
||||
Var PayType = "newpay"
|
||||
Var MachineState_Result = 0
|
||||
|
|
@ -122,11 +122,11 @@
|
|||
DEBUGVAR Seeker.ServiceAmount2
|
||||
|
||||
DEBUGVAR Seeker.CodeNumber
|
||||
|
||||
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + ExtendData
|
||||
|
||||
|
||||
|
||||
|
||||
; On open move from page_brewing3.xml
|
||||
Var countClick2 = 0
|
||||
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
|
||||
Var AddData = 0
|
||||
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
DEBUGVAR Seeker.TNumberTaobinMember
|
||||
DEBUGVAR Seeker.PointTaobinStr
|
||||
|
||||
If Seeker.TNumberTaobinMember = "" Then
|
||||
|
|
@ -146,12 +146,12 @@
|
|||
Var VendingTSIDTmp1 = VendingTSIDTmp
|
||||
Else
|
||||
Var VendingTSIDTmp1 = ""
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var BmiYear = Seeker.PointTaobinStr
|
||||
Var PointCrm = ""
|
||||
If Seeker.FromConsent = 1 Then
|
||||
If Seeker.FromConsent = 1 Then
|
||||
Var PointCrm = "pdpa1"
|
||||
EndIf
|
||||
Var GetScore = VendingTSIDTmp1
|
||||
|
|
@ -165,13 +165,13 @@
|
|||
Var AddData = 1
|
||||
;AddData Cid Seeker.TNumberTaobinMember BmiYear PointCrm GetScore
|
||||
EndIf
|
||||
|
||||
|
||||
Var VendingTSIDTmp1 = ""
|
||||
EndIf
|
||||
|
||||
If Seeker.VendingCode = "MKFOO" Then
|
||||
Var AddData = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If MyMintEnable = 1 Then
|
||||
If FromMyMintPro = 1 Then
|
||||
|
|
@ -218,12 +218,12 @@
|
|||
Var LidStateX = "Invisible"
|
||||
|
||||
If Seeker.CreditCard = 1 Then
|
||||
Var EnableSelectMenuBetweenBrew = "Invisible"
|
||||
Var EnableSelectMenuBetweenBrew = "Invisible"
|
||||
Var EnableTopupCreditBetweenBrew = "Invisible"
|
||||
EndIf
|
||||
|
||||
If MachineState_Result > 0 Then
|
||||
Var EnableTopupCreditBetweenBrew = "Invisible"
|
||||
If MachineState_Result > 0 Then
|
||||
Var EnableTopupCreditBetweenBrew = "Invisible"
|
||||
EndIf
|
||||
|
||||
Var CreditCardVoid = 0
|
||||
|
|
@ -238,9 +238,9 @@
|
|||
If CreditCardVoid = 1 Then
|
||||
Var ChangeOK = 2
|
||||
EndIf
|
||||
|
||||
|
||||
If ActionOKCase = 1 Then
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + ExtendData
|
||||
|
||||
|
|
@ -253,11 +253,11 @@
|
|||
Var ECommerce = ""
|
||||
Var ECommerce = ECommerce + PriceDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + DiscountDrink
|
||||
Var ECommerce = ECommerce + DiscountDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SessionID2
|
||||
Var ECommerce = ECommerce + SessionID2
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SelectDrink
|
||||
Var ECommerce = ECommerce + SelectDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + Seeker.VendingCode
|
||||
Var ECommerce = ECommerce + "/"
|
||||
|
|
@ -279,31 +279,31 @@
|
|||
Var ActionOKCase = 2
|
||||
|
||||
SAVELOG "back_to_main from line > 142."
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
|
||||
Else
|
||||
|
||||
SAVELOG "back_to_main from line > 147."
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
Else
|
||||
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
If waitAckPay = 1 Then
|
||||
If waitAckPay = 1 Then
|
||||
SAVELOG "waitAckPay = 1"
|
||||
Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
</EventActionOk>
|
||||
|
||||
<EventActionError>
|
||||
If ActionOKCase = 1 Then
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + ExtendData
|
||||
|
||||
|
|
@ -316,11 +316,11 @@
|
|||
Var ECommerce = ""
|
||||
Var ECommerce = ECommerce + PriceDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + DiscountDrink
|
||||
Var ECommerce = ECommerce + DiscountDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SessionID2
|
||||
Var ECommerce = ECommerce + SessionID2
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SelectDrink
|
||||
Var ECommerce = ECommerce + SelectDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + Seeker.VendingCode
|
||||
Var ECommerce = ECommerce + "/"
|
||||
|
|
@ -342,23 +342,23 @@
|
|||
Var ActionOKCase = 2
|
||||
|
||||
SAVELOG "back_to_main from line > 204."
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
|
||||
Else
|
||||
SAVELOG "back_to_main from line > 173."
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
Else
|
||||
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
</EventActionError>
|
||||
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
<EventTimeout>
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
|
||||
|
|
@ -384,23 +384,29 @@
|
|||
If Timeout = 4 Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
|
||||
EndIf
|
||||
|
||||
|
||||
; run test;
|
||||
;If CountDownBrewing = 40 Then
|
||||
; Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
;If CountDownBrewing = 40 Then
|
||||
; Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
;EndIf
|
||||
If CountDownBrewing = 0 Then
|
||||
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
EndIf
|
||||
|
||||
Var ShowCountDownBrewing = CountDownBrewing
|
||||
|
||||
|
||||
If FrontDoorVersionInt > 19999 Then
|
||||
TRY "ROOT/taobin_project/xml/process/ledv4_process.ev"
|
||||
LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES
|
||||
EndIf
|
||||
|
||||
|
||||
If Timeout > 540 Then
|
||||
SAVELOG "back_to_main from line > 217."
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If Timeout > 480 Then
|
||||
Var MachineState_Result = 2
|
||||
|
|
@ -410,25 +416,25 @@
|
|||
Var ChangeTimeout = ChangeTimeout + 1
|
||||
EndIf
|
||||
|
||||
If waitAckPay = 1 Then
|
||||
If waitAckPay = 1 Then
|
||||
If Timeout > 60 Then
|
||||
Var VendingTSIDTmp1 = ""
|
||||
SAVELOG "waitAckPay = 1 tineout > 60"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If waitAckPay = 2 Then
|
||||
If waitAckPay = 2 Then
|
||||
If Timeout > TimeoutWaitPay Then
|
||||
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
If Seeker.CodeChannel = 1 Then
|
||||
Var SessionID2 = SelectSlot + ":"
|
||||
Var SessionID2 = SessionID2 + ExtendData
|
||||
|
||||
DEBUGVAR SessionID2
|
||||
|
||||
|
||||
Var CreditAmount1 = ""
|
||||
Var ServiceAmountFlow = ""
|
||||
Var TelephoneNumber = "0899999999"
|
||||
|
|
@ -436,11 +442,11 @@
|
|||
Var ECommerce = ""
|
||||
Var ECommerce = ECommerce + PriceDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + DiscountDrink
|
||||
Var ECommerce = ECommerce + DiscountDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SessionID2
|
||||
Var ECommerce = ECommerce + SessionID2
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + SelectDrink
|
||||
Var ECommerce = ECommerce + SelectDrink
|
||||
Var ECommerce = ECommerce + "/"
|
||||
Var ECommerce = ECommerce + Seeker.VendingCode
|
||||
Var ECommerce = ECommerce + "/"
|
||||
|
|
@ -460,9 +466,9 @@
|
|||
GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
|
||||
;Var Timeout = 0
|
||||
EndIf
|
||||
|
||||
|
||||
SAVELOG "back_to_main from line > 309."
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -491,7 +497,7 @@
|
|||
|
||||
|
||||
Var PayDetail = "2/" + HURR_FOREVER
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + SAMESALARY
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + NOBONUS
|
||||
|
|
@ -507,18 +513,18 @@
|
|||
Var SuggestID = ""
|
||||
Var SessionID2 = ""
|
||||
|
||||
|
||||
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
|
||||
;If Seeker.CodeChannel = 0 Then
|
||||
;If Seeker.CodeChannel = 0 Then
|
||||
; SAVELOG "back_to_main from line > 315."
|
||||
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
;EndIf
|
||||
|
||||
Var waitAckPay = 2
|
||||
Var TimeoutWaitPay = 45
|
||||
Var TimeoutWaitPay = 45
|
||||
Var Timeout = 5
|
||||
Var ActionOKCase = 1
|
||||
|
||||
|
|
@ -547,7 +553,7 @@
|
|||
EndIf
|
||||
|
||||
Var PayDetail = "2/" + HURR_FOREVER
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + SAMESALARY
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + NOBONUS
|
||||
|
|
@ -556,23 +562,23 @@
|
|||
|
||||
;Var PayDetail="1/F:404/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
|
||||
|
||||
|
||||
|
||||
Var ServiceType = "coffee"
|
||||
Var ServiceCredit = SelectDrink
|
||||
Var SuggestID = ""
|
||||
Var SessionID2 = ""
|
||||
|
||||
|
||||
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
;If Seeker.CodeChannel = 0 Then
|
||||
;If Seeker.CodeChannel = 0 Then
|
||||
; SAVELOG "back_to_main from line > 357."
|
||||
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
; Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
;EndIf
|
||||
|
||||
Var waitAckPay = 2
|
||||
Var TimeoutWaitPay = 45
|
||||
Var TimeoutWaitPay = 45
|
||||
Var Timeout = 5
|
||||
Var ActionOKCase = 1
|
||||
|
||||
|
|
@ -596,7 +602,7 @@
|
|||
EndIf
|
||||
|
||||
Var PayDetail = "2/" + HURR_FOREVER
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + SAMESALARY
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + NOBONUS
|
||||
|
|
@ -609,18 +615,18 @@
|
|||
Var DEE = PayDetail
|
||||
|
||||
PAYEXT SVT ACC VendingTSIDTmp DEE
|
||||
|
||||
|
||||
CoinBack
|
||||
|
||||
|
||||
|
||||
|
||||
Var ActionOKCase = 1
|
||||
If Seeker.CodeChannel = 0 Then
|
||||
If Seeker.CodeChannel = 0 Then
|
||||
SAVELOG "back_to_main from line > 391."
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
EndIf
|
||||
|
||||
Var waitAckPay = 2
|
||||
Var TimeoutWaitPay = 45
|
||||
Var TimeoutWaitPay = 45
|
||||
Var Timeout = 5
|
||||
|
||||
|
||||
|
|
@ -637,13 +643,13 @@
|
|||
|
||||
If MachineState_Result = 1 Then
|
||||
DEBUGVAR PaySuccessWithDaemonTask
|
||||
|
||||
If waitAckPay = 0 Then
|
||||
|
||||
Var waitAckPay = 0
|
||||
If waitAckPay = 0 Then
|
||||
|
||||
Var waitAckPay = 0
|
||||
Var Timeout = 0
|
||||
|
||||
Var ProcessText = ""
|
||||
Var ProcessText = ""
|
||||
|
||||
If Seeker.TNumberTaobinCredit = "" Then
|
||||
Var TelephoneNumber = "0899999999"
|
||||
|
|
@ -653,7 +659,7 @@
|
|||
Else
|
||||
Var TelephoneNumber = Seeker.TNumberTaobinMember
|
||||
EndIf
|
||||
|
||||
|
||||
Else
|
||||
Var TelephoneNumber = Seeker.TNumberTaobinCredit
|
||||
Var PayO2 = Seeker.CoffeePinNumber
|
||||
|
|
@ -681,18 +687,18 @@
|
|||
Var SuggestID = ""
|
||||
|
||||
Var PayDetail = "2/" + HURR_FOREVER
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + SAMESALARY
|
||||
Var PayDetail = PayDetail + "/"
|
||||
Var PayDetail = PayDetail + NOBONUS
|
||||
Var PayDetail = PayDetail + "/XML|"
|
||||
Var PayDetail = PayDetail + Seeker.OrderChanel
|
||||
|
||||
|
||||
|
||||
;Var PayDetail="1/S:0/500/1:430|1001:12|1002:15|1020:7|1042:5|1050:50|9501:1|9502:1|9701:1|9702:1"
|
||||
|
||||
If GetFreeFromError = 1 Then
|
||||
Var Seeker.CodeChannel = 1
|
||||
Var Seeker.CodeChannel = 1
|
||||
Var Seeker.VendingCode = "C48"
|
||||
Var Seeker.CodeNumber = "0000000000"
|
||||
Var VendingCampaign = ServiceAmount2
|
||||
|
|
@ -715,7 +721,7 @@
|
|||
Var SessionID2 = SessionID2 + "/"
|
||||
|
||||
If Seeker.CreditCard = 1 Then
|
||||
|
||||
|
||||
CashlessReq SUCCESS ""
|
||||
;CashlessReq FAIL ""
|
||||
|
||||
|
|
@ -723,26 +729,26 @@
|
|||
Var PayDetail2 = Seeker.PayDetail2
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
Else
|
||||
|
||||
|
||||
|
||||
If Seeker.CreditCard = 1 Then
|
||||
|
||||
|
||||
|
||||
CashlessReq SUCCESS ""
|
||||
;CashlessReq FAIL ""
|
||||
|
||||
|
||||
EndIf
|
||||
Var PayDetail2 = Seeker.PayDetail2
|
||||
Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Else
|
||||
|
||||
;no wait ack pay
|
||||
Var waitAckPay = 0
|
||||
Var waitAckPay = 0
|
||||
|
||||
Var SVT = "coffee"
|
||||
Var ACC = "0899999999"
|
||||
|
|
@ -754,12 +760,12 @@
|
|||
EndIf
|
||||
|
||||
PAYEXT SVT ACC VendingTSIDTmp DEE
|
||||
|
||||
|
||||
CoinBack
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
__CMD "clear-stock-data" 0 "-" "-"
|
||||
|
|
@ -768,8 +774,8 @@
|
|||
If waitAckPay = 0 Then
|
||||
|
||||
SAVELOG "waitAckPay = 0 Timeout"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
|
@ -797,18 +803,18 @@
|
|||
EndIf
|
||||
|
||||
|
||||
If Seeker.PayWithQR = 0 Then
|
||||
If Seeker.PayWithQR = 0 Then
|
||||
|
||||
If Seeker.CreditCard = 1 Then
|
||||
CashlessReq FAIL ""
|
||||
Var ChangeFlag = 1
|
||||
Var ChangeFlag = 1
|
||||
Var CreditCardVoid = 1
|
||||
Else
|
||||
|
||||
|
||||
|
||||
If Seeker.CodeChannel = 0 Then
|
||||
If ChangeFlag = 0 Then
|
||||
Var ChangeFlag = 1
|
||||
Var ChangeFlag = 1
|
||||
|
||||
If Seeker.StoreCreditFlag = 1 Then
|
||||
Var ChangeOK = 2
|
||||
|
|
@ -818,9 +824,9 @@
|
|||
Else
|
||||
Change ServiceAmount2
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
Else
|
||||
|
|
@ -835,9 +841,9 @@
|
|||
EndIf
|
||||
|
||||
If CoinAmount > 0 Then
|
||||
|
||||
|
||||
If ChangeFlag = 0 Then
|
||||
Var ChangeFlag = 1
|
||||
Var ChangeFlag = 1
|
||||
Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
|
||||
|
||||
If Seeker.StoreCreditFlag = 1 Then
|
||||
|
|
@ -845,7 +851,7 @@
|
|||
Else
|
||||
Change ServiceAmount3
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
Else
|
||||
Var ChangeOK = 2
|
||||
|
|
@ -859,23 +865,23 @@
|
|||
Var ChangeOK = 3
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml"
|
||||
|
||||
|
||||
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
|
||||
;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
|
||||
;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -910,13 +916,13 @@
|
|||
Var EnableTopupCreditBetweenBrew = "Invisible"
|
||||
EndIf
|
||||
|
||||
If EnableSelectMenuBetweenBrew = "Enable" Then
|
||||
If EnableSelectMenuBetweenBrewBlink = "Enable" Then
|
||||
If EnableSelectMenuBetweenBrew = "Enable" Then
|
||||
If EnableSelectMenuBetweenBrewBlink = "Enable" Then
|
||||
Var EnableSelectMenuBetweenBrewBlink = "Invisible"
|
||||
Else
|
||||
Var EnableSelectMenuBetweenBrewBlink = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
Else
|
||||
Var EnableSelectMenuBetweenBrewBlink = "Invisible"
|
||||
EndIf
|
||||
|
|
@ -927,7 +933,7 @@
|
|||
Var CountUpBrewing = CountUpBrewing + 1
|
||||
|
||||
Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
|
||||
|
||||
|
||||
If PreviseStepVideo = SlotVideo Then
|
||||
;SAVELOG SlotVideo
|
||||
Else
|
||||
|
|
@ -937,9 +943,9 @@
|
|||
;SAVELOG CountUpBrewing
|
||||
|
||||
;Var CountDownVideoTime = CountDownVideoTimeReload
|
||||
|
||||
|
||||
Var StepVideo = SlotVideo + 2
|
||||
|
||||
|
||||
;SAVELOG StepVideo
|
||||
|
||||
If StepVideo = 1 Then
|
||||
|
|
@ -988,7 +994,7 @@
|
|||
Var PictureFile = PictureFile + PictureBegin
|
||||
Var PictureFile = PictureFile + videoID
|
||||
Var PictureFile = PictureFile + PictureEnd
|
||||
|
||||
|
||||
DEBUGVAR VideoPlayFile
|
||||
DEBUGVAR PictureFile
|
||||
EndIf
|
||||
|
|
@ -997,7 +1003,7 @@
|
|||
EndIf
|
||||
|
||||
|
||||
If IgnoreNetCore = "true" Then
|
||||
If IgnoreNetCore = "true" Then
|
||||
If CountDownBrewing = 0 Then
|
||||
SAVELOG "CountDownBrewing = 0"
|
||||
Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
|
|
@ -1023,24 +1029,24 @@
|
|||
Var ButtonGamePressToPlayState = "Invisible"
|
||||
Var Game01Enable = 0
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
;include="ROOT/taobin_project/inc/timeout_lid_and_straw_step.inc"
|
||||
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
||||
</EventTimeout>
|
||||
</EventTimeout>
|
||||
|
||||
<EventMachine>
|
||||
|
||||
|
||||
</EventMachine>
|
||||
|
||||
; this copy in file menu_brew2.xml and menu_lid_straw.xml
|
||||
<EventChangeStatus>
|
||||
If ChangeStatus = "payout-end" Then
|
||||
If ChangeStatus = "payout-end" Then
|
||||
If ChangeFlag = 1 Then
|
||||
Var ChangeOK = 2
|
||||
EndIf
|
||||
|
|
@ -1133,9 +1139,9 @@
|
|||
<State>EnableSelectMenuBetweenBrew</State>
|
||||
<Filename> next_pic_bn </Filename>
|
||||
<FilenamePress> next_pic_bp </FilenamePress>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
If MachineState_Result = 0 Then
|
||||
|
||||
|
||||
SAVELOG "User click next button"
|
||||
|
||||
Var Seeker = "next"
|
||||
|
|
@ -1143,9 +1149,9 @@
|
|||
CoinPause
|
||||
Var PayCredit = 0
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
Open "ROOT/taobin_project/xml/page_catalog.xml"
|
||||
EndIf
|
||||
</EventClick>
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Button>
|
||||
|
|
@ -1154,7 +1160,7 @@
|
|||
<State>EnableTopupCreditBetweenBrew</State>
|
||||
<Filename> topup_credit_bn </Filename>
|
||||
<FilenamePress> topup_credit_bp </FilenamePress>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
If MachineState_Result = 0 Then
|
||||
|
||||
If NextOrder = "true" Then
|
||||
|
|
@ -1172,20 +1178,20 @@
|
|||
CoinPause
|
||||
Var PayCredit = 0
|
||||
EndIf
|
||||
|
||||
|
||||
SAVELOG "User click topup-credit button"
|
||||
Var Seeker = "topupCredit"
|
||||
|
||||
|
||||
|
||||
If TelephoneNumber = "" Then
|
||||
Open "ROOT/taobin_project/xml/page_topup_credit.xml"
|
||||
Else
|
||||
|
||||
|
||||
If TelephoneNumber = "" Then
|
||||
Open "ROOT/taobin_project/xml/page_topup_credit.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_topup_credit-ChooseNumber.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
</EventClick>
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
|
|
@ -1203,7 +1209,7 @@
|
|||
<X> 526 </X>
|
||||
<Y> 1680 </Y>
|
||||
<Width> 241 </Width>
|
||||
<Height> 204 </Height>
|
||||
<Height> 204 </Height>
|
||||
<State> ButtonGamePressToPlayState </State>
|
||||
<EventClick>
|
||||
DEBUGVAR Game01Enable
|
||||
|
|
@ -1221,9 +1227,9 @@
|
|||
<Y> 500 </Y>
|
||||
<State>bg_strawlid_ST</State>
|
||||
<Filename> bg_strawlid </Filename>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
|
||||
</EventClick>
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
; straw left
|
||||
|
|
@ -1235,14 +1241,14 @@
|
|||
<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
|
||||
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
SAVELOG "Click straw cb"
|
||||
If StrawStateX = "Press" Then
|
||||
;Var StrawStateX = "Enable"
|
||||
;Var StrawStateX = "Enable"
|
||||
Else
|
||||
Var StrawStateX = "Press"
|
||||
Var Seeker.strawAction = 1
|
||||
|
||||
|
||||
EndIf
|
||||
Refresh
|
||||
</EventClick>
|
||||
|
|
@ -1256,10 +1262,10 @@
|
|||
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
SAVELOG "Click straw cb"
|
||||
If StrawStateX = "Press" Then
|
||||
;Var StrawStateX = "Enable"
|
||||
;Var StrawStateX = "Enable"
|
||||
Else
|
||||
Var StrawStateX = "Press"
|
||||
Var Seeker.strawAction = 1
|
||||
|
|
@ -1279,18 +1285,18 @@
|
|||
<Filename> "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
|
||||
If Seeker.thankLidFlag = 0 Then
|
||||
|
||||
|
||||
SAVELOG "Click LID pic"
|
||||
If LidStateX = "Press" Then
|
||||
;Var LidStateX = "Enable"
|
||||
;Var LidStateX = "Enable"
|
||||
Else
|
||||
Var LidStateX = "Press"
|
||||
Var Seeker.lidAction = 1
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
DEBUGVAR SugarState1
|
||||
Refresh
|
||||
|
|
@ -1308,19 +1314,19 @@
|
|||
<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
|
||||
If Seeker.thankLidFlag = 0 Then
|
||||
|
||||
SAVELOG "Click LID cb"
|
||||
If LidStateX = "Press" Then
|
||||
;Var LidStateX = "Enable"
|
||||
;Var LidStateX = "Enable"
|
||||
Else
|
||||
Var LidStateX = "Press"
|
||||
Var Seeker.lidAction = 1
|
||||
EndIf
|
||||
Refresh
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
</EventClick>
|
||||
|
|
@ -1333,7 +1339,7 @@
|
|||
<State> ButtonGameCountDownState </State>
|
||||
<Filename> "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </Filename>
|
||||
<FilenamePress> "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </FilenamePress>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
|
||||
</EventClick>
|
||||
<Text>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue