Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

xml/event/double_promotion_americano_and_taiwanese_tea.xml

@@ -66,20 +66,73 @@
 	<MarginTop> 22 </MarginTop>
 	<Width> 484 </Width>
 	<Height> 602 </Height>
+
 <Button>
 
 <State> BigButtonEnable </State>
-
+    <Filename>
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
+        Else
+            Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
+        Else
+            Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
+        EndIf
+        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
+        Else
+            Var return = "ROOT/taobin_project/image/event/americano/americano_banner.mp4"
+        EndIf
+        )
+     </FilenameDisable>
 <EventOnClick> 
 
        Open "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"
         
 </EventOnClick>
 
-   <Video>
+
-	    <Width> 484 </Width>
+<Video>
+    <Width> 484 </Width>
     <Height> 616 </Height>
     <Loop> "true" </Loop>
+    <State> 
+        eval(
+            If show_eng = "true" Then
+                Var return = "Invisible"
+            Else
+                Var return  = "Enable"
+            EndIf
+        ) 
+    </State>
+    <Filename> "ROOT/taobin_project/image/event/americano/americano_banner.mp4" </Filename>
+</Video>
+
+<Video>
+    <Width> 484 </Width>
+    <Height> 616 </Height>
+    <State> 
+        eval(
+            If show_eng = "true" Then
+                Var return = "Enable"
+            Else
+                Var return  = "Invisible"
+            EndIf
+        ) 
+    </State>
+    <Loop> "true" </Loop>
     <Filename> "ROOT/taobin_project/image/event/americano/americano_banner.mp4" </Filename>
 </Video>
 

xml/event/multi_promotion_config_americano_taiwanese_tea.json

@@ -1,7 +1,7 @@
 [
   {
     "name": "americano",
-    "template": "/event/promotion_template.inc",
+    "template": "/event/promotion_video_template.inc",
     "config": {
       "normal_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
       "normal_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
@@ -9,6 +9,8 @@
       "press_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
       "disable_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
       "disable_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
+      "video_eng": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
+      "video_thai": "ROOT/taobin_project/image/event/americano/americano_banner.mp4",
       "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"
     }
   },

xml/event/promotion_americano.xml

@@ -19155,6 +19155,13 @@ Limenade Soda" </Value>
     <Y> 518 </Y>
 
 <State> BigButtonEnable </State>
+    <Filename> "ROOT/taobin_project/image/event/americano/americano_banner.png" </Filename>
+    <FilenamePress> "ROOT/taobin_project/image/event/americano/americano_banner.png" </FilenamePress>
+    <FilenameDisable> "ROOT/taobin_project/image/event/americano/americano_banner.png" </FilenameDisable>
+<EventOnClick>
+      Open "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"
+</EventOnClick>
+
 <Video>
     <X> 42 </X>
     <Y> 518 </Y>
@@ -19163,14 +19170,17 @@ Limenade Soda" </Value>
     <Loop> "true" </Loop>
     <Filename> "ROOT/taobin_project/image/event/americano/americano_banner.mp4" </Filename>
 </Video>
-<EventOnClick>
-
-                Open "ROOT/taobin_project/xml/page_catalog_group_pro_americano.xml"
-
-
-</EventOnClick>
 </Button>
 
+<EventUnitTest1>
+    Var BigButtonEnable = "Enable"
+    Refresh
+</EventUnitTest1>
+<EventUnitTest2>
+    Var BigButtonEnable = "Invisible"
+    Refresh
+</EventUnitTest2>
+
 
 
 </Popup>