Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

xml/page_board.xml

@@ -13,7 +13,7 @@
 
 
 	Var GetFreeFromError = 0
-	Var taobin_version = "1.51"
+	Var taobin_version = "1.53"
 
 	; On open
 	Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"

xml/page_brewing3.xml

@@ -121,7 +121,10 @@
 	EndIf
 
 
-	
+	If LedLidBlink = "true" Then
+		Var LedLidBlink = "no"
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
 
 
 </EventOpen>

xml/page_topping_select2.xml

@@ -10,6 +10,7 @@
 	DEBUGVAR video_menu_0
 
 	DEBUGVAR SelectDrink
+	DEBUGVAR PictureDrink
 	
 	Var SaveProductCodeSelect = SelectDrink
 	Var UserSelectProductCode = SelectDrink
@@ -133,6 +134,11 @@
 	DEBUGVAR backGroundAddExtra
 	DEBUGVAR backGroundAddShotPremium
 	
+	DEBUGVAR MultiPayEnable
+	Var btnAddCart = "Invisible"
+	If MultiPayEnable = "true" Then 
+		Var btnAddCart = "Enable"
+	EndIf
 </EventOpen>
 <Timeout> 2000 </Timeout>
 <EventTimeout> 
@@ -224,6 +230,7 @@
 
 <EventMachine>
 	
+
 	DEBUGVAR SubMenuProductCode1
 	DEBUGVAR SubMenuName11
 	DEBUGVAR SubMenuPrice1
@@ -287,7 +294,9 @@
 		
 		Var h_block_of_sugar = 210
 
-		STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie 
+		
+		;STRCONTAIN "Smoothie" SubMenuName11 HaveSmoothie 
+		STRCONTAIN "Smoothie" MenuCodeName HaveSmoothie 
 		If HaveSmoothie = "true" Then
 			Var blendedState = "Enable"
 			Var blendedStateShow = "Enable"
@@ -429,6 +438,8 @@
 		If TOPPING1 = "Powder Sugar Premix 50" Then
 			Var BGSugar = "Enable"
 			Var ShiftSugarStep = 3
+			Var SugarState1 = "Disable"
+			Var SugarState2 = "Disable"
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
@@ -1384,6 +1395,76 @@
 </EventClick>
 </Button>
 
+; add cart
+<Button>
+<State> btnAddCart  </State>
+<X> 285 </X>
+<Y> 1785 </Y>
+<Filename> Var( DirImage + "/bn_add.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_add.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	Var PriceDrink = PriceDrinkTmp
+	SAVELOG "USER press next ( topping ) - new"
+	DEBUGVAR topping1
+	DEBUGVAR topping2
+	DEBUGVAR topping3
+
+	DEBUGVAR LidState
+	DEBUGVAR StarwState
+	DEBUGVAR UserSelectProductCode
+	DEBUGVAR HAVE_UV_DOOR_LID
+
+	If HAVE_UV_DOOR_LID = "true" Then
+
+		If StarwState = "Press" Then
+			Machine StrawOrder	
+			Var LedLidBlink = "true"
+		EndIf
+
+		If LidState = "Press" Then
+			Machine LidOrder	
+			Var LedLidBlink = "true"
+		EndIf
+
+		Var StarwState = "Enable"
+		Var LidState = "Enable"
+		; 
+		
+	EndIf
+
+	Var SelectDrink = UserSelectProductCode
+	; Set drink 
+	Topping "Select" UserSelectProductCode
+
+	; Set option toppinng and pack 
+	Topping "Select1-ID" topping1
+	Topping "Select2-ID" topping2
+	Topping "Select3-ID" topping3
+
+	; Pack
+	Topping "Pack" ExtendData
+
+	If CART1 = "clear" Then
+		Topping "AddCart" 1
+	Else
+		If CART2 = "clear" Then
+			Topping "AddCart" 2
+		Else
+	
+			If CART3 = "clear" Then
+				Topping "AddCart" 3
+			EndIf
+		EndIf
+	EndIf
+	
+	;Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	
+</EventClick>
+</Button>
+
 ; next
 <Button>
 <X> 673 </X>
@@ -1409,14 +1490,17 @@
 
 		If StarwState = "Press" Then
 			Machine StrawOrder	
+			Var LedLidBlink = "true"
 		EndIf
 
 		If LidState = "Press" Then
 			Machine LidOrder	
+			Var LedLidBlink = "true"
 		EndIf
 
 		Var StarwState = "Enable"
 		Var LidState = "Enable"
+		; 
 		
 	EndIf
 

xml/vending_info.xml

@@ -78,6 +78,10 @@
 	var Text2_7 = Text2_7 + " ["
 	var Text2_7 = Text2_7 + SignalStrengthLevel
 	var Text2_7 = Text2_7 + "]"
+
+	Topping "DeleteCart" 1
+	Topping "DeleteCart" 2
+	Topping "DeleteCart" 3
 	
 </EventOpen>
 <Timeout> 1000 </Timeout>

xml/video_loop2.xml

@@ -9,7 +9,7 @@
 </Video>
 <EventOpen>
 	DEBUGVAR HeadVideoFilename
-	
+	Var ClickCountMainTe = 0
 </EventOpen>
 
 <Timeout> 14000 </Timeout>
@@ -34,10 +34,10 @@
 
 
 <Image>
-<X> 870 </X>
+<X> 670 </X>
 <Y> 0 </Y>
-<Width> 200 </Width>
-<Height> 200 </Height>
+<Width> 400 </Width>
+<Height> 400 </Height>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClickLong> 
@@ -45,7 +45,14 @@
 	;OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
 </EventClickLong>
 <EventClick> 
-	;OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
+	Var ClickCountMainTe = ClickCountMainTe + 1
+	
+	DEBUGVAR ClickCountMainTe
+	
+	If ClickCountMainTe = 2 Then 
+ 		OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
+ 	EndIf
+
 	;OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
 </EventClick>
 </Image>