Merge branch 'topping_custom_coffee_new' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

xml/page_topping_select5.xml

@@ -46,6 +46,11 @@
 	DEBUGVAR JXMLVersionInt
 
 	Var CHECK_EventOpen_Double = 0
+
+	If RecipeTag3 = "CoffeePlay" Then
+		Open "ROOT/taobin_project/xml/page_topping_select8.xml"
+	EndIf
+
 	If JXMLVersionInt > 448 Then
 		Open "ROOT/taobin_project/xml/page_topping_select7.xml"
 	Else

xml/page_topping_select7.xml

@@ -360,7 +360,9 @@
 <EventTimeout> 
 	DEBUGVAR Timeout
 
-	DEBUGVar MenuReady
+	DEBUGVAR MenuReady
+	DEBUGVAR CupRemain
+
 	If SelectDrinkType = 1 Then
 		
 		If MenuReady = "YES" Then
@@ -380,9 +382,10 @@
 				EndIf
 			EndIf
 
-
-			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-			Open "ROOT/taobin_project/xml/page_payment.xml" 
+			If CupRemain > 0 Then
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+				Open "ROOT/taobin_project/xml/page_payment.xml" 
+			EndIf
 		EndIf
 	EndIf