diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 30037ebc..90b740d3 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -968,3 +968,17 @@ tokyo banana ginger tea 12-02-02-0053 1 56 10 23 24 120 0:00 23 tokyo banana thai milk tea 12-02-02-0054 1 56 6 10 23 24 120 1:00 23 tokyo banana matcha 12-02-02-0055 1 56 9 23 24 120 2:00 23 tokyo banana power drink soda 12-05-02-0078 1 56 34 13 23 24 120 3:00 23 + + + +เป๊ปดาโน่ 12-01-02-0056 1 2 3 4 5 23 14 13 24 120 3:00 23 +เป๊ปดาโน่ 12-21-02-0056 1 2 3 4 5 23 14 13 24 120 4:00 23 +ICED COCOA STRAW BANANA MILK 12-03-02-0040 1 56 19 15 6 23 24 120 5:00 23 +ICED MINT CARAMEL MILK 12-03-02-0041 1 59 22 6 23 24 120 6:00 23 +CARAMEL PLUM MILK SOOTIE 12-03-03-0046 1 22 6 33 23 24 120 7:00 23 +CARAMEL STRAW MILK SMOOTHIE 12-03-03-0047 1 22 19 6 23 24 120 8:00 23 +ICED LYCHEE SALAK 12-05-02-0080 1 21 11 23 24 120 9:00 23 +STRAW YUZU SMOOTHIE 12-05-03-0063 1 19 53 23 41 24 120 10:00 23 +STRAW LYCHEE SMOOTHIE 12-05-03-0064 1 19 11 23 41 24 120 11:00 23 +ICED STRAW LYCHEE THAI TEA 12-02-02-0056 1 19 11 10 23 24 120 12:00 23 +วันนี้ร้อนเกินไป 12-05-02-0084 1 14 21 11 23 13 24 120 13:00 23 diff --git a/inc/video.inc b/inc/video.inc index b7552715..b7432be8 100644 --- a/inc/video.inc +++ b/inc/video.inc @@ -8,15 +8,7 @@ If showMultiAds = "true" Then - SPLIT XMLLiveInfo "/" 1 AdvDisplayMode - SPLIT XMLLiveInfo "/" 2 CurrentTotalCup - - DEBUGVAR AdvDisplayMode - DEBUGVAR CurrentTotalCup - - DEBUGVAR PreviousFileName - DEBUGVAR CurrentXMLFileName2 - + If PreviousFileName = "" Then Var PreviousFileName = PreviseXMLFileName2 EndIf @@ -30,7 +22,6 @@ Var ads_idx = ads_idx + 1 EndIf - DEBUGVAR ads_idx If ads_idx = 30 Then Var ads_idx = 0 @@ -46,6 +37,7 @@ Else + DEBUGVAR a_video_menu[ads_idx] Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var DisplayAds = AdvTaobinMenu + ".mp4" EndIf diff --git a/xml/multi_ads/ads_path.ev b/xml/multi_ads/ads_path.ev index 8379dcef..e5790cde 100644 --- a/xml/multi_ads/ads_path.ev +++ b/xml/multi_ads/ads_path.ev @@ -12,6 +12,11 @@ SAVELOG "ADS_MULT_PATH" ; init Var DisplayAds = video_menu_0 +Var video_main_count = 1 +Var video_menu_0 = "00" +Var video_menu2_1 = "00" + + If XMLLiveInfo = "" Then Var showMultiAds = "false" @@ -61,7 +66,7 @@ If XMLLiveInfo = "" Then EndIf EndIf - + If VideoAdvIndex = 0 Then Var video_menu_0 = AdvertiseProfile7 Var video_menu2_1 = AdvertiseProfile7 @@ -177,6 +182,9 @@ Else DEBUGVAR a_video_menu[18] DEBUGVAR a_video_menu[0] + + SPLIT XMLLiveInfo "/" 1 AdvDisplayMode + SPLIT XMLLiveInfo "/" 2 CurrentTotalCup EndIf diff --git a/xml/page_board.xml b/xml/page_board.xml index 7ab8451b..83816a3f 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1275,8 +1275,6 @@ EndIf - ;DEBUGVAR CupOnArm - ;Var CupOnArm = "true" If CupOnArm = "true" Then diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index 692f7166..28b1be4e 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -994,6 +994,9 @@ VideoPlayFile +;include="ROOT/taobin_project/inc/video.inc" + + ; ; 0 ; 0 diff --git a/xml/page_check_member3.xml b/xml/page_check_member3.xml index f5fd528f..f3e3d2f1 100644 --- a/xml/page_check_member3.xml +++ b/xml/page_check_member3.xml @@ -77,24 +77,12 @@ EndIf -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; ;include="ROOT/taobin_project/inc/video.inc" - - - - - - - ; diff --git a/xml/page_drink_stuck.xml b/xml/page_drink_stuck.xml index bac84fc0..e93fcbf8 100644 --- a/xml/page_drink_stuck.xml +++ b/xml/page_drink_stuck.xml @@ -341,11 +341,6 @@ EndIf -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; ;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index 62a76a5d..9deb6be8 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -158,7 +158,6 @@ Var LidState = Lid1Status ;Lid1Status Var StarwState = "Enable" - Var LidStrawCountDown = 15 If Lid1Status = "Disable" Then @@ -211,237 +210,10 @@ EndIf - Var LidStrawCountDown = LidStrawCountDown - 1 - - ; count down - If LidStrawCountDown = 1 Then - Var LidStrawCountDown = 10 - If StarwState = "Press" Then - Machine Straw - EndIf - If LidState = "Press" Then - Machine Lid - EndIf - If InternationalEnable = 1 Then - Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml" - Open Brew3Inter - Else - Open "ROOT/taobin_project/xml/page_brewing3.xml" - EndIf - EndIf - - Var ShowCountDownBrewing = CountDownBrewing - - ; animation video loop - If AnimationOn = "true" Then - Var CountUpBrewing = CountUpBrewing + 1 - - Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime - If CountUpBrewing < 4 Then - - Else - - If PreviseStepVideo = SlotVideo Then - ;SAVELOG SlotVideo - Else - Var PreviseStepVideo = SlotVideo - ;SAVELOG PreviseStepVideo - ;SAVELOG SlotVideo - ;SAVELOG CountUpBrewing - - ;Var CountDownVideoTime = CountDownVideoTimeReload - - Var StepVideo = SlotVideo + 2 - - ;SAVELOG StepVideo - - If StepVideo = 1 Then - Var videoID = VideoID1 - EndIf - If StepVideo = 2 Then - Var videoID = VideoID2 - EndIf - If StepVideo = 3 Then - Var videoID = VideoID3 - EndIf - If StepVideo = 4 Then - Var videoID = VideoID4 - EndIf - If StepVideo = 5 Then - Var videoID = VideoID5 - EndIf - If StepVideo = 6 Then - Var videoID = VideoID6 - EndIf - If StepVideo = 7 Then - Var videoID = VideoID7 - EndIf - - ;SAVELOG videoID - - If videoID = 0 Then - - Else - If videoID = "---" Then - - Else - - Var VideoPlayFile = VideoPath - Var VideoPlayFile = VideoPlayFile + VideoFileBegin - Var VideoPlayFile = VideoPlayFile + videoID - Var VideoPlayFile = VideoPlayFile + VideoFileEnd - - Var PictureFile = PicturePath - Var PictureFile = PictureFile + PictureBegin - Var PictureFile = PictureFile + videoID - Var PictureFile = PictureFile + PictureEnd - - SAVELOG VideoPlayFile - SAVELOG PictureFile - EndIf - EndIf - EndIf - EndIf - EndIf - - If StrawAutoRelease1 = "true" Then - Var StrawAutoRelease1 = "false" - Var StarwState = "Press" - EndIf - Refresh TimerReset - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - -;include="ROOT/taobin_project/inc/video.inc" - - - - - 0 - 1289 - Var( DirImage + "/text2.png" ) - - - - - 78 - 1425 - lid_straw_bg_iamge - - - - - - -; starw left - - -; lid left - - - - - - - - - +; remove by kong ; optimize new step advertise diff --git a/xml/page_payment.xml b/xml/page_payment.xml index ec5ec9fc..cf04f8ad 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -6,6 +6,7 @@ ; On open + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml" ;Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml" diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 0bc89f5c..0a788f74 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -2305,15 +2305,7 @@ ; - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_credit.xml b/xml/page_payment_credit.xml index a33be64d..958a3a3b 100644 --- a/xml/page_payment_credit.xml +++ b/xml/page_payment_credit.xml @@ -623,22 +623,7 @@ Var( DirImage + "/text_show_error5.png") - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_credit2.xml b/xml/page_payment_credit2.xml index 1f6de915..8db90c17 100644 --- a/xml/page_payment_credit2.xml +++ b/xml/page_payment_credit2.xml @@ -907,22 +907,7 @@ - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_credit3-0.xml b/xml/page_payment_credit3-0.xml index 7eb0fc69..1da3339d 100644 --- a/xml/page_payment_credit3-0.xml +++ b/xml/page_payment_credit3-0.xml @@ -227,14 +227,8 @@ Var( DirImage + "/text_show_notOperate.png") - +;include="ROOT/taobin_project/inc/video.inc" + Open "/media/bt/xml/security_alarm.xml" diff --git a/xml/page_payment_credit3-1.xml b/xml/page_payment_credit3-1.xml index 54f7ffce..409f7159 100644 --- a/xml/page_payment_credit3-1.xml +++ b/xml/page_payment_credit3-1.xml @@ -181,17 +181,8 @@ +;include="ROOT/taobin_project/inc/video.inc" - - - Open "/media/bt/xml/security_alarm.xml" diff --git a/xml/page_payment_credit3-Topup.xml b/xml/page_payment_credit3-Topup.xml index cacb8ce3..249861b3 100644 --- a/xml/page_payment_credit3-Topup.xml +++ b/xml/page_payment_credit3-Topup.xml @@ -719,21 +719,7 @@ If ViewBill > 0 Then -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_credit3-TopupCash.xml b/xml/page_payment_credit3-TopupCash.xml index dfd0fed9..ccfbb832 100644 --- a/xml/page_payment_credit3-TopupCash.xml +++ b/xml/page_payment_credit3-TopupCash.xml @@ -615,16 +615,8 @@ TimerReset +;include="ROOT/taobin_project/inc/video.inc" - - Open "/media/bt/xml/security_alarm.xml" diff --git a/xml/page_payment_credit3-TopupCode.xml b/xml/page_payment_credit3-TopupCode.xml index 305229cb..f181796d 100644 --- a/xml/page_payment_credit3-TopupCode.xml +++ b/xml/page_payment_credit3-TopupCode.xml @@ -705,21 +705,7 @@ TextWaiting - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_credit3-TopupQR.xml b/xml/page_payment_credit3-TopupQR.xml index db06ce23..8baee2d4 100644 --- a/xml/page_payment_credit3-TopupQR.xml +++ b/xml/page_payment_credit3-TopupQR.xml @@ -211,15 +211,9 @@ If ViewBill > 0 Then Var( DirImage + "/img_popup20-Failed.png" ) - - +;include="ROOT/taobin_project/inc/video.inc" + + Open "/media/bt/xml/security_alarm.xml" diff --git a/xml/page_payment_credit3-TopupSuccess.xml b/xml/page_payment_credit3-TopupSuccess.xml index 90767d2f..519cce98 100644 --- a/xml/page_payment_credit3-TopupSuccess.xml +++ b/xml/page_payment_credit3-TopupSuccess.xml @@ -121,17 +121,9 @@ +;include="ROOT/taobin_project/inc/video.inc" - - 70 741 diff --git a/xml/page_payment_credit3.xml b/xml/page_payment_credit3.xml index 6fbbf494..a87ab665 100644 --- a/xml/page_payment_credit3.xml +++ b/xml/page_payment_credit3.xml @@ -418,24 +418,7 @@ - - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_multi.xml b/xml/page_payment_multi.xml index 80273dfb..29ebe6c3 100644 --- a/xml/page_payment_multi.xml +++ b/xml/page_payment_multi.xml @@ -312,22 +312,7 @@ Refresh - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml index fa80c1a5..fc3f4e15 100644 --- a/xml/page_payment_storeCredit.xml +++ b/xml/page_payment_storeCredit.xml @@ -606,15 +606,7 @@ - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_storeCredit0.xml b/xml/page_payment_storeCredit0.xml index 43b10152..9edf7cd7 100644 --- a/xml/page_payment_storeCredit0.xml +++ b/xml/page_payment_storeCredit0.xml @@ -156,22 +156,7 @@ - - - - - - - - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_storeCredit2-2.xml b/xml/page_payment_storeCredit2-2.xml index b1d7a254..139214d2 100644 --- a/xml/page_payment_storeCredit2-2.xml +++ b/xml/page_payment_storeCredit2-2.xml @@ -841,23 +841,7 @@ - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_storeCredit2.xml b/xml/page_payment_storeCredit2.xml index 8ed8f93e..96534da9 100644 --- a/xml/page_payment_storeCredit2.xml +++ b/xml/page_payment_storeCredit2.xml @@ -756,22 +756,7 @@ - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml index ef3e4e34..36c37ffd 100644 --- a/xml/page_payment_storeCredit3.xml +++ b/xml/page_payment_storeCredit3.xml @@ -182,22 +182,7 @@ - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - - - +;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml index efc5fa2c..5dc6812c 100644 --- a/xml/page_show_consent.xml +++ b/xml/page_show_consent.xml @@ -151,13 +151,6 @@ - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - ;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_show_consent2.xml b/xml/page_show_consent2.xml index 5608775a..a556118b 100644 --- a/xml/page_show_consent2.xml +++ b/xml/page_show_consent2.xml @@ -173,14 +173,6 @@ - - -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; - ;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_show_point.xml b/xml/page_show_point.xml index 211441f8..9a04154f 100644 --- a/xml/page_show_point.xml +++ b/xml/page_show_point.xml @@ -38,11 +38,6 @@ -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; ;include="ROOT/taobin_project/inc/video.inc" diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 9e4fcf63..8d1d4d25 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -432,12 +432,6 @@ TimerReset -; -; 0 -; 0 -; "ROOT/taobin_project/image/ad_medium_2.png" -; -