cup on arm modify

xml/page_catalog.lxml

@@ -240,18 +240,7 @@
 	Var PromotionIDCurrentOrder = 0
 	RootLayoutVisible 3 "show"
 
-	; reset-if-empty
-	DEBUGVAR buttonRemoveCup
 
-	If buttonRemoveCup = "Invisible" Then
-
-	Else
-		If buttonRemoveCup = "Enable" Then
-
-		Else
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@@ -273,26 +262,7 @@
 
 
 
-	; zone cup on arm
-	DEBUGVAR CheckCupStateDoorCupClose
-	DEBUGVAR CupOnArm
-    If CupOnArm = "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
-	DEBUGVAR MachineStage
-	DEBUGVAR buttonRemoveCup
-
+	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
 
 	Refresh
 	TimerReset
@@ -740,25 +710,8 @@
 <Value> ShowNetworkProblemText </Value>
 </Text>
 
-; Cart
-<Button>
-<X> 915 </X>
-<Y> 1769 </Y>
-<State> showCart </State>
-<Filename> cart_image_bn  </Filename>
-<Filename> cart_image_bp  </Filename>
-<FilenamePress> cart_image_bp </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<Interval> 400</Interval>
-<EventClick>
 
-
-	Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-</EventClick>
-</Button>
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"
 
 <EventWebApp>
 
@@ -781,24 +734,8 @@
 
 
 
+;include="ROOT/inc/remove_cup_tag_on_arm.inc"
 
-<Button>
-<X> btnRemoveCupX </X>
-<Y> btnRemoveCupYNotPageBoard </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename>  bnRemoveCup </Filename>
-<Filename>  bpRemoveCup </Filename>
-<EventClick>
-    Machine RemoveCup
-	Machine DoorLidOpen
-
-	Var CheckCupStateDoorCupClose = "reset"
-	Var buttonRemoveCup = "Invisible"
-
-</EventClick>
-</Button>
 
 <EventUnitTest1>
 	Var StrawGetMoreState = "Invisible"