Merged

inter/aus/video/script_video.ev

@@ -21,6 +21,16 @@ If SystemDateMonthInt = 1 Then
             Var EventTurnOn = 1
         EndIf
     EndIf
+
+    If SystemDateDayInt <= 31 Then
+        GetFileSizeK "taobin_project/inter/aus/video/video_main_ao.mp4" MainfileSize
+        DEBUGVAR MainfileSize
+        If MainfileSize = 20796764 Then
+            Var EventAO = 1
+        Else
+            DEBUGVAR "AO:Size incorrect"
+        EndIf
+    EndIf
 EndIf
 
 
@@ -35,3 +45,8 @@ Else
     Var ShowButtonClickFull = "Invisible"
     Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main.mp4"
 EndIf
+
+If EventAO = 1 Then
+
+    Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main_ao.mp4"
+EndIf

inter/aus/xml/page_drinkfail3.lxml

@@ -40,8 +40,6 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout>
 
-
-
     Var Timeout = Timeout + 1
 
     DEBUGVAR Timeout
@@ -49,84 +47,29 @@
     DEBUGVAR NextOrder
     DEBUGVAR HaveCup
 
-    If Door_Open_flagBlink = 0 Then
-         Var Door_Open_flagBlink = 1
-         Var Door_Open_State="Enable"
-    Else
-         Var Door_Open_flagBlink = 0
-          Var Door_Open_State="Invisible"
-    EndIf
 
-    If HaveCup = "true" Then
-    	DEBUGVAR CheckCupStateDoorCupClose
-
-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "reset" Then
-
-			If CheckCupStateDoorCupCloseCnt = 0 Then
-				Var CheckCupStateDoorCupClose = ""
-			Else
-				Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
-
-			EndIf
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
-
-    If buttonRemoveCup = "Invisible" Then
-    	Var Door_Open_State = "Invisible"
-    EndIf
 
     DEBUGVAR buttonRemoveCup
+    DEBUGVAR NextOrder
     DEBUGVAR Door_Open_State
 
-    If MachineStage = "remove-cup" Then
 
-	Else
     If NextOrder = "true" Then
         Var NextOrder = "false"
 
         TransferVar "next" "curr"
         Var Seeker = "curr"
 
-       		SAVELOG "Remove cup drink fail "
+        SAVELOG "Have Cup 2"
 
         Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
     Else
         Open "ROOT/taobin_project/xml/page_back_to_main.xml"
     EndIf
-	EndIf
-
-	; must remove cup.
-	If HaveCup = "true" Then
-
-	Else
-		If  NextOrder = "true" Then
-			Var NextOrder = "false"
-
-			TransferVar "next" "curr"
-			Var Seeker = "curr"
-
-			SAVELOG "Have Cup"
-
-			Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
-		Else
-			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		EndIf
-	EndIf
 
 
-	If Timeout > 240 Then
+
+    If Timeout > 120 Then
         If  NextOrder = "true" Then
             SAVELOG "TIME OUT 240"
             Var NextOrder = "false"

xml/page_drinkfail3.xml

@@ -40,8 +40,6 @@
     DEBUGVAR NextOrder
     DEBUGVAR HaveCup
 
-    
-
     DEBUGVAR buttonRemoveCup
     DEBUGVAR NextOrder
     DEBUGVAR Door_Open_State
@@ -76,6 +74,7 @@
 		EndIf
 	EndIf
 
+
     Refresh
     TimerReset
 
@@ -90,16 +89,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
 <Image>
 <X> 53 </X>
 <Y> 473 </Y>