pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Convert to new step adv

Browse source
This commit is contained in:
wanlop run 2024-02-27 21:53:17 +07:00
parent 6291622e02
commit f4584099bc
30 changed files with 50 additions and 509 deletions
Download patch file Download diff file Expand all files Collapse all files

14
animation01/play_list.tsv
View file

@ -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

Can't render this file because it has a wrong number of fields in line 40.

10
inc/video.inc
View file

@ -8,14 +8,6 @@
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
@ -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

8
xml/multi_ads/ads_path.ev
View file

@ -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"
@ -177,6 +182,9 @@ Else
DEBUGVAR a_video_menu[18]
DEBUGVAR a_video_menu[0]
SPLIT XMLLiveInfo "/" 1 AdvDisplayMode
SPLIT XMLLiveInfo "/" 2 CurrentTotalCup
EndIf

2
xml/page_board.xml
View file

@ -1275,8 +1275,6 @@
EndIf
;DEBUGVAR CupOnArm
;Var CupOnArm = "true"
If CupOnArm = "true" Then

3
xml/page_brewing3Conti.xml
View file

@ -994,6 +994,9 @@
<Filename> VideoPlayFile </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>

12
xml/page_check_member3.xml
View file

@ -77,24 +77,12 @@
EndIf
</EventMachine>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"
;

5
xml/page_drink_stuck.xml
View file

@ -341,11 +341,6 @@
EndIf
</EventChangeStatus>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"

230
xml/page_lid_straw.xml
View file

@ -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
</EventTimeout>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"
<Video>
<X> 0 </X>
<Y> 380 </Y>
<Width> 1080</Width>
<Height> 840 </Height>
<Refresh> "Reload" </Refresh>
<Loop> "true" </Loop>
<Filename> VideoPlayFile </Filename>
</Video>
<Image>
<X> 0 </X>
<Y> 1289 </Y>
<Filename> Var( DirImage + "/text2.png" ) </Filename>
</Image>
<Image>
<X> 78 </X>
<Y> 1425 </Y>
<Filename> lid_straw_bg_iamge </Filename>
</Image>
<Button>
<X> 750 </X>
<Y> 1783 </Y>
<Filename> Var( DirImage + "/bn_ok.png" )</Filename>
<FilenamePress> Var( DirImage + "/bn_ok.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If StarwState = "Press" Then
Machine Straw
LED LedDoorLid Blink 255 255 255 255
EndIf
If LidState = "Press" Then
Machine Lid
LED LedDoorLid Blink 255 255 255 255
EndIf
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
</EventClick>
</Button>
; starw left
<Button>
<X> 126 </X>
<Y> 1474 </Y>
<State> StarwState </State>
<Filename> "ROOT/taobin_project/image/page_lid_straw/bn_straw.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_lid_straw/bp_straw.png" </FilenamePress>
<EventClick>
</EventClick>
</Button>
; lid left
<Button>
<X> 126 </X>
<Y> 1584 </Y>
<State> LidState </State>
<Filename> "ROOT/taobin_project/image/page_lid_straw/bn_lid.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_lid_straw/bp_lid.png" </FilenamePress>
<EventClick>
</EventClick>
</Button>
<Button>
<X> 901 </X>
<Y> 1494 </Y>
<Width> 50 </Width>
<Height> 50 </Height>
<State> StarwState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/page_lid_straw/cb_straw_nch.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_lid_straw/cb_straw_ch.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG StarwState
If StarwState = "Press" Then
Var StarwState = "Enable"
Else
Var StarwState = "Press"
EndIf
Refresh
</EventClick>
</Button>
<Button>
<X> 901 </X>
<Y> 1604 </Y>
<Width> 50 </Width>
<Height> 50 </Height>
<State> LidState </State>
<Mode> "No" </Mode>
<Filename> "ROOT/taobin_project/image/page_lid_straw/cb_lid_nch.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/page_lid_straw/cb_lid_ch.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG LidState
If LidState = "Press" Then
Var LidState = "Enable"
Else
Var LidState = "Press"
EndIf
Refresh
</EventClick>
</Button>
; remove by kong ; optimize new step advertise

1
xml/page_payment.xml
View file

@ -6,6 +6,7 @@
<EventOpen>
; On open
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
;Open "ROOT/taobin_project/xml/page_display_ExclusiveGift.xml"

10
xml/page_payment_cash.xml
View file

@ -2305,15 +2305,7 @@
;
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"

17
xml/page_payment_credit.xml
View file

@ -623,22 +623,7 @@
<Filename> Var( DirImage + "/text_show_error5.png") </Filename>
</Image>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>

17
xml/page_payment_credit2.xml
View file

@ -907,22 +907,7 @@
</Image>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"

10
xml/page_payment_credit3-0.xml
View file

@ -227,14 +227,8 @@
<Filename> Var( DirImage + "/text_show_notOperate.png") </Filename>
</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"

11
xml/page_payment_credit3-1.xml
View file

@ -181,16 +181,7 @@
</Button>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"

16
xml/page_payment_credit3-Topup.xml
View file

@ -719,21 +719,7 @@ If ViewBill > 0 Then
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<Text>

10
xml/page_payment_credit3-TopupCash.xml
View file

@ -615,15 +615,7 @@ TimerReset
</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"

16
xml/page_payment_credit3-TopupCode.xml
View file

@ -705,21 +705,7 @@
<Value> TextWaiting </Value>
</Text>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"

10
xml/page_payment_credit3-TopupQR.xml
View file

@ -211,14 +211,8 @@ If ViewBill > 0 Then
<Filename> Var( DirImage + "/img_popup20-Failed.png" ) </Filename>
</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"

10
xml/page_payment_credit3-TopupSuccess.xml
View file

@ -121,17 +121,9 @@
</EventActionError>
;include="ROOT/taobin_project/inc/video.inc"
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
<Image>
<X> 70 </X>
<Y> 741 </Y>

19
xml/page_payment_credit3.xml
View file

@ -418,24 +418,7 @@
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>

17
xml/page_payment_multi.xml
View file

@ -312,22 +312,7 @@
Refresh
</EventTimeout>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<Image>

10
xml/page_payment_storeCredit.xml
View file

@ -606,15 +606,7 @@
</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"

17
xml/page_payment_storeCredit0.xml
View file

@ -156,22 +156,7 @@
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"

18
xml/page_payment_storeCredit2-2.xml
View file

@ -841,23 +841,7 @@
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>

17
xml/page_payment_storeCredit2.xml
View file

@ -756,22 +756,7 @@
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"

17
xml/page_payment_storeCredit3.xml
View file

@ -182,22 +182,7 @@
</Text>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>
<X> 0 </X>
<Y> 0 </Y>
<Width> 1080</Width>
<Height> 380 </Height>
<Loop> "true" </Loop>
<Filename> video_menu_0 </Filename>
</Video>
;include="ROOT/taobin_project/inc/video.inc"
<EventSecurity>

7
xml/page_show_consent.xml
View file

@ -151,13 +151,6 @@
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"

8
xml/page_show_consent2.xml
View file

@ -173,14 +173,6 @@
</Button>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"

5
xml/page_show_point.xml
View file

@ -38,11 +38,6 @@
</EventMachine>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
;include="ROOT/taobin_project/inc/video.inc"

6
xml/page_thankyou.xml
View file

@ -432,12 +432,6 @@
TimerReset
</EventTimeout>
;<Image>
;<X> 0 </X>
;<Y> 0 </Y>
;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
;</Image>
<Video>