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

WTC+SGP: fix soda ginger menu pic, banner & QR

Browse source
This commit is contained in:
Pakin 2024-09-25 10:10:45 +07:00
parent d5ca231b2d
commit 068788bf1e
13 changed files with 68 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

117
inc/video.inc
View file

@ -8,6 +8,17 @@
READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_0" CurrPageInst0
Var DefaultLargeBanner = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_"　+ a_video_menu[ads_idx]
Var DefaultNormBanner = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_"　+ a_video_menu[ads_idx]
If UsePepsiTheme = 1 Then
Var PepsiLargeBanner = "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/common/adv/wtc_banner"
Var PepsiNormBanner = "/mnt/sdcard/coffeevending/taobin_project/inter/whatthecup/common/adv/wtc_banner_menu"
Var DefaultLargeBanner = PepsiLargeBanner
Var DefaultNormBanner = PepsiNormBanner
EndIf
If showMultiAds = "true" Then
@ -43,36 +54,28 @@
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrentXMLFileName2 = "" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
@ -119,43 +122,51 @@
DEBUGVAR PreviseXMLFileName2
DEBUGVAR CurrPageInst0
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml" Then
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrentXMLFileName2 = "" Then
DEBUGVAR CountDownPauseVideo2
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
DEBUGVAR CurrentXMLFileName2
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
@ -216,36 +227,40 @@
DEBUGVAR CurrentXMLFileName2
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrentXMLFileName2 = "" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/inter/sgp/xml/page_show_error.lxml" Then
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
If CountryName = "Malaysia" Then
@ -274,35 +289,27 @@
If CountryName = "Singapore" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 1 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
If CurrentXMLFileName2 = "" Then
If CountDownPauseVideo2 < 2 Then
<<<<<<< HEAD
=======
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf
Else
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
EndIf

BIN
inter/sgp/image/page_drink_disable_n2/bn_iced_Ginger_soda_Doikum.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

BIN
inter/sgp/image/page_drink_disable_n2/bn_iced_Gingerlime_soda_Doikum.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Before After
Before After

BIN
inter/sgp/image/page_drink_n/bn_iced_Ginger_soda_Doikum.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

BIN
inter/sgp/image/page_drink_n/bn_iced_Gingerlime_soda_Doikum.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

BIN
inter/sgp/image/page_drink_picture2_n/bn_iced_Ginger_soda_Doikum.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Before After
Before After

BIN
inter/sgp/image/page_drink_picture2_n/bn_iced_Gingerlime_soda_Doikum.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Before After
Before After

BIN
inter/sgp/image/page_drink_press_n/bn_iced_Ginger_soda_Doikum.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 15 KiB

Before After
Before After

BIN
inter/sgp/image/page_drink_press_n/bn_iced_Gingerlime_soda_Doikum.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Before After
Before After

16
inter/sgp/xml/page_drinkfail_sg.lxml
View file

@ -59,7 +59,7 @@
Var Timeout = Timeout + 1
If Timeout > 30 Then
If Timeout > 60 Then
If SendProblemOfMember = 1 Then
@ -182,12 +182,12 @@ EndIf
<Filename> Var( DirImage + "/text_11.png" ) </Filename>
</Image>
;<Image>
;<X> 429 </X>
;<Y> 1301 </Y>
;<State> ShowQRByNoMember </State>
;<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
;</Image>
<Image>
<X> 329 </X>
<Y> 1301 </Y>
<State> ShowQRByNoMember </State>
<Filename> Var( DirImage + "/QR_contract.png" ) </Filename>
</Image>
;<Image>
;<X> 190 </X>
@ -198,7 +198,7 @@ EndIf
<Button>
<X> 400 </X>
<Y> 1720 </Y>
<Y> 1770 </Y>
<Filename> Var( DirImage + "/bn_close.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>

BIN
inter/whatthecup/common/adv/wtc_banner.mp4
View file

Binary file not shown.

BIN
inter/whatthecup/common/adv/wtc_banner_menu.mp4 Normal file
View file

Binary file not shown.

BIN
inter/whatthecup/sgp/image/collectiing/QR_contract.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 144 KiB

After

Width:  |  Height:  |  Size: 74 KiB

Before After
Before After