WTC+SGP: fix soda ginger menu pic, banner & QR
This commit is contained in:
parent
d5ca231b2d
commit
068788bf1e
13 changed files with 68 additions and 61 deletions
113
inc/video.inc
113
inc/video.inc
|
|
@ -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
|
||||
|
||||
=======
|
||||
>>>>>>> 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
|
||||
|
||||
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"
|
||||
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue