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

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

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