diff --git a/inter/sgp/video/script_thank.ev b/inter/sgp/video/script_thank.ev index 9720d898..bf47f804 100644 --- a/inter/sgp/video/script_thank.ev +++ b/inter/sgp/video/script_thank.ev @@ -16,7 +16,7 @@ If UsePepsiTheme = 1 Then ; expect-wtc GetFileSizeK "taobin_project/inter/whatthecup/common/video/wtc_thankyou.mp4" 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" EndIf diff --git a/inter/sgp/xml/page_remove_cup.lxml b/inter/sgp/xml/page_remove_cup.lxml index 2945326d..a2af4869 100644 --- a/inter/sgp/xml/page_remove_cup.lxml +++ b/inter/sgp/xml/page_remove_cup.lxml @@ -21,7 +21,7 @@ EndIf Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/" - + LED LedDoorDoor 5 255 255 255 255 Var CheckCupStateDoorCupClose = "" @@ -35,7 +35,7 @@ 1000 - + ;SAVELOG MachineErrorDetail Var MachineErrorDetailAll = MachineErrorDetailEng @@ -59,9 +59,9 @@ EndIf EndIf - ; Logic have differrent drinkfail3.xml - ; protect lock - ; + ; Logic have differrent drinkfail3.xml + ; protect lock + ; If CheckCupStateDoorCupCloseCnt > 0 Then Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1 @@ -120,7 +120,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume buttonRemoveCup - + Machine RemoveCup @@ -138,6 +138,7 @@ +;include="ROOT/taobin_project/inc/video.inc" 5 diff --git a/inter/whatthecup/common/video/wtc_thankyou.mp4 b/inter/whatthecup/common/video/wtc_thankyou.mp4 index 52a5ea4c..6c55f5c1 100644 Binary files a/inter/whatthecup/common/video/wtc_thankyou.mp4 and b/inter/whatthecup/common/video/wtc_thankyou.mp4 differ diff --git a/inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml b/inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml index 8771e0a5..0631cf56 100644 --- a/inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml +++ b/inter/whatthecup/sgp/xml/page_remove_cup-SGP_blue.lxml @@ -11,10 +11,12 @@ Var countClick2 = 0 Var CountryName = "Singapore" + Var OnPageRemoveCup = 1 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/" @@ -22,7 +24,7 @@ Var DirImage = "ROOT/taobin_project/inter/whatthecup/sgp/image/collectiing_en/" EndIf - + LED LedDoorDoor 5 255 255 255 255 Var CheckCupStateDoorCupClose = "" @@ -33,10 +35,18 @@ Var buttonRemoveCup = "Enable" EndIf + DEBUGVAR CurrPageInst0 + DEBUGVAR CurrPageInst2 + + Var HeadVideoFilename = DefaultLargeBanner + 1000 - + + DEBUGVAR CurrPageInst0 + DEBUGVAR CurrPageInst2 + ;SAVELOG MachineErrorDetail Var MachineErrorDetailAll = MachineErrorDetailEng @@ -60,9 +70,9 @@ EndIf EndIf - ; Logic have differrent drinkfail3.xml - ; protect lock - ; + ; Logic have differrent drinkfail3.xml + ; protect lock + ; If CheckCupStateDoorCupCloseCnt > 0 Then Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1 @@ -121,7 +131,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume buttonRemoveCup - + Machine RemoveCup