Merge branch 'masterpiece' into sgp_blue
This commit is contained in:
commit
d5ca231b2d
142 changed files with 23999 additions and 26660 deletions
|
|
@ -9,8 +9,8 @@
|
|||
READ_FILE "/mnt/sdcard/coffeevending/openfile_xml_0" CurrPageInst0
|
||||
|
||||
If showMultiAds = "true" Then
|
||||
|
||||
|
||||
|
||||
|
||||
If PreviousFileName = "" Then
|
||||
Var PreviousFileName = PreviseXMLFileName2
|
||||
EndIf
|
||||
|
|
@ -41,9 +41,12 @@
|
|||
DEBUGVAR CountDownPauseVideo2
|
||||
If CountryName = "Singapore" Then
|
||||
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
|
||||
|
||||
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -56,7 +59,10 @@
|
|||
EndIf
|
||||
If CurrentXMLFileName2 = "" Then
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -64,7 +70,7 @@
|
|||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Else
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
|
|
@ -82,12 +88,15 @@
|
|||
If ProReducedPriceEnable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
If ProYuzu250Enable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
If UseSlideShowVideo = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Else
|
||||
DEBUGVAR a_video_menu[ads_idx]
|
||||
If CountryName = "Singapore" Then
|
||||
|
|
@ -133,7 +142,10 @@
|
|||
If CurrentXMLFileName2 = "" Then
|
||||
DEBUGVAR CountDownPauseVideo2
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -147,7 +159,7 @@
|
|||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If CountryName = "Malaysia" Then
|
||||
|
||||
|
|
@ -161,6 +173,9 @@
|
|||
If ProReducedPriceEnable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
If ProYuzu250Enable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
If UseSlideShowVideo = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
|
||||
EndIf
|
||||
|
|
@ -177,13 +192,13 @@
|
|||
<EventVideoEnd>
|
||||
DEBUGVAR CurrentXMLFileName2
|
||||
Var video_end = "Video end"
|
||||
DEBUGVAR video_end
|
||||
DEBUGVAR video_end
|
||||
If CountDownPauseVideo2 = -1 Then
|
||||
Var CountDownPauseVideo2 = 0
|
||||
EndIf
|
||||
If showMultiAds = "true" Then
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Var ads_idx = ads_idx + 1
|
||||
|
|
@ -201,7 +216,10 @@
|
|||
DEBUGVAR CurrentXMLFileName2
|
||||
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -214,7 +232,10 @@
|
|||
EndIf
|
||||
If CurrentXMLFileName2 = "" Then
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -224,7 +245,7 @@
|
|||
EndIf
|
||||
Else
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
EndIf
|
||||
|
||||
If CountryName = "Malaysia" Then
|
||||
|
|
@ -239,18 +260,24 @@
|
|||
If ProReducedPriceEnable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
If ProYuzu250Enable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
If UseSlideShowVideo = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Else
|
||||
DEBUGVAR a_video_menu[ads_idx]
|
||||
If CountryName = "Singapore" Then
|
||||
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
|
||||
If CountDownPauseVideo2 < 1 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -263,7 +290,10 @@
|
|||
EndIf
|
||||
If CurrentXMLFileName2 = "" Then
|
||||
If CountDownPauseVideo2 < 2 Then
|
||||
Var AdvTaobinMenu = "/mnt/sdcard
|
||||
<<<<<<< HEAD
|
||||
|
||||
=======
|
||||
>>>>>>> 46897fb739ce28294d6a677fdc2749957015f940
|
||||
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
Else
|
||||
|
|
@ -293,6 +323,10 @@
|
|||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4"
|
||||
EndIf
|
||||
|
||||
If ProYuzu250Enable = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4"
|
||||
EndIf
|
||||
|
||||
If UseSlideShowVideo = 1 Then
|
||||
Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue