Add button

sheet/best_seller.tsv

@@ -25,4 +25,3 @@
 12-03-02-0006
 12-02-02-0004
 12-05-02-0007
-12-04-02-0002

xml/page_brewing3Multi.xml

@@ -296,9 +296,14 @@
 
 	Var Timeout = Timeout + 1
 
-	If CountDownBrewing > 0 Then
-		Var CountDownBrewing = CountDownBrewing - 1
-	EndIf
+	If BREW_COUNT_DOWN_FROM_APP = "on" Then
+		Var CountDownBrewing = BREW_CNT
+	Else
+
+		If CountDownBrewing > 0 Then
+			Var CountDownBrewing = CountDownBrewing - 1
+		EndIf
+	Endif
 
 	If Simulation = "true" Then
 		If CountDownBrewing = 0 Then

xml/page_drinkok.xml

@@ -158,7 +158,10 @@
 <Timeout> 500 </Timeout>
 <EventTimeout> 
 
-	SAVELOG MachineStage
+	DEBUGVAR MachineStage
+	DEBUGVAR CupOnArm
+	DEBUGVAR buttonRemoveCup
+	DEBUGVAR CART_COUNT
 
 	If HaveCup = "false" Then
 
@@ -183,7 +186,12 @@
 			EndIf
 
 		EndIf
-
+	Else
+		If CupOnArm = "true" Then
+			Var buttonRemoveCup = "Enable"
+		Else
+			Var buttonRemoveCup = "Invisible"
+		EndIf
 
 			
 	EndIf
@@ -192,6 +200,9 @@
 		If CART_COUNT = 0 Then
 			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 		Else
+	
+			Var buttonRemoveCup = "Enable"
+		
 
 			Var Timeout2 = Timeout2 + 1
 
@@ -215,6 +226,7 @@
 	Var Timeout = Timeout + 1
 
 	TimerReset
+	Refresh
 
 </EventTimeout> 
 
@@ -253,7 +265,6 @@
 ;</Image>
 
 
-
 <Button>
 <X> 870 </X>
 <Y> 1860 </Y>
@@ -324,5 +335,20 @@
 <Filename> next_pic </Filename>
 </Image>
 
+
+<Button>
+<X> 757 </X>
+<Y> 448 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<EventClick> 
+	Machine RemoveCup
+	Machine DoorLidOpen
+</EventClick>
+</Button>
+
 </Popup>