Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

xml/page_board.xml

@@ -65,7 +65,7 @@
 
 
 	Cart "DeleteMenuID" "ALL"
-	Var MultiPayEnable = "false"
+	;Var MultiPayEnable = "false"
 	;Var MultiPayEnable = "true"
 	Var PayType = ""
 
@@ -406,7 +406,7 @@
 
 
 
-
+	CartTaoBin "CLEAR" "-" "-" "-"
 
 
 
@@ -1151,8 +1151,14 @@
 
 			Var TextPriceMenuSize = 12
 			Var TextPriceMenuY = 266
+			Var TextPriceMenuColdx = 113
 			Var TextPriceMenuBlendX = 180
 			Var TextPriceMenuHotX = 48
+
+			Var TextHotMenuX = 19
+			Var TextColdMenuX = 84
+			Var TextBlendMenuX = 148
+
 			Var ShowButtonClick2 = "Invisible"
 			Var ButtontoTopupMenu = "Invisible"
 
@@ -1325,6 +1331,12 @@
 	TRY "ROOT/taobin_project/inter/tha/configure.ev"
 
 
+	If BoxID = 173372 Then
+		Var SpiralOnline = "true"
+				
+		Var InternationalShow = 1
+	EndIf
+
 	If EnableMultiInstanceFromBoxID = 1 Then
 		If CountryName = "Thailand" Then
 
@@ -1376,6 +1388,7 @@
 				Var InternationalShow = 0
 			EndIf
 
+
 			If BoxID = 210699 Then
 				Var SpiralOnline = "true"
 				Var SpiralModeFrozenFruit = 1
@@ -1732,6 +1745,8 @@
 	   	OpenInst 2 PepsiFullScreenPageBoard
 	EndIf
 
+
+
 </EventOpen>
 
 <EventActionOk>
@@ -2121,14 +2136,7 @@ PRICE "Reset" "-"
 
 				Var OpenFromPageBoard = 1
 
-				If DoorCupPosition = "bottom" Then
-					If CupOnArm = "true" Then
-
-					Else
-						__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
-					EndIf
-				EndIf
-
+				
 
 
 				DEBUGVAR InternationalEnable
@@ -2137,6 +2145,17 @@ PRICE "Reset" "-"
 				If CurrHelpCenter = 1 Then
 					OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
 				Else
+
+
+					If DoorCupPosition = "bottom" Then
+						If CupOnArm = "true" Then
+
+						Else
+							__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
+						EndIf
+					EndIf
+
+
 					Var BaseOnPageBoard = 0
 					TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
 
@@ -2208,6 +2227,44 @@ PRICE "Reset" "-"
 
 	EndIf
 
+	DEBUGVAR startTaobinML
+	DEBUGVAR CountDownOpenTaobinML
+
+	If CountDownOpenTaobinML > 0 Then
+
+	Else
+		Var CountDownOpenTaobinML = 0
+	EndIf
+
+	If EnableCameraStraw = "true" Then
+
+		If startTaobinML = "true" Then
+
+		Else
+			Var CountDownOpenTaobinML = CountDownOpenTaobinML + 1
+				
+				If CountDownOpenTaobinML = 70 Then
+					TrickTaoBinML "START"
+					Var	startTaobinML = "true"
+					DEBUGVAR startTaobinML
+				EndIf
+				
+
+		EndIf
+
+		DEBUGVAR NeedTrickTaobinML
+
+		If NeedTrickTaobinML = "true" Then
+
+			TrickTaoBinML "TRICKER"
+			Var NeedTrickTaobinML = "false"
+			DEBUGVAR NeedTrickTaobinML
+
+		EndIf
+	EndIf
+
+
+
 
 	If CupOnArm = "true" Then