DOING and fix 5.65

xml/page_board.xml

@@ -11,6 +11,7 @@
 	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
 	Var FileNumber = 1
 
+	DEBUGVAR SoundVolume
 
 	Var GetFreeFromError = 0
 	Var taobin_version = "1.53"

xml/page_brewing3.xml

@@ -249,10 +249,19 @@
 
 	Var Timeout = Timeout + 1
 
-	If CountDownBrewing > 0 Then
-		Var CountDownBrewing = CountDownBrewing - 1
+	If MOVE_CUP_TO_DOOR = "true" Then
+		Var MOVE_CUP_TO_DOOR = "false"
 	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
 			;Open "ROOT/taobin_project/xml/page_drinkok.xml"

xml/page_catalog.xml

@@ -18,7 +18,7 @@
 		Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
 	EndIf
 	 	
-	Machine DoorLidClose
+	;Machine DoorLidClose
 
 	Var GetPayInfoFlag = 0
 	Var countDownRetrun = 30
@@ -51,7 +51,6 @@
 	Var StrawAutoRelease1 = "false"
 	Var StrawAutoRelease2 = "false"
 
-	Machine DoorClose
 
 	If NetworkStatus = "ACTIVATE" Then
 		Var ShowButtonClick2 = "Enable"

xml/page_payment_cash.xml

@@ -305,6 +305,8 @@
 		EndIf
 	EndIf
 
+	Machine DoorClose
+
 </EventOpen>
 
 <EventActionOk>

xml/page_topping_select.xml

@@ -7,6 +7,9 @@
 <EventOpen>
 	Var y_topping_bg = 912
 
+	If JXMLVersionInt > 355 Then
+		Open "ROOT/taobin_project/xml/page_topping_select3.xml"
+	EndIf
 	If ConfigNumer > 360 Then
 		SAVELOG "Recipe have smoothies"
 		Open "ROOT/taobin_project/xml/page_topping_select2.xml"

xml/page_topping_select2.xml

@@ -7,6 +7,10 @@
 <EventOpen>
 	Var y_topping_bg = 912
 	
+
+	;Machine DoorClose
+	Machine DoorLidClose
+
 	DEBUGVAR video_menu_0
 
 	DEBUGVAR SelectDrink
@@ -94,8 +98,6 @@
 	Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png"
 	Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png"
 
-	; Move to catalog.
-	;Machine DoorClose
 	
 	
 	;Var blendedState = "Enable"
@@ -145,6 +147,8 @@
 			Var btnAddCart = "Invisible" 
 		EndIf
 	EndIf
+
+
 </EventOpen>
 <Timeout> 2000 </Timeout>
 <EventTimeout> 
@@ -557,14 +561,6 @@
 			Var ShotCoffeePremium = "Enable"
 			Var showShotEnable = "Enable"
 
-			DEBUGVAR TOPPING2
-			Refresh
-		EndIf
-	If TOPPING2 = "shot coffee 1008" Then
-	
-			Var ShotCoffeePremium = "Enable"
-			Var showShotEnable = "Enable"
-
 			DEBUGVAR TOPPING2
 			Refresh
 		EndIf