Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

2024-10-02 20:09:56 +07:00 · 2024-10-02 20:09:56 +07:00 · e8148c2786
commit e8148c2786
parent dab1024e2c f8abace49c
834 changed files with 34929 additions and 12935 deletions
--- a/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila_pro.png
+++ b/image/page_drink_disable_n2/bn_hot_Ginger_tea_jemila_pro.png
--- a/image/page_drink_disable_n2/bn_hot_america_no_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_america_no_jemila.png
--- a/image/page_drink_disable_n2/bn_hot_america_no_jemila_pro.png
+++ b/image/page_drink_disable_n2/bn_hot_america_no_jemila_pro.png
--- a/image/page_drink_disable_n2/bn_hot_thai_tea_jemila.png
+++ b/image/page_drink_disable_n2/bn_hot_thai_tea_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_7up_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_7up_jemila_pro.png
+++ b/image/page_drink_disable_n2/bn_iced_7up_jemila_pro.png
--- a/image/page_drink_disable_n2/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_cocoa_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_lemonade_jemila.png
--- a/image/page_drink_disable_n2/bn_iced_lemonade_jemila_pro.png
+++ b/image/page_drink_disable_n2/bn_iced_lemonade_jemila_pro.png
--- a/image/page_drink_disable_n2/bn_iced_milk_jemila.png
+++ b/image/page_drink_disable_n2/bn_iced_milk_jemila.png
--- a/image/page_drink_disable_n2/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_disable_n2/bn_jasmine_tea_jemila.png
--- a/image/page_drink_disable_n2/bn_jasmine_tea_jemila_pro.png
+++ b/image/page_drink_disable_n2/bn_jasmine_tea_jemila_pro.png
--- a/image/page_drink_disable_n2/bn_soda_jemila.png
+++ b/image/page_drink_disable_n2/bn_soda_jemila.png
--- a/image/page_drink_disable_n2/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_disable_n2/bn_water_roomtemp_jemila.png
--- a/image/page_drink_n/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_n/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_n/bn_hot_Ginger_tea_jemila_pro.png
+++ b/image/page_drink_n/bn_hot_Ginger_tea_jemila_pro.png
--- a/image/page_drink_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_n/bn_hot_america_no_jemila_pro.png
+++ b/image/page_drink_n/bn_hot_america_no_jemila_pro.png
--- a/image/page_drink_n/bn_hot_thai_tea_jemila.png
+++ b/image/page_drink_n/bn_hot_thai_tea_jemila.png
--- a/image/page_drink_n/bn_iced_7up_jemila.png
+++ b/image/page_drink_n/bn_iced_7up_jemila.png
--- a/image/page_drink_n/bn_iced_7up_jemila_pro.png
+++ b/image/page_drink_n/bn_iced_7up_jemila_pro.png
--- a/image/page_drink_n/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_n/bn_iced_cocoa_jemila.png
--- a/image/page_drink_n/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_n/bn_iced_lemonade_jemila.png
--- a/image/page_drink_n/bn_iced_lemonade_jemila_pro.png
+++ b/image/page_drink_n/bn_iced_lemonade_jemila_pro.png
--- a/image/page_drink_n/bn_iced_milk_jemila.png
+++ b/image/page_drink_n/bn_iced_milk_jemila.png
--- a/image/page_drink_n/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_n/bn_jasmine_tea_jemila.png
--- a/image/page_drink_n/bn_jasmine_tea_jemila_pro.png
+++ b/image/page_drink_n/bn_jasmine_tea_jemila_pro.png
--- a/image/page_drink_n/bn_soda_jemila.png
+++ b/image/page_drink_n/bn_soda_jemila.png
--- a/image/page_drink_n/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_n/bn_water_roomtemp_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila_pro.png
+++ b/image/page_drink_picture2_n/bn_hot_Ginger_tea_jemila_pro.png
--- a/image/page_drink_picture2_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_picture2_n/bn_hot_america_no_jemila_pro.png
+++ b/image/page_drink_picture2_n/bn_hot_america_no_jemila_pro.png
--- a/image/page_drink_picture2_n/bn_hot_thai_tea_jemila.png
+++ b/image/page_drink_picture2_n/bn_hot_thai_tea_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_7up_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_7up_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_7up_jemila_pro.png
+++ b/image/page_drink_picture2_n/bn_iced_7up_jemila_pro.png
--- a/image/page_drink_picture2_n/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_cocoa_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_lemonade_jemila.png
--- a/image/page_drink_picture2_n/bn_iced_lemonade_jemila_pro.png
+++ b/image/page_drink_picture2_n/bn_iced_lemonade_jemila_pro.png
--- a/image/page_drink_picture2_n/bn_iced_milk_jemila.png
+++ b/image/page_drink_picture2_n/bn_iced_milk_jemila.png
--- a/image/page_drink_picture2_n/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_picture2_n/bn_jasmine_tea_jemila.png
--- a/image/page_drink_picture2_n/bn_jasmine_tea_jemila_pro.png
+++ b/image/page_drink_picture2_n/bn_jasmine_tea_jemila_pro.png
--- a/image/page_drink_picture2_n/bn_soda_jemila.png
+++ b/image/page_drink_picture2_n/bn_soda_jemila.png
--- a/image/page_drink_picture2_n/bn_soda_jemila_pro.png
+++ b/image/page_drink_picture2_n/bn_soda_jemila_pro.png
--- a/image/page_drink_picture2_n/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_picture2_n/bn_water_roomtemp_jemila.png
--- a/image/page_drink_press_n/bn_hot_Ginger_tea_jemila.png
+++ b/image/page_drink_press_n/bn_hot_Ginger_tea_jemila.png
--- a/image/page_drink_press_n/bn_hot_Ginger_tea_jemila_pro.png
+++ b/image/page_drink_press_n/bn_hot_Ginger_tea_jemila_pro.png
--- a/image/page_drink_press_n/bn_hot_america_no_jemila.png
+++ b/image/page_drink_press_n/bn_hot_america_no_jemila.png
--- a/image/page_drink_press_n/bn_hot_america_no_jemila_pro.png
+++ b/image/page_drink_press_n/bn_hot_america_no_jemila_pro.png
--- a/image/page_drink_press_n/bn_hot_thai_tea_jemila.png
+++ b/image/page_drink_press_n/bn_hot_thai_tea_jemila.png
--- a/image/page_drink_press_n/bn_iced_7up_jemila.png
+++ b/image/page_drink_press_n/bn_iced_7up_jemila.png
--- a/image/page_drink_press_n/bn_iced_7up_jemila_pro.png
+++ b/image/page_drink_press_n/bn_iced_7up_jemila_pro.png
--- a/image/page_drink_press_n/bn_iced_cocoa_jemila.png
+++ b/image/page_drink_press_n/bn_iced_cocoa_jemila.png
--- a/image/page_drink_press_n/bn_iced_lemonade_jemila.png
+++ b/image/page_drink_press_n/bn_iced_lemonade_jemila.png
--- a/image/page_drink_press_n/bn_iced_lemonade_jemila_pro.png
+++ b/image/page_drink_press_n/bn_iced_lemonade_jemila_pro.png
--- a/image/page_drink_press_n/bn_iced_milk_jemila.png
+++ b/image/page_drink_press_n/bn_iced_milk_jemila.png
--- a/image/page_drink_press_n/bn_jasmine_tea_jemila.png
+++ b/image/page_drink_press_n/bn_jasmine_tea_jemila.png
--- a/image/page_drink_press_n/bn_jasmine_tea_jemila_pro.png
+++ b/image/page_drink_press_n/bn_jasmine_tea_jemila_pro.png
--- a/image/page_drink_press_n/bn_soda_jemila.png
+++ b/image/page_drink_press_n/bn_soda_jemila.png
--- a/image/page_drink_press_n/bn_water_roomtemp_jemila.png
+++ b/image/page_drink_press_n/bn_water_roomtemp_jemila.png
--- a/inc/remove_cup_step.inc
+++ b/inc/remove_cup_step.inc
@ -24,7 +24,11 @@ Else
        If buttonRemoveCup = "Enable" Then
            If CupChecking = "false" Then
                If DoorCupPosition = "bottom" Then
-                    Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
+                    If InternationalEnable = 1 Then
+                        
+                    Else
+                        Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
+                    EndIf
                EndIf
            EndIf
        EndIf
--- a/inc/video.inc
+++ b/inc/video.inc
@ -6,6 +6,19 @@
 <Refresh> "Reload" </Refresh>
 <EventOpen>

+    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


@ -37,32 +50,36 @@
        DEBUGVAR CurrentXMLFileName2
        DEBUGVAR PreviousFileName
        DEBUGVAR CountDownPauseVideo2
+        DEBUGVAR ads_idx
+        DEBUGVAR CountryName
+
+
        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 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
-                    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

@ -71,6 +88,11 @@
            DEBUGVAR PromotionOreoToppingFreeEnable
            DEBUGVAR ProReducedPriceEnable
            DEBUGVAR UseSlideShowVideo
+            DEBUGVAR DisplayAds
+            DEBUGVAR video_menu_0
+
+            Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
+            Var DisplayAds = AdvTaobinMenu + ".mp4"

            If PromotionOreoToppingFreeEnable = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
@ -96,33 +118,64 @@

                DEBUGVAR PreviseXMLFileName2

+                ;auto-open
+                ;/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml
+
+                ;from-test
+                ;/mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml
+
                If PreviseXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml" Then

                    DEBUGVAR CurrentXMLFileName2
                    DEBUGVAR CurrentXMLFileName2
                    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 = DefaultLargeBanner
+                    Var DisplayAds = AdvTaobinMenu + ".mp4"
+
+                EndIf
+
+                If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then
+                    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
-                    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
@ -134,6 +187,9 @@
        DEBUGVAR ProReducedPriceEnable
        DEBUGVAR UseSlideShowVideo

+        Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
+        Var DisplayAds = AdvTaobinMenu + ".mp4"
+
        If PromotionOreoToppingFreeEnable = 1 Then
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
        EndIf
@ -149,7 +205,10 @@
    EndIf

    If CountryName = "UnitedArabEmirates Dubai" Then
-        Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00"
+        Var AdvTaobinMenu = DefaultNormBanner
+        If UsePepsiTheme = 0 Then
+            Var AdvTaobinMenu = AdvTaobinMenu + a_video_menu[ads_idx]
+        EndIf
        Var DisplayAds = AdvTaobinMenu + ".mp4"
    EndIf

@ -179,30 +238,44 @@
        EndIf

        If CountryName = "Singapore" Then
+            DEBUGVAR CountryName
+            DEBUGVAR CurrentXMLFileName2
            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 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
-                    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
@ -211,6 +284,9 @@
            DEBUGVAR ProReducedPriceEnable
            DEBUGVAR UseSlideShowVideo

+            Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
+            Var DisplayAds = AdvTaobinMenu + ".mp4"
+
            If PromotionOreoToppingFreeEnable = 1 Then
                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
            EndIf
@ -231,27 +307,27 @@
        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/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
-                    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
@ -264,6 +340,9 @@
        DEBUGVAR ProReducedPriceEnable
        DEBUGVAR UseSlideShowVideo

+        Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" +  a_video_menu[ads_idx]
+        Var DisplayAds = AdvTaobinMenu + ".mp4"
+
        If PromotionOreoToppingFreeEnable = 1 Then
            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_21.mp4"
        EndIf
@ -282,7 +361,10 @@
    EndIf

    If CountryName = "UnitedArabEmirates Dubai" Then
-        Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00"
+        Var AdvTaobinMenu = DefaultNormBanner
+        If UsePepsiTheme = 0 Then
+            Var AdvTaobinMenu = AdvTaobinMenu + a_video_menu[ads_idx]
+        EndIf
        Var DisplayAds = AdvTaobinMenu + ".mp4"
    EndIf

--- a/inter/aus/image/event/anniversary_new_promo_code_revealed.png
+++ b/inter/aus/image/event/anniversary_new_promo_code_revealed.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Bananoffee_Pie.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Caramel_choc_espresso.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Choc_caramel_crumble.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Melon_matcha_iced_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Vanilla_caramel_latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_Yuzu_matcha_iced_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_Bananoffee_milkshake.png
--- a/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_hot_latte_with_twist.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Caramel_mocha.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea-1.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea-1.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_jasmine_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Lychee_matcha_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Strawberry_Matcha_Latte.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_Yuzu_jasmine_tea.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Lychee_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Melon_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda-1.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_energy_drink_Mint_soda.png
--- a/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_iced_pepsi_Lychee.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_Vanilla.png
--- a/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png
+++ b/inter/aus/image/page_drink_disable_n2/bn_protein_espresso_caramel.png
--- a/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png
+++ b/inter/aus/image/page_drink_n/bn_Bananoffee_Latte.png
--- a/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png
+++ b/inter/aus/image/page_drink_n/bn_Bananoffee_Pie.png
--- a/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png
+++ b/inter/aus/image/page_drink_n/bn_Caramel_choc_espresso.png
--- a/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png
+++ b/inter/aus/image/page_drink_n/bn_Choc_caramel_crumble.png
--- a/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png
+++ b/inter/aus/image/page_drink_n/bn_Melon_matcha_iced_tea.png
--- a/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png
+++ b/inter/aus/image/page_drink_n/bn_Vanilla_caramel_latte.png
--- a/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png
+++ b/inter/aus/image/page_drink_n/bn_Yuzu_matcha_iced_tea.png
--- a/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png
+++ b/inter/aus/image/page_drink_n/bn_hot_Bananoffee_milkshake.png
--- a/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png
+++ b/inter/aus/image/page_drink_n/bn_hot_latte_with_twist.png
--- a/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Caramel_mocha.png
--- a/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea-1.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea-1.png
--- a/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Lychee_jasmine_tea.png
--- a/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Lychee_matcha_tea.png
--- a/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
+++ b/inter/aus/image/page_drink_n/bn_iced_Strawberry_Matcha_Latte.png
--- a/Show more
+++ b/Show more