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

WTC+SGP: fix whatthecup thankyou video

Browse source
This commit is contained in:
Pakin 2024-12-03 16:03:22 +07:00
parent 2f017d5812
commit 84f6ac12ae
4 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inter/sgp/video/script_thank.ev
View file

@ -16,7 +16,7 @@ If UsePepsiTheme = 1 Then
; expect-wtc ; expect-wtc
GetFileSizeK "taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" MainfileSize GetFileSizeK "taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" MainfileSize
DEBUGVAR MainfileSize DEBUGVAR MainfileSize
If MainfileSize = 5184722 Then If MainfileSize = 5208802 Then
Var video_file_name = "ROOT/taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" Var video_file_name = "ROOT/taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4"
EndIf EndIf

13
inter/sgp/xml/page_remove_cup.lxml
View file

@ -21,7 +21,7 @@
EndIf EndIf
Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/" Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
LED LedDoorDoor 5 255 255 255 255 LED LedDoorDoor 5 255 255 255 255
Var CheckCupStateDoorCupClose = "" Var CheckCupStateDoorCupClose = ""
@ -35,7 +35,7 @@
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
;SAVELOG MachineErrorDetail ;SAVELOG MachineErrorDetail
Var MachineErrorDetailAll = MachineErrorDetailEng Var MachineErrorDetailAll = MachineErrorDetailEng
@ -59,9 +59,9 @@
EndIf EndIf
EndIf EndIf
; Logic have differrent drinkfail3.xml ; Logic have differrent drinkfail3.xml
; protect lock ; protect lock
; ;
If CheckCupStateDoorCupCloseCnt > 0 Then If CheckCupStateDoorCupCloseCnt > 0 Then
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1 Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
@ -120,7 +120,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
@ -138,6 +138,7 @@
</Language> </Language>
</Button> </Button>
;include="ROOT/taobin_project/inc/video.inc"
<Text> <Text>
<X> 5 </X> <X> 5 </X>

BIN
inter/whatthecup/common/video/wtc_thankyou.mp4
View file

Binary file not shown.

24
inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml
View file

@ -11,10 +11,12 @@
Var countClick2 = 0 Var countClick2 = 0
Var CountryName = "Singapore" Var CountryName = "Singapore"
Var OnPageRemoveCup = 1
DEBUGVAR "SGP Remove Cup" DEBUGVAR "SGP Remove Cup"
READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_0" CurrPageInst0
READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_2" CurrPageInst2
Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/" Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
@ -22,7 +24,7 @@
Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/" Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/"
EndIf EndIf
LED LedDoorDoor 5 255 255 255 255 LED LedDoorDoor 5 255 255 255 255
Var CheckCupStateDoorCupClose = "" Var CheckCupStateDoorCupClose = ""
@ -33,10 +35,18 @@
Var buttonRemoveCup = "Enable" Var buttonRemoveCup = "Enable"
EndIf EndIf
DEBUGVAR CurrPageInst0
DEBUGVAR CurrPageInst2
Var HeadVideoFilename = DefaultLargeBanner
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
DEBUGVAR CurrPageInst0
DEBUGVAR CurrPageInst2
;SAVELOG MachineErrorDetail ;SAVELOG MachineErrorDetail
Var MachineErrorDetailAll = MachineErrorDetailEng Var MachineErrorDetailAll = MachineErrorDetailEng
@ -60,9 +70,9 @@
EndIf EndIf
EndIf EndIf
; Logic have differrent drinkfail3.xml ; Logic have differrent drinkfail3.xml
; protect lock ; protect lock
; ;
If CheckCupStateDoorCupCloseCnt > 0 Then If CheckCupStateDoorCupCloseCnt > 0 Then
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1 Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
@ -121,7 +131,7 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup