Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
6317a68847
5 changed files with 280 additions and 274 deletions
|
|
@ -7,8 +7,8 @@
|
|||
<EventOpen>
|
||||
|
||||
If showMultiAds = "true" Then
|
||||
|
||||
|
||||
|
||||
|
||||
If PreviousFileName = "" Then
|
||||
Var PreviousFileName = PreviseXMLFileName2
|
||||
EndIf
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
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/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx]
|
||||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
|
|
@ -60,7 +60,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"
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Else
|
||||
DEBUGVAR a_video_menu[ads_idx]
|
||||
If CountryName = "Singapore" Then
|
||||
|
|
@ -123,7 +123,7 @@
|
|||
Var DisplayAds = AdvTaobinMenu + ".mp4"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
If CountryName = "Malaysia" Then
|
||||
|
||||
|
|
@ -153,13 +153,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
|
||||
|
|
@ -196,7 +196,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
|
||||
|
|
@ -216,7 +216,7 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
Else
|
||||
DEBUGVAR a_video_menu[ads_idx]
|
||||
If CountryName = "Singapore" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue