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

inter/aus/xml/page_drinkfail3.lxml

@@ -0,0 +1,210 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+
+
+
+	Var DirImage = "ROOT/taobin_project/inter/aus/image/page_drink_fail"
+
+
+	Var Timeout = 0
+
+    Var Door_Open_State="Invisible"
+    Var Door_Open_flagBlink = 0
+
+
+
+    If HaveCup = "true" Then
+
+		If CheckCupStateDoorCupClose = "" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+
+		If CheckCupStateDoorCupClose = "done" Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+	Else
+		If buttonRemoveCup = "Enable" Then
+			Var buttonRemoveCup = "Invisible"
+		EndIf
+	EndIf
+
+	Var CheckCupStateDoorCupCloseCnt = 15
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+
+
+    Var Timeout = Timeout + 1
+
+    DEBUGVAR Timeout
+    DEBUGVAR MachineStage
+    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 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 "
+
+			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  NextOrder = "true" Then
+       		SAVELOG "TIME OUT 240"
+			Var NextOrder = "false"
+
+			TransferVar "next" "curr"
+			Var Seeker = "curr"
+
+			Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
+		Else
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		EndIf
+	EndIf
+
+    Refresh
+	TimerReset
+
+
+</EventTimeout>
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<Image>
+<X> 53 </X>
+<Y> 473 </Y>
+<Filename> Var( DirImage + "/remove_cup.png" )</Filename>
+</Image>
+
+
+
+<Button>
+<X> 212 </X>
+<Y> 1661 </Y>
+<Filename> Var( DirImage + "/bn_door_open.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<State>buttonRemoveCup</State>
+<EventClick>
+
+   Machine RemoveCup
+   Var buttonRemoveCup = "Invisible"
+   Var CheckCupStateDoorCupClose = "reset"
+   Var CheckCupStateDoorCupCloseCnt = 15
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 212 </X>
+<Y> 1661 </Y>
+<State> Door_Open_State </State>
+<Filename> Var( DirImage + "/bp_door_open.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Machine RemoveCup
+   Var buttonRemoveCup = "Invisible"
+   Var CheckCupStateDoorCupClose = "reset"
+   Var CheckCupStateDoorCupCloseCnt = 15
+</EventClick>
+</Button>
+
+
+</Popup>

inter/aus/xml/page_drinkfail_aus.lxml

@@ -137,7 +137,7 @@
 	If Timeout > 20 Then
 
         If MachineStage = "remove-cup" Then
-			Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
+			Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail3.lxml"
 		Else
 			If  NextOrder = "true" Then
 				Var NextOrder = "false"
@@ -180,7 +180,7 @@
 
 
             If MachineStage = "remove-cup" Then
-          		Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
+          		Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail3.lxml"
            	Else
           		If  NextOrder = "true" Then
          			Var NextOrder = "false"