AUS: Added new layout v3

inter/aus/xml/page_topping_select6.lxml

@@ -7,10 +7,23 @@
 <EventOpen>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
 
+	If RedirectToNormalVersion = 1 Then
+		RootLayoutVisible 3 "hide"
+		;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+	EndIf
+	Machine WakeUp
+
 	Var UserSelectedSugar = 0
 
 	SAVELOG "Event Open Select 6 AUS"
 
+	If NoWaitMachineEnable = 1 Then
+		Var ConfirmDrinkButtonState = "Enable"
+	Else
+
+		Var ConfirmDrinkButtonState = "Invisible"
+	EndIf
+
 	Var y_topping_bg = 912
 
 	Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1
@@ -50,6 +63,8 @@
 	Var ShowStrawOnly = "Invisible"
 	Var ShowLidOnly = "Invisible"
 
+	Var ShowNormalNextButton = "Enable"
+
 	; On open
 	Var lidAndStrawOldPageIgnore = "true"
 	Var SugarState1 = "Invisible"
@@ -434,14 +449,50 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout>
 	DEBUGVAR Timeout
+	DEBUGVAR MenuReady
+	DEBUGVAR CupRemain
 
+	DEBUGVAR CLOSE_ORDER_NOW
+
+	If CLOSE_ORDER_NOW = "true" Then
+		;include="ROOT/taobin_project/inc/return_condition.ev"
+	EndIf
+
+	If NoWaitMachineEnable = 1 Then
+		DEBUGVAR MachineStage
+		DEBUGVAR ConfirmDrinkButtonState
+		If MachineStage = "close-maintenance" Then
+			Var ConfirmDrinkButtonState = "Enable"
+
+			If stop_now = "true" Then
+					SAVELOG "stop_now is true page_topping_select7.xml"
+					;include="ROOT/taobin_project/inc/return_condition.ev"
+			EndIf
+		Else
+			Var ConfirmDrinkButtonState = "Invisible"
+		EndIf
+
+	EndIf
+
+	If CLOSE_ORDER_NOW = "true" Then
+		SAVELOG "DEACTIVE in page_topping_select6.lxml"
+		;include="ROOT/taobin_project/inc/return_condition.ev"
+	EndIf
+
+	If SELLSTATUS = "DEACTIVE" Then
+		SAVELOG "DEACTIVE in page_topping_select6.lxml"
+		;include="ROOT/taobin_project/inc/return_condition.ev"
+	EndIf
+
+
+	DEBUGVAR SelectDrinkType
 
 	Var Timeout = Timeout + 1
 
 	If Timeout > 40 Then
 		Var Timeout = 0
 		If  Seeker = "next" Then
-			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+			;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
 			Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
 		Else
 			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
@@ -469,6 +520,55 @@
 		EndIf
 	EndIf
 
+	DEBUGVAR MenuReason
+	; arm-not-ready
+	; brew-stg
+	; door-cup-alert
+	; stop-now-set
+
+	If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
+		Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
+		Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
+	Else
+		Var ShowTextSelfTestCountDown = "Please wait a moment"
+	EndIf
+
+	If Seeker = "curr" Then
+		If MenuReason = "arm-not-ready" Then
+
+			SAVELOG "goto mode arm-not-ready"
+			DEBUGVAR DoorCupPosition
+
+			If DoorCupPosition = "bottom" Then
+				Machine RemoveCup
+				Machine DoorLidOpen
+			Else
+				Var TextSelfTestCntColor = "0x513C2F"
+				Var ConfirmDrinkButtonState = "Enable"
+
+				Var ShowTextSelfTestCountDown = "Please take out the glass."
+			EndIf
+		EndIf
+	EndIf
+
+	If MenuReason = "brew-stg" Then
+		Var ConfirmDrinkButtonState = "Enable"
+		If Timeout > 15 Then
+			Var MenuReason = "-"
+			Var Timeout = 0
+			Var ConfirmDrinkButtonState = "Invisible"
+		EndIf
+
+	EndIf
+
+
+	If MenuReason = "-" Then
+
+	Else
+		Var MenuReasonString = MenuReason
+		Var MenuReasonStage = "Enable"
+	EndIf
+
 	Refresh
 	TimerReset
 </EventTimeout>
@@ -661,12 +761,18 @@
 	;Open PreviseXMLFileName2
 	DEBUGVAR OpenFromXML
 
+	TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/xml/event/tricker.ev"
+
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 
+	DEBUGVAR OpenFromInstMenuTab
+	If OpenFromInstMenuTab > 0 Then
+		DEBUGVAR OpenFromInstMenuTab
+		TabMenuVisibleInst OpenFromInstMenuTab
+	EndIf
+
 	Open OpenFromXML
 
-
-
 </EventClick>
 </Button>
 
@@ -7685,6 +7791,38 @@
 </EventClick>
 </Button>
 
+; next2 button Protect
+<Button>
+<State> ConfirmDrinkButtonState </State>
+<X> 526 </X>
+<Y> 1785 </Y>
+<Filename>  "ROOT/taobin_project/image/topping/topping2/bd_next2.png"</Filename>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+
+<Text>
+	<State> ConfirmDrinkButtonState </State>
+	<X> 0 </X>
+	<Y> 18 </Y>
+	<Align> Center </Align>
+	<Width> 512 </Width>
+	<Font> KanitTTF </Font>
+	<Size> 36 </Size>
+	<Color> TextSelfTestCntColor  </Color>
+	<Value> ShowTextSelfTestCountDown </Value>
+</Text>
+
+<EventClick>
+
+	If Seeker = "curr" Then
+		If MenuReason = "arm-not-ready" Then
+			Machine RemoveCup
+			Machine DoorLidOpen
+		EndIf
+	EndIf
+</EventClick>
+</Button>
+
 <Button>
 <X> 277 </X>
 <Y> 1772 </Y>
@@ -7700,6 +7838,7 @@
 <Button>
 <X> 673 </X>
 <Y> 1785 </Y>
+<State> ShowNormalNextButton </State>
 <Filename> "ROOT/taobin_project/image/topping_inter/bn_next.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping_inter/bp_next.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -8421,6 +8560,7 @@
 <Size> 36 </Size>
 <Width> 1080 </Width>
 <Color> 0xFFFFFF </Color>
+<State> ShowNormalNextButton </State>
 <Animation>
 	<Style> "shake-text" </Style>
 	<OnEvent> "OnValueChange" </OnEvent>
@@ -8557,4 +8697,16 @@
 
 ;
 
+<Text>
+<X> 0 </X>
+<Y> 1888 </Y>
+<State> MenuReasonStage </State>
+<Font> KanitTTF </Font>
+<Size> 22 </Size>
+<Width> 1078 </Width>
+<Align> end </Align>
+<Color> 0xFF0000 </Color>
+<Value> MenuReasonString</Value>
+</Text>
+
 </Page>