From 05543413ec5b708463d2dd3924e4292e7fb7a7f3 Mon Sep 17 00:00:00 2001 From: Pakin Date: Thu, 3 Jul 2025 14:55:55 +0700 Subject: [PATCH] - add led v4 animations - extend timeout page test color - add elock button for newui --- xml/page_NewBrewing3.xml | 10 +- xml/page_NewBrewing3Conti.xml | 6 +- xml/page_board.xml | 35 +- xml/page_brewing3.xml | 32 +- xml/page_brewing3Conti.xml | 330 +++++++++--------- xml/page_collect_point_1-2.xml | 42 ++- xml/page_collect_point_1-3.xml | 175 +++++----- xml/page_collect_point_1.xml | 4 + xml/page_collect_point_2.xml | 4 + xml/page_collect_point_3.xml | 115 +++--- xml/page_collect_point_3_28.xml | 22 +- ...collect_point_3_28_lucky_draw_campaign.xml | 4 + xml/page_display_get_free.xml | 10 +- xml/page_drinkok.xml | 5 + xml/page_test_color.xml | 90 ++--- xml/page_thankyou.xml | 11 + xml/page_thankyouConti.xml | 8 + xml/page_thankyouMore.xml | 7 + xml/process/ledv4_process.ev | 43 +++ xml/process/temp_ledv4_blinkall_horizontal.ev | 16 + xml/process/temp_ledv4_offall_horizontal.ev | 16 + xml/process/temp_ledv4_page_drinkok.ev | 19 + xml/process/temp_ledv4_page_thankyou.ev | 23 ++ xml/vending_info.xml | 22 +- xml/vending_info2.xml | 17 +- xml/vending_tasks_pre_main.xml | 45 +++ 26 files changed, 705 insertions(+), 406 deletions(-) create mode 100644 xml/process/ledv4_process.ev create mode 100644 xml/process/temp_ledv4_blinkall_horizontal.ev create mode 100644 xml/process/temp_ledv4_offall_horizontal.ev create mode 100644 xml/process/temp_ledv4_page_drinkok.ev create mode 100644 xml/process/temp_ledv4_page_thankyou.ev diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index c40915a6..62cf6fee 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -644,7 +644,7 @@ __CMD "SetErrorCodeHandleByXML" 1031 "-" "-" Var IndexCharWhenTImeZero = 0 - + Var ArrayCharWhenTImeZero[0] = "- " Var ArrayCharWhenTImeZero[1] = "\ " Var ArrayCharWhenTImeZero[2] = "| " @@ -851,6 +851,10 @@ Var CountDownBrewing = BREW_CNT Var ShowCountDownBrewing = CountDownBrewing + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf + If BREW_CNT = 0 Then If CountUpWhenBREW_CNT > 56 Then Var CountUpWhenBREW_CNT = 0 @@ -865,9 +869,9 @@ Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1 - + Var ShowCountDownBrewing = ArrayCharWhenTImeZero[IndexCharWhenTImeZero] - + Var IndexCharWhenTImeZero = IndexCharWhenTImeZero + 1 If IndexCharWhenTImeZero > 3 Then Var IndexCharWhenTImeZero = 0 diff --git a/xml/page_NewBrewing3Conti.xml b/xml/page_NewBrewing3Conti.xml index 5379b73f..d7800cfb 100644 --- a/xml/page_NewBrewing3Conti.xml +++ b/xml/page_NewBrewing3Conti.xml @@ -308,10 +308,14 @@ Var ShowCountDownBrewing = CountDownBrewing + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf + If CountDownBrewing = 0 Then Var ShowCountDownBrewing = ArrayCharWhenTImeZero[IndexCharWhenTImeZero] - + Var IndexCharWhenTImeZero = IndexCharWhenTImeZero + 1 If IndexCharWhenTImeZero > 3 Then Var IndexCharWhenTImeZero = 0 diff --git a/xml/page_board.xml b/xml/page_board.xml index 309d21ba..61cb83a5 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -195,7 +195,11 @@ CacheVarStr "put" SpiralOnline EndIf - + + If FrontDoorVersionInt = "" Then + __CMD "mcu-version" "-" "-" "-" + EndIf + If BoxID = 105005 Then Var XMLProfile = "Plus5AndInclude20Percent-taobin_notopup-taobin_nopro-taobin_notopping" Var XMLProfile = "DiscountFromBO-MachineShedule" @@ -1145,7 +1149,7 @@ Var LanguageShow = "MTC" SetLanguage "MTC" LanguageControl "UpdateList" "-" - + Var InternationalEnable = 1 Var show_eng = "true" Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" @@ -1863,6 +1867,15 @@ Var buttonRemoveCupOnArm = "Invisible" Var CountDownFailErrorHappendClear = 8 + + If FrontDoorVersionInt > 19999 Then + LEDv2 LedV4All On 100 20 0 255 10 + SAVELOG "LEDv4.SlowBrinkVertical" + + ; turn-off-horizontal + TRY "ROOT/taobin_project/xml/process/temp_ledv4_offall_horizontal.ev" + EndIf + @@ -2638,9 +2651,19 @@ PRICE "Reset" "-" EndIf Else If InternationalEnable = 1 Then + + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/temp_ledv4_blinkall_horizontal.ev" + EndIf + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml" Else + + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/temp_ledv4_blinkall_horizontal.ev" + EndIf + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" EndIf @@ -2745,9 +2768,17 @@ PRICE "Reset" "-" EndIf Else If InternationalEnable = 1 Then + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/temp_ledv4_blinkall_horizontal.ev" + EndIf + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml" Else + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/temp_ledv4_blinkall_horizontal.ev" + EndIf + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml" EndIf EndIf diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 23ffbe6d..bbac391b 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -55,15 +55,15 @@ Var DirImageDoing = "ROOT/taobin_project/image/page_doing" ;inter-image - If show_eng = "true" Then + If show_eng = "true" Then Var DirImageDoing = "ROOT/taobin_project/image/page_doing_en" EndIf - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var DirImageDoing = "ROOT/taobin_project/image/page_doing_mmr/" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var DirImageDoing = "ROOT/taobin_project/inter/hkg/image/page_doing/" EndIf @@ -133,8 +133,8 @@ Var XStraw = 142 EndIf - - If LanguageShow = "MYANMAR" Then + + If LanguageShow = "MYANMAR" Then ;for test Var IMG_CNT = DirImageDoing + "/img2_en.png" ;Var IMG_CNT = DirImageDoing + "/img2_mmr.png" @@ -161,7 +161,7 @@ Var XStraw = 142 EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then ;for test Var IMG_CNT = DirImageDoing + "/img2_en.png" @@ -335,12 +335,12 @@ Var DirImage2 = "ROOT/taobin_project/image/topping2" 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" 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_en" EndIf @@ -565,11 +565,11 @@ Var LangString = "LANG: "TH"\r\n" EndIf - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var LangString = "LANG: "TH"\r\n" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var LangString = "LANG: "TH"\r\n" EndIf @@ -599,10 +599,10 @@ Else Var LangString = "LANG: "TH"\r\n" EndIf - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var LangString = "LANG: "TH"\r\n" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var LangString = "LANG: "TH"\r\n" EndIf @@ -901,10 +901,10 @@ PlayLong PlaySoundLag EndIf ;inter-image - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/next_drink.mp3" EndIf EndIf @@ -931,6 +931,10 @@ Var ShowCountDownBrewing = CountDownBrewing + If FrontDoorVersionInt > 19999 Then + LEDv2 LED_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + EndIf + DEBUGVAR EnableDoubleCupNoError DEBUGVAR HURR_FOREVER If EnableDoubleCupNoError = 1 Then diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 7d19fa1a..1202a41c 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -6,12 +6,12 @@ SoundVolume 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 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 1000 - + 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 - + - + ; this copy in file menu_brew2.xml and menu_lid_straw.xml - If ChangeStatus = "payout-end" Then + If ChangeStatus = "payout-end" Then If ChangeFlag = 1 Then Var ChangeOK = 2 EndIf @@ -1133,9 +1139,9 @@ EnableSelectMenuBetweenBrew next_pic_bn next_pic_bp - + 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 - + @@ -1203,7 +1209,7 @@ 526 1680 241 - 204 + 204 ButtonGamePressToPlayState DEBUGVAR Game01Enable @@ -1221,9 +1227,9 @@ 500 bg_strawlid_ST bg_strawlid - + - + ; straw left @@ -1235,14 +1241,14 @@ "ROOT/taobin_project/image/topping2/bn_straw.png" "ROOT/taobin_project/image/topping2/bp_straw.png" "ROOT/taobin_project/image/topping2/bd_straw.png" - + SAVELOG "Click straw cb" If StrawStateX = "Press" Then - ;Var StrawStateX = "Enable" + ;Var StrawStateX = "Enable" Else Var StrawStateX = "Press" Var Seeker.strawAction = 1 - + EndIf Refresh @@ -1256,10 +1262,10 @@ "ROOT/taobin_project/image/topping2/cb_notcheck.png" "ROOT/taobin_project/image/topping2/cb_checked.png" Var( DirImage + "/cb_checkdis.png" ) - + 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 @@ "ROOT/taobin_project/image/topping2/bn_lid.png" "ROOT/taobin_project/image/topping2/bp_lid.png" Var( DirImage + "/bd_lid.png" ) - + 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 @@ "ROOT/taobin_project/image/topping2/cb_notcheck.png" "ROOT/taobin_project/image/topping2/cb_checked.png" Var( DirImage + "/cb_checkdis.png" ) - + 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 @@ -1333,7 +1339,7 @@ ButtonGameCountDownState "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" - + diff --git a/xml/page_collect_point_1-2.xml b/xml/page_collect_point_1-2.xml index 987aaa1e..c7616d23 100644 --- a/xml/page_collect_point_1-2.xml +++ b/xml/page_collect_point_1-2.xml @@ -8,27 +8,27 @@ ; On open - + Var Timeout = 0 - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collectiing_en" - + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png" Else Var DirImage = "ROOT/taobin_project/image/collectiing" - + Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png" EndIf - + If PromotionIDCurrentOrder = 2 Then Var img_popup6 = "/img_popupOreo1.png" EndIf - + If PromotionIDCurrentOrder = 3 Then Var img_popup6 = "/img_popupSongkarn1.png" @@ -37,29 +37,33 @@ If PromotionIDCurrentOrder = 5 Then Var img_popup6 = "/img_popupPepsi1.png" EndIf - - + + 1000 - + Var CountDownBrewing = BREW_CNT - + Var ShowCountDownBrewing = CountDownBrewing DEBUGVAR Timeout + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf + Var Timeout = Timeout + 1 If Timeout > 5 Then Open "ROOT/taobin_project/xml/page_collect_point_1-3.xml" EndIf - + Refresh TimerReset - + @@ -88,13 +92,13 @@ Var( DirImage + "/bd_confirm.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + Open "ROOT/taobin_project/xml/page_collect_point_1-3.xml" - - + + @@ -132,10 +136,10 @@ - - - - Open "/media/bt/xml/security_alarm.xml" + + + + Open "/media/bt/xml/security_alarm.xml" If MachineStage = "drink-success" Then diff --git a/xml/page_collect_point_1-3.xml b/xml/page_collect_point_1-3.xml index 8e2e7585..79dc5c64 100644 --- a/xml/page_collect_point_1-3.xml +++ b/xml/page_collect_point_1-3.xml @@ -18,7 +18,7 @@ Var TimeOutPlay = 0 - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/collect_point1_en" ;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" @@ -51,7 +51,7 @@ Var CampaingRef1 = "" Var CampaingRef2 = "" - + SUBSTRING CampaingRef 0 6 CampaingRef1 SUBSTRING CampaingRef 12 18 CampaingRef2 @@ -60,14 +60,14 @@ Var ParamCP = ParamCP + CampaingRef1 - + If Seeker.TNumberTaobinCredit = "" Then - + If web_telnumOK = "" Then - If show_eng = "true" Then + If show_eng = "true" Then Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" Else Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3" @@ -78,7 +78,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -90,13 +90,13 @@ Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber - + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc - Var Param1 = TelephoneNumber + "/" + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP GETACCEXT Param1 23 - Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" EndIf Else @@ -106,7 +106,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -116,13 +116,13 @@ Var TelephoneNumberX = TelephoneNumber DEBUGVAR TelephoneNumber - + ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc - Var Param1 = TelephoneNumber + "/" + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP GETACCEXT Param1 23 - Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" EndIf @@ -133,7 +133,7 @@ Var text_x = "/text_4.png" EndIf - + If PromotionIDCurrentOrder = 3 Then Var text_x = "/text_3.png" @@ -146,24 +146,27 @@ 1000 - + Var CountDownBrewing = BREW_CNT - + Var ShowCountDownBrewing = CountDownBrewing - + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf + StrLen TelephoneNumber TelNumLen If TelNumLen > 0 Then Var ShowTextNumber = "Invisible" - + Else ; Add Var TimeOutPlay = TimeOutPlay + 1 If TimeOutPlay > 10 Then Var TimeOutPlay = 0 - If show_eng = "true" Then + If show_eng = "true" Then Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" Else Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3" @@ -172,18 +175,18 @@ ; EndIf - + DEBUGVAR Timeout Var Timeout = Timeout + 1 If Timeout > 30 Then SAVELOG "collect_point1-p107." - ;Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" - - Open "ROOT/taobin_project/xml/page_lid_straw.xml" + + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf If Timeout = 18 Then @@ -201,7 +204,7 @@ Refresh TimerReset - + @@ -229,13 +232,13 @@ "ROOT/taobin_project/image/collectiing/bp_1.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "1" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -245,9 +248,9 @@ TimerReset Refresh - - + + @@ -259,13 +262,13 @@ "ROOT/taobin_project/image/collectiing/bp_2.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "2" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -284,13 +287,13 @@ "ROOT/taobin_project/image/collectiing/bp_3.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "3" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -309,13 +312,13 @@ "ROOT/taobin_project/image/collectiing/bp_4.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "4" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -334,13 +337,13 @@ "ROOT/taobin_project/image/collectiing/bp_5.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "5" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -359,13 +362,13 @@ "ROOT/taobin_project/image/collectiing/bp_6.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "6" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -384,13 +387,13 @@ "ROOT/taobin_project/image/collectiing/bp_7.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "7" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -409,13 +412,13 @@ "ROOT/taobin_project/image/collectiing/bp_8.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "8" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -434,13 +437,13 @@ "ROOT/taobin_project/image/collectiing/bp_9.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "9" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -449,7 +452,7 @@ TimerReset Refresh - + @@ -460,13 +463,13 @@ "ROOT/taobin_project/image/collectiing/bp_0.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Var TelephoneNumber = TelephoneNumber + "0" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen - - If TelNumLen >= MinPhoneNumber Then + + If TelNumLen >= MinPhoneNumber Then Var Tel_Confirm_State = "Enable" EndIf @@ -485,24 +488,24 @@ "ROOT/taobin_project/image/collectiing/bp_back-1.png" "ROOT/sounds/codebuttom.wav" SoundVolume - + Var Timeout = 0 Trim TelephoneNumber -1 StrLen TelephoneNumber TelNumLen - If TelNumLen < 10 Then + If TelNumLen < 10 Then Var Tel_Confirm_State = "Invisible" EndIf - - - If TelNumLen = 0 Then + + + If TelNumLen = 0 Then Var ShowTextNumber = "Enable" EndIf TimerReset Refresh - + @@ -526,13 +529,13 @@ Var( DirImage + "/bp_negative2.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + ; goto lid straw - ;Open "ROOT/taobin_project/xml/page_catalog.xml" + ;Open "ROOT/taobin_project/xml/page_catalog.xml" SAVELOG "collect_point1-p589." - - + + Open "ROOT/taobin_project/xml/page_lid_straw.xml" @@ -547,18 +550,18 @@ Var( DirImage + "/bn_positive.png") "ROOT/sounds/codebuttom.wav" SoundVolume - + + - If Tel_Confirm_Flag = 1 Then Var Tel2DFlag = 0 TRY "ROOT/taobin_project/xml/verify_number.ev" - - + + @@ -569,7 +572,7 @@ Var StepGetPoint = 1 Var PdpaAsk = 0 - + Var OperatorTemp = "" Var CreditAmount = 0 Var OperatorStatus = "" @@ -580,19 +583,19 @@ ;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc DEBUGVAR TelephoneNumber - - Var Param1 = TelephoneNumber + "/" + + Var Param1 = TelephoneNumber + "/" Var Param1 = Param1 + ParamCP - - GETACCEXT Param1 23 - - ;Open "ROOT/taobin_project/xml/page_catalog.xml" - Open "ROOT/taobin_project/xml/page_collect_point_2.xml" - Else - If show_eng = "true" Then + GETACCEXT Param1 23 + + ;Open "ROOT/taobin_project/xml/page_catalog.xml" + Open "ROOT/taobin_project/xml/page_collect_point_2.xml" + Else + + If show_eng = "true" Then Var DirImage2 = "ROOT/taobin_project/image/collectiing_en" Else Var DirImage2 = "ROOT/taobin_project/image/collectiing" @@ -605,7 +608,7 @@ Var Tel_Confirm_State = "Invisible" Refresh - + EndIf @@ -676,11 +679,11 @@ ShowErrorText text_show_error - - - - Open "/media/bt/xml/security_alarm.xml" + + + + Open "/media/bt/xml/security_alarm.xml" If MachineStage = "drink-success" Then diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 87c36d38..4bcc436a 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -253,6 +253,10 @@ Var ShowCountDownBrewing = CountDownBrewing + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf + StrLen TelephoneNumber TelNumLen If TelNumLen > 0 Then diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index 8ffb3a9a..11443566 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -76,6 +76,10 @@ Var ShowCountDownBrewing = CountDownBrewing + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf + Var Timeout = Timeout + 1 If Timeout > 30 Then diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index da2f4e78..383a1ff1 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -35,7 +35,7 @@ DEBUGVAR TelephoneNumber DEBUGVAR TelephoneNumberX - If show_eng = "true" Then + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/display_point_en" Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" @@ -53,13 +53,13 @@ EndIf ;inter-image - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_point_mmr" Var TaobinLevelDesc3X = 380 Var TextEndDateY = 1580 EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var DirImage = "ROOT/taobin_project/image/display_point_msc" Var TaobinLevelDesc3X = 380 Var TextEndDateY = 1570 @@ -69,7 +69,7 @@ Var DirImageDoingInter = "ROOT/taobin_project/image/page_doing_inter/" Var IMG_CNT = DirImageDoingInter + "/bg_show_time_remaining.png" EndIf - + Var CoffeePointTmp = CoffeePoint If CoffeePoint > 29 Then @@ -77,11 +77,11 @@ Var CoffeePointTmp = 30 EndIf - - + + Var pImage = CoffeePointTmp * 20 Var pImage = pImage / 30 - Var pImageStr = "/taobinPoint.png" + Var pImageStr = "/taobinPoint.png" Var pImageStr = "ROOT/taobin_project/image/display_point" + pImageStr @@ -97,7 +97,7 @@ - + Var TaobinExpireDay = "" @@ -105,14 +105,14 @@ Var TaobinExpireMonthX = "" Var TaobinExpireYear = "" - + SPLIT TaobinExpire "/" 1 TaobinExpireDay SPLIT TaobinExpire "/" 2 TaobinExpireMonth SPLIT TaobinExpire "/" 3 TaobinExpireYear - If show_eng = "true" Then + If show_eng = "true" Then If TaobinExpireMonth = "01" Then Var TaobinExpireMonth = "Jan" @@ -179,7 +179,7 @@ Var TaobinExpireYear = TaobinExpireYear + 0 - Else + Else If TaobinExpireMonth = "01" Then Var TaobinExpireMonth = "ม.ค." @@ -248,7 +248,7 @@ EndIf - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then If TaobinExpireMonth = "01" Then Var TaobinExpireMonth = "Jan" Var TaobinExpireMonthX = "ဇန္နဝါရီလ" @@ -389,17 +389,17 @@ Var ExpireStrTmp = ExpireStrTmp + " " Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear - + If TaobinLevel = "1" Then Var PointMaskState = "Enable" EndIf - - If show_eng = "true" Then + + If show_eng = "true" Then Var TaobinLevelDesc3 = "You have coupons " Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons @@ -434,7 +434,7 @@ If TaobinLevel = "3" Then Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp - + Var PointDiff = 200 - CoffeePointRank Var TaobinLevelDesc2 = "Earn " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells " @@ -455,7 +455,7 @@ If TaobinLevel = "4" Then Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp - + Var TaobinLevelDesc2 = "" Var TaobinLeveImg = "/taoLevel4.png" @@ -519,7 +519,7 @@ If TaobinLevel = "4" Then Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า จนถึง " + ExpireStrTmp - + Var TaobinLevelDesc2 = "" Var TaobinLeveImg = "/taoLevel4.png" @@ -528,7 +528,7 @@ EndIf - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ " Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons @@ -561,7 +561,7 @@ If TaobinLevel = "3" Then Var TaobinLevelDesc1 = "ပျံသန်းသောလိပ်အဆင့်အထိ။ " + ExpireStrTmp - + Var PointDiff = 200 - CoffeePointRank Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ " @@ -582,7 +582,7 @@ If TaobinLevel = "4" Then Var TaobinLevelDesc1 = "ဆရာလိပ်အဆင့်အထိ။ " + ExpireStrTmp - + Var TaobinLevelDesc2 = "" Var TaobinLeveImg = "/taoLevel4.png" @@ -651,7 +651,7 @@ EndIf EndIf - + Var CheckCoupons = 0 Var MakeDrinkState = 0 @@ -907,31 +907,31 @@ Var CheckCouponState = "Disable" EndIf - + Var PointEndDate = "" GetDateEndOfMonth PointEndDate DEBUGVAR PointEndDate Var TextEndDateX = 172 Var xPointEndDate = 570 - If show_eng = "true" Then + If show_eng = "true" Then Var xPointEndDate = 618 EndIf ;inter-image - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var xPointEndDate = 490 Var TextEndDateX = 190 EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var xPointEndDate = 618 EndIf Var Point2XState = "Invisible" Var Point2XImage = "" - If Point2X = 1 Then - Var Point2XState = "Enable" + If Point2X = 1 Then + Var Point2XState = "Enable" If Seeker.CampaignPayChanel = "kbank" Then Var Point2XImage = "/text9.png" EndIf @@ -941,7 +941,7 @@ If Seeker.CampaignPayChanel = "dolfin" Then Var Point2XImage = "/text11.png" EndIf - + EndIf ;inter-from-consent @@ -952,29 +952,33 @@ ;inter-from-consent If CountryName = "Indonesia" Then Var Seeker.FromConsent = 0 - EndIf + EndIf ;inter-from-consent If CountryName = "Australia" Then Var Seeker.FromConsent = 0 - EndIf + EndIf ;inter-from-consent If CountryName = "Singapore" Then Var Seeker.FromConsent = 0 - EndIf + EndIf + - 1000 - + Var CountDownBrewing = BREW_CNT Var ShowCountDownBrewing = CountDownBrewing - + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf + + Var Timeout = Timeout + 1 If Timeout > 5 Then @@ -983,36 +987,36 @@ If CoffeePoint > 29 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else - If Seeker.FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else - + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf - + EndIf EndIf - + TimerReset Refresh - + - - - Open "/media/bt/xml/security_alarm.xml" + + + Open "/media/bt/xml/security_alarm.xml" If CheckCoupons = 1 Then Var MakeDrinkState = 1 - Var CouponPage = 1 + Var CouponPage = 1 Var CouponInfo1 = Ext1a Var CouponInfo2 = Ext1b Var CouponInfo3 = Ext1c @@ -1023,14 +1027,14 @@ Var CouponInfo8 = Ext1h Var CouponInfo9 = Ext1i Var CouponInfo10 = Ext1j - + Var TelephoneNumber = TelephoneNumberX GETACCEXT TelephoneNumber 13 - Var CheckCoupons = 2 + Var CheckCoupons = 2 Else - If CheckCoupons = 2 Then + If CheckCoupons = 2 Then Var TaobinCredit = Ext1b @@ -1051,15 +1055,15 @@ Else - Open "ROOT/taobin_project/xml/page_check_member2.xml" + Open "ROOT/taobin_project/xml/page_check_member2.xml" EndIf EndIf - + EndIf - + @@ -1147,10 +1151,10 @@ Var( DirImage + "/bp_close.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; goto lid straw ;Open "ROOT/taobin_project/xml/page_back_to_main.xml" - If Seeker.FromConsent = 1 Then + If Seeker.FromConsent = 1 Then Open "ROOT/taobin_project/xml/page_display_get_free.xml" Else If CoffeePoint > 29 Then @@ -1158,7 +1162,7 @@ EndIf - + Open "ROOT/taobin_project/xml/page_lid_straw.xml" EndIf @@ -1176,7 +1180,7 @@ Var( DirImage + "/bp_check.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + ; goto lid straw @@ -1184,7 +1188,7 @@ Var TelephoneNumber = TelephoneNumberX GETACCEXT TelephoneNumber 15 Var CheckCoupons = 1 - + @@ -1570,4 +1574,3 @@ - \ No newline at end of file diff --git a/xml/page_collect_point_3_28.xml b/xml/page_collect_point_3_28.xml index c87e99d5..ab68fb01 100644 --- a/xml/page_collect_point_3_28.xml +++ b/xml/page_collect_point_3_28.xml @@ -42,12 +42,12 @@ EndIf ;inter-image - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_point_mmr/" Var TextEndDateY = 1570 EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var DirImage = "ROOT/taobin_project/image/display_point_msc/" Var TextEndDateY = 1570 EndIf @@ -227,7 +227,7 @@ EndIf - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then If TaobinExpireMonth = "01" Then Var TaobinExpireMonth = "Jan" Var TaobinExpireMonthX = "ဇန္နဝါရီလ" @@ -506,7 +506,7 @@ EndIf - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var TaobinLevelDesc3 = "သင့်တွင် ကူပွန်များရှိသည်။ " Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons @@ -539,7 +539,7 @@ If TaobinLevel = "3" Then Var TaobinLevelDesc1 = "ပျံသန်းသောလိပ်အဆင့်အထိ။ " + ExpireStrTmp - + Var PointDiff = 200 - CoffeePointRank Var TaobinLevelDesc2 = "ပိုစုဆောင်းပါ။ " + PointDiff Var TaobinLevelDesc2 = TaobinLevelDesc2 + " လိပ်ခွံ " @@ -560,7 +560,7 @@ If TaobinLevel = "4" Then Var TaobinLevelDesc1 = "ဆရာလိပ်အဆင့်အထိ။ " + ExpireStrTmp - + Var TaobinLevelDesc2 = "" Var TaobinLeveImg = "/taoLevel4.png" @@ -934,15 +934,15 @@ Var xPointEndDate = 575 Var yPointEndDate = 1563 EndIf - + ;inter-image - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var xPointEndDate = 520 Var yPointEndDate = 1568 Var xDescEndDate = 265 EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var xPointEndDate = 420 Var yPointEndDate = 1563 Var TaobinLevelDesc3X = 410 @@ -958,6 +958,10 @@ Var ShowCountDownBrewing = CountDownBrewing + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf + Var Timeout = Timeout + 1 diff --git a/xml/page_collect_point_3_28_lucky_draw_campaign.xml b/xml/page_collect_point_3_28_lucky_draw_campaign.xml index ba5319ee..0bab64ba 100644 --- a/xml/page_collect_point_3_28_lucky_draw_campaign.xml +++ b/xml/page_collect_point_3_28_lucky_draw_campaign.xml @@ -1057,6 +1057,10 @@ Var ShowCountDownBrewing = CountDownBrewing + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf + Var Timeout = Timeout + 1 diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml index 4a6888c6..1fcad825 100644 --- a/xml/page_display_get_free.xml +++ b/xml/page_display_get_free.xml @@ -25,11 +25,11 @@ EndIf ;inter-image - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var DirImage = "ROOT/taobin_project/image/display_get_free_mmr" EndIf - - If LanguageShow = "MSC" Then + + If LanguageShow = "MSC" Then Var DirImage = "ROOT/taobin_project/image/display_get_free_msc" EndIf @@ -94,7 +94,9 @@ Var ShowCountDownBrewing = CountDownBrewing - + If FrontDoorVersionInt > 19999 Then + TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + EndIf Var Timeout = Timeout + 1 If Timeout > 5 Then diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index 00478ee1..da1b533c 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -318,6 +318,11 @@ Var ShowNameMysteryName = Seeker.shownameMystery EndIf + If FrontDoorVersionInt > 19999 Then + LEDv4Playlist "reset" "-" "-" + TRY "ROOT/taobin_project/xml/process/temp_ledv4_page_drinkok.ev" + EndIf + 500 diff --git a/xml/page_test_color.xml b/xml/page_test_color.xml index 5100bb25..be8de5c5 100644 --- a/xml/page_test_color.xml +++ b/xml/page_test_color.xml @@ -225,6 +225,7 @@ SoundVolume "No" +Var Timeout = 0 If RedButtonState = "Enable" Then Var RedButtonState = "Press" @@ -264,6 +265,7 @@ SoundVolume "No" +Var Timeout = 0 If BlueButtonState = "Enable" Then Var RedButtonState = "Enable" Var BlueButtonState = "Press" @@ -301,6 +303,7 @@ SoundVolume "No" +Var Timeout = 0 If OrangeButtonState = "Enable" Then Var RedButtonState = "Enable" Var BlueButtonState = "Enable" @@ -338,6 +341,7 @@ SoundVolume "No" +Var Timeout = 0 If IndigoButtonState = "Enable" Then Var RedButtonState = "Enable" Var BlueButtonState = "Enable" @@ -375,6 +379,7 @@ SoundVolume "No" +Var Timeout = 0 If YellowButtonState = "Enable" Then Var RedButtonState = "Enable" Var BlueButtonState = "Enable" @@ -412,6 +417,7 @@ SoundVolume "No" +Var Timeout = 0 If VioletButtonState = "Enable" Then Var RedButtonState = "Enable" Var BlueButtonState = "Enable" @@ -449,6 +455,7 @@ SoundVolume "No" +Var Timeout = 0 If GreenButtonState = "Enable" Then Var RedButtonState = "Enable" Var BlueButtonState = "Enable" @@ -485,6 +492,7 @@ SoundVolume "No" +Var Timeout = 0 If WhiteButtonState = "Enable" Then Var RedButtonState = "Enable" Var BlueButtonState = "Enable" @@ -511,49 +519,6 @@ - - + + 0 + 22 + 560 + 142 + EnableElockFromXML + + + + + 0 + 22 + 560 + 142 + EnableElockByCMD + + +