Add file and Image

xml/page_board.xml

@@ -52,29 +52,32 @@
 	EndIf
 
 	If MachineStage = "close-maintenance" Then
-		;Open "ROOT/taobin_project/xml/page_show_error.xml"
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
 
 	EndIf
 
+	Var IgnoreNetCore = "true"
 	
 
 </EventOpen>
 
 <Timeout> 800 </Timeout>
 <EventTimeout>
-	;If NetworkStatus = "DOWN" Then
-	;	Open "/ROOT/xml/outservice.xml" 
-	;EndIf
-	;If NetworkStatus = "DEACTIVE" Then
-	;		Open "/ROOT/xml/offline.xml" 
-	;EndIf
+	If IgnoreNetCore = "true" Then
+		If NetworkStatus = "DOWN" Then
+			Open "/ROOT/xml/outservice.xml" 
+		EndIf
+		If NetworkStatus = "DEACTIVE" Then
+				Open "/ROOT/xml/offline.xml" 
+		EndIf
 
-	If MachineStage = "close-maintenance" Then
-		Open "ROOT/taobin_project/xml/page_show_error.xml"
+		If MachineStage = "close-maintenance" Then
+			Open "ROOT/taobin_project/xml/page_show_error.xml"
+
+		EndIf
 
 	EndIf
 
-
 	If MachineStage = "drink-failed" Then
 		Open "ROOT/taobin_project/xml/page_show_error.xml"
 
@@ -123,7 +126,7 @@
 <Video>
 <X> 0 </X>
 <Y> 0 </Y>
-<Volume> 80 </Volume>
+;<Volume> 80 </Volume>
 <Loop> "true" </Loop>
 <Filename> "ROOT/taobin_project/video/main_page.mp4" </Filename>
 </Video>

xml/page_brewing3.xml

@@ -0,0 +1,639 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	
+	; On open move from page_brewing3.xml
+	Var LidState = "Enable"
+	Var StarwState = "Enable"
+	Var countClick2 = 0
+
+	Var Timeout = 0
+
+	Var PrintCoinAmount = 0
+
+</EventOpen>
+
+
+<EventActionOk>
+	If ActionOKCase = 1 Then
+		If CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			Var ECommerce = ECommerce + PriceDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + DiscountDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SessionID2 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SelectDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C"
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;Var Timeout = 0
+			Var ActionOKCase = 2
+			
+		Else 
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+		EndIf
+       
+    Else
+
+		If ActionOKCase = 2 Then
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+		EndIf
+
+	EndIf
+</EventActionOk>
+
+<EventActionError>
+   If ActionOKCase = 1 Then
+		If CodeChannel = 1 Then 
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			Var ECommerce = ECommerce + PriceDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + DiscountDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SessionID2 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SelectDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C"
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;Var Timeout = 0
+			Var ActionOKCase = 2
+			
+		Else 
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+		EndIf
+       
+    Else
+
+		If ActionOKCase = 2 Then
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+		EndIf
+
+	EndIf
+</EventActionError>
+
+
+<Timeout> 600 </Timeout>
+<EventTimeout> 
+
+	Var Timeout = Timeout + 1
+
+	Var CountDownBrewing = CountDownBrewing - 1
+	
+	; run test;
+	;If CountDownBrewing = 40 Then 
+	;	Open "ROOT/taobin_project/xml/page_drinkok.xml"  
+	;EndIf
+	If CountDownBrewing = 0 Then
+		;Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+	EndIf
+
+	Var ShowCountDownBrewing = CountDownBrewing
+
+
+	If Timeout > 330 Then
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	EndIf
+	
+
+	If Timeout > 300 Then
+		Var MachineState_Result = 2
+	EndIf
+
+	If ChangeFlag = 1 Then
+		Var ChangeTimeout = ChangeTimeout + 1
+	EndIf
+
+
+	If  ChangeOK = 2 Then
+		If ActionOKCase = 0 Then
+			Var TelephoneNumber = "0899999999"
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
+			Var ServiceType = "credit"
+			Var SessionID2 = SelectDrink
+			Var ServiceCredit = "coffee"
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+			;Open "ROOT/xml/page_closeMaintenance.xml" 
+			Var ActionOKCase = 1
+		EndIf
+	EndIf
+
+	If  ChangeTimeout > 30 Then
+		If ActionOKCase = 0 Then
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "credit"
+			Var SessionID2 = SelectDrink
+			Var ServiceCredit = "coffee"
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+			;Open "ROOT/xml/menu_closeMaintenance.xml" 
+			Var ActionOKCase = 1
+		EndIf
+	EndIf
+
+	If ChangeOK = 3 Then
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	EndIf
+
+	If ChangeOK = 4 Then
+		If ActionOKCase = 0 Then
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			Var ECommerce = ECommerce + PriceDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + DiscountDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SessionID2 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SelectDrink 
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C00"
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C"
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;Var Timeout = 0
+			Var ActionOKCase = 2
+		EndIf
+	EndIf
+
+
+	If MachineState_Result = 1 Then
+		Var Timeout = 0
+	  	Var ProcessText = "" 
+
+		Var TelephoneNumber = "0899999999"
+		Var ServiceType = "coffee"
+		Var ServiceCredit = SelectDrink
+		Var SuggestID  = ""
+
+		If PayWithQR = 0 Then
+			If CodeChannel = 1 Then
+				Var SessionID2 = SessionID2 + "/"
+				Var SessionID2 = SessionID2 + CodeNumber
+				Var SessionID2 = SessionID2 + "/"
+				Var SessionID2 = SessionID2 + VendingCode
+				Var SessionID2 = SessionID2 + "/"
+				Var SessionID2 = SessionID2 + SelectDrink
+				Var SessionID2 = SessionID2 + "/"
+				Var SessionID2 = SessionID2 + BoxID
+				Var SessionID2 = SessionID2 + "/"
+				Var SessionID2 = SessionID2 + "S"
+				Var SessionID2 = SessionID2 + "/"
+				Var SessionID2 = SessionID2 + CodeNumber
+				Var SessionID2 = SessionID2 + "/"
+
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+			Else
+				If CodeChannel = 2 Then
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + ""
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + VendingCode
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + SelectDrink
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + BoxID
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + "S"
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + CodeNumber
+					Var SessionID2 = SessionID2 + "/"
+
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+				Else
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+				EndIf
+			EndIf
+
+			
+		Else
+			If ChangeFlag2 = 1 Then
+				Var TelephoneNumber = "0899999999"
+				Var VendingDiscount = 0
+				Var VendingCampaign = 0
+				Var ServiceType = "credit"
+				Var SessionID2 = SelectDrink
+				Var ServiceCredit = "coffee"
+				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+			EndIf
+			
+		EndIf
+
+
+		Var ServiceSuccess = "yes"
+		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+
+	EndIf
+
+	If MachineState_Result = 2 Then
+		If ErrTimeout = 0 Then
+			Var ErrTimeout = 1
+
+			
+
+			If PayWithQR = 0 Then
+				If CodeChannel = 0 Then
+					If ChangeFlag = 0 Then
+						Var ChangeFlag = 1 
+						Change ServiceAmount2
+						
+					EndIf
+				Else
+					If CoinAmount > 0 Then
+					
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+							Var ServiceAmount2 = ServiceAmount2 - IntVendingCampaign
+							Change ServiceAmount2
+							
+						EndIf
+					Else
+
+						If ChangeFlag2 = 1 Then
+							Var ChangeOK = 2
+						Else
+							If CodeChannel = 1 Then
+								Var ChangeOK = 4
+							Else
+								Var ChangeOK = 3
+							EndIf 
+							
+						EndIf
+					EndIf
+
+					
+				EndIf
+			Else
+
+				If CodeChannel = 0 Then
+
+					If CoinAmount > 0 Then
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+							Var ServiceAmount2 = CoinAmount
+							Change CoinAmount
+							
+						EndIf
+					Else
+						If ChangeFlag2 = 1 Then
+							Var ChangeOK = 2
+						Else
+							Var ChangeOK = 3
+						EndIf
+					EndIf
+
+				Else
+
+					If CoinAmount > 0 Then
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1 
+							Var ServiceAmount2 = CoinAmount
+							Change CoinAmount
+							
+						EndIf
+					Else
+						If ChangeFlag2 = 1 Then
+							Var ChangeOK = 2
+						Else
+							Var ChangeOK = 4
+						EndIf
+					EndIf
+
+				EndIf
+
+
+
+			EndIf
+
+			OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_drinkfail.xml"
+			OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
+
+			;Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
+			
+		EndIf
+	EndIf
+
+
+	If MachineStage = "show-menu" Then
+		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+	EndIf
+	
+	If MachineStage = "close-maintenance" Then
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	EndIf
+	
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		If RoadShow = "true" Then
+			Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+		Else
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+
+
+	; animation video loop
+	If AnimationOn = "true" Then
+		Var CountUpBrewing = CountUpBrewing + 1
+
+		Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
+		
+		If PreviseStepVideo = SlotVideo Then
+			SAVELOG SlotVideo
+		Else
+			Var PreviseStepVideo = SlotVideo
+			SAVELOG PreviseStepVideo
+			SAVELOG SlotVideo
+			SAVELOG CountUpBrewing
+
+			;Var CountDownVideoTime = CountDownVideoTimeReload
+			
+			Var StepVideo = SlotVideo + 2
+			
+			SAVELOG StepVideo
+
+			If StepVideo = 1 Then
+				Var videoID = VideoID1
+			EndIf
+			If StepVideo = 2 Then
+				Var videoID = VideoID2
+			EndIf
+			If StepVideo = 3 Then
+				Var videoID = VideoID3
+			EndIf
+			If StepVideo = 4 Then
+				Var videoID = VideoID4
+			EndIf
+			If StepVideo = 5 Then
+				Var videoID = VideoID5
+			EndIf
+			If StepVideo = 6 Then
+				Var videoID = VideoID6
+			EndIf
+			If StepVideo = 7 Then
+				Var videoID = VideoID7
+			EndIf
+
+			SAVELOG videoID
+
+			If videoID = 0 Then
+
+			Else
+
+				Var VideoPlayFile = VideoPath
+				Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+				Var VideoPlayFile = VideoPlayFile + videoID
+				Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+				SAVELOG VideoPlayFile
+			EndIf
+		EndIf
+	EndIf
+
+	Refresh
+	TimerReset
+
+</EventTimeout> 
+
+<EventMachine>
+	
+	;If MachineStage = "drink-success" Then
+	;	Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+	;EndIf
+	;If MachineStage = "drink-failed" Then
+	;	Open "ROOT/taobin_project/xml/page_drinkfail.xml" 
+	;EndIf
+
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		If RoadShow = "true" Then
+			Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+		Else
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+
+	Refresh
+	
+</EventMachine>
+
+; this copy in file menu_brew2.xml and menu_lid_straw.xml
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then 
+		If ChangeFlag = 1 Then
+			Var ChangeOK = 2
+		EndIf
+	EndIf
+</EventChangeStatus>
+
+<Video>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080</Width>
+<Height> 840 </Height>
+<Refresh> "Reload" </Refresh>
+<Loop> "true" </Loop>
+<Filename> VideoPlayFile </Filename>
+</Video>
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+;</Image>
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/video/taobin_adv2.mp4" </Filename>
+</Video>
+
+
+
+;<Image>
+;<X> 140 </X>
+;<Y> 1124 </Y>
+;<Filename> "ROOT/taobin_project/image/page_doing/text2.png" </Filename>
+;</Image>
+
+
+;
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
+</Image>
+;
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 470 </Y>
+<Align> End </Align>
+<Width> 153 </Width>
+<Size> 88 </Size>
+<Font> RobotoBold </Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+
+;<Text>
+;<X> 100 </X>
+;<Y> 470 </Y>
+;<Align> End </Align>
+;<Width> 153 </Width>
+;<Size> 30 </Size>
+;<Font> RobotoBold </Font>
+;<Color> 0x513C2F </Color>
+;<Value> MachineStage </Value>
+;</Text>
+;
+
+
+<Text>
+<X> 0 </X>
+<Y> 1880 </Y>
+<Size> 30 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> MachineStage </Value>
+</Text>
+
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick = countClick + 1
+	If countClick = 3 Then
+		
+	EndIf
+
+	If countClick = 5 Then
+		Var countClick = 0
+		MainMenu
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 870 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var countClick2 = countClick2 + 1
+	If countClick2 = 3 Then
+		
+	EndIf
+
+	If countClick2 = 5 Then
+		Var countClick2 = 0
+		Var HaveCup = "true"
+		Var MachineStage = "drink-success"
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+<Text>
+<X> 0 </X>
+<Y> 1886 </Y>
+<Size> 20 </Size>
+<Width> 1080</Width>
+<Align> Start </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> countClick </Value>
+</Text>
+<Text>
+<X> 0 </X>
+<Y> 1886 </Y>
+<Size> 20 </Size>
+<Width> 1080</Width>
+<Align> end </Align>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> countClick2 </Value>
+</Text>
+
+</Popup>

xml/page_catalog_choose_drink1.pml

@@ -10,10 +10,12 @@
  product_code.append('11-99-01-0002')
  product_code.append('11-99-01-0003')
  product_code.append('11-99-02-0005')
+
  product_code.append('11-99-02-0013')
  product_code.append('11-99-02-0014')
  product_code.append('11-99-02-0018')
  product_code.append('11-99-02-0020')
+ 
  product_code.append('11-99-02-0017')
  product_code.append('11-99-02-0023')
  product_code.append('11-99-02-0024')

xml/page_catalog_choose_drink2.pml

@@ -12,6 +12,7 @@
  product_code.append('11-99-01-0003')
 
  product_code.append('11-99-01-0004')
+ 
  product_code.append('11-99-01-0005')
  product_code.append('11-99-01-0006')
  #product_code.append('11-99-01-0007')

xml/page_drinkok.xml

@@ -17,6 +17,10 @@
 		Var DirImage = "ROOT/taobin_project/image/complete/"
 	EndIf
 
+	Var VideoPlayFile = VideoPath
+	Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+	Var VideoPlayFile = VideoPlayFile + "24"
+	Var VideoPlayFile = VideoPlayFile + VideoFileEnd
 </EventOpen>
 <Timeout> 800 </Timeout>
 <EventTimeout> 
@@ -47,20 +51,29 @@
 
 
 ; Old
+;<Video>
+;<X> 82 </X>
+;<Y> 717 </Y>
+;<Width> 917 </Width>
+;<Height> 917 </Height>
+;<Loop> "true" </Loop>
+;<Filename> "ROOT/taobin_project/video/taobin_drink_ok.mov" </Filename>
+;</Video>
+
 <Video>
-<X> 82 </X>
-<Y> 717 </Y>
-<Width> 917 </Width>
-<Height> 917 </Height>
+<X> 0 </X>
+<Y> 380 </Y>
+<Refresh> "Reload" </Refresh>
 <Loop> "true" </Loop>
-<Filename> "ROOT/taobin_project/video/taobin_drink_ok.mov" </Filename>
+<Filename> VideoPlayFile </Filename>
 </Video>
 
-<Image>
-<X> 0 </X>
-<Y> 547 </Y>
-<Filename> Var( DirImage + "/img2.png" ) </Filename>
-</Image>
+
+;<Image>
+;<X> 0 </X>
+;<Y> 547 </Y>
+;<Filename> Var( DirImage + "/img2.png" ) </Filename>
+;</Image>
 
 
 

xml/page_lid_straw.xml

@@ -9,8 +9,9 @@
 	; On open
 	Var LidState = Lid1Status
 	Var StarwState = "Enable"
-	Var LidStrawCountDown = 10
+	Var LidStrawCountDown = 15
 
+	
 
 	If show_eng = "true" Then 
 		Var DirImage = "ROOT/taobin_project/image/page_lid_straw_en"
@@ -19,8 +20,36 @@
 		Var DirImage = "ROOT/taobin_project/image/page_lid_straw"
 	EndIf
 
+
+	Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/"
+	Var VideoFileBegin = "TaoBin2_draft02_art"
+	Var VideoFileEnd = ".mp4"
+	
+	Var CountUpBrewing = BrewTime - CountDownBrewing
+	Var CountDownVideoTimeReload = AnimationVideoPlayTime
+	Var CountDownVideoTime = 1
+	Var StepVideo = 1
+	Var PreviseStepVideo = 90
+
+	SAVELOG AnimationOn
+	SAVELOG AnimationVideoPlayTime
+	SAVELOG VideoID1
+	SAVELOG VideoID2
+	SAVELOG VideoID3
+	SAVELOG VideoID4
+	SAVELOG VideoID5
+	SAVELOG VideoID6
+
+	Var VideoPlayFile = VideoPath
+	Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+	Var VideoPlayFile = VideoPlayFile + "1"
+	Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+	Var CountUpBrewing = CountUpBrewing + 4
+
+
 </EventOpen>
-<Timeout> 800 </Timeout>
+<Timeout> 600 </Timeout>
 <EventTimeout> 
 
 	Var CountDownBrewing = CountDownBrewing - 1
@@ -34,13 +63,71 @@
 	; count down
 	If LidStrawCountDown = 1 Then
 		Var LidStrawCountDown = 10
-		Open "ROOT/taobin_project/xml/page_brewing2.xml"  
+		;Open "ROOT/taobin_project/xml/page_brewing2.xml"
+		Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 	EndIf
 
 	Var ShowCountDownBrewing = CountDownBrewing
 	
+	; animation video loop
+	If AnimationOn = "true" Then
+		Var CountUpBrewing = CountUpBrewing + 1
+
+		Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
+		
+		If PreviseStepVideo = SlotVideo Then
+			SAVELOG SlotVideo
+		Else
+			Var PreviseStepVideo = SlotVideo
+			SAVELOG PreviseStepVideo
+			SAVELOG SlotVideo
+			SAVELOG CountUpBrewing
+
+			;Var CountDownVideoTime = CountDownVideoTimeReload
+			
+			Var StepVideo = SlotVideo + 2
+			
+			SAVELOG StepVideo
+
+			If StepVideo = 1 Then
+				Var videoID = VideoID1
+			EndIf
+			If StepVideo = 2 Then
+				Var videoID = VideoID2
+			EndIf
+			If StepVideo = 3 Then
+				Var videoID = VideoID3
+			EndIf
+			If StepVideo = 4 Then
+				Var videoID = VideoID4
+			EndIf
+			If StepVideo = 5 Then
+				Var videoID = VideoID5
+			EndIf
+			If StepVideo = 6 Then
+				Var videoID = VideoID6
+			EndIf
+			If StepVideo = 7 Then
+				Var videoID = VideoID7
+			EndIf
+
+			SAVELOG videoID
+
+			If videoID = 0 Then
+
+			Else
+
+				Var VideoPlayFile = VideoPath
+				Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+				Var VideoPlayFile = VideoPlayFile + videoID
+				Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+				SAVELOG VideoPlayFile
+			EndIf
+		EndIf
+	EndIf
+
 	Refresh
-	
 	TimerReset
 </EventTimeout> 
 
@@ -63,12 +150,12 @@
 <X> 0 </X>
 <Y> 380 </Y>
 <Width> 1080</Width>
-<Height> 606 </Height>
+<Height> 840 </Height>
+<Refresh> "Reload" </Refresh>
 <Loop> "true" </Loop>
-<Filename> "ROOT/taobin_project/video/taobin_brewing.mov" </Filename>
+<Filename> VideoPlayFile </Filename>
 </Video>
 
-
 <Image>
 <X> 0 </X>
 <Y> 1289 </Y>
@@ -97,7 +184,9 @@
 	If LidState = "Press" Then
 		Machine Lid
 	EndIf
-	Open "ROOT/taobin_project/xml/page_brewing2.xml"  
+
+
+	Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 </EventClick>
 </Button>
 

xml/page_payment.xml

@@ -46,6 +46,11 @@
 		Var DirImage = "ROOT/taobin_project/image/page_payment"
 	EndIf
 
+	If MachineStage = "close-maintenance" Then
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
+
+	EndIf
+
 	
 </EventOpen>
 <Timeout> 900 </Timeout>

xml/page_payment_cash.xml

@@ -832,12 +832,14 @@
 
 		Var MachineStage = "make-drink"
 		; make drink
-		;MakeDrinkV1  SelectDrink SelectSugarID
-
+		
+		MakeDrinkV1 SelectDrink ExtendData
+		Open "ROOT/taobin_project/xml/page_thankyou.xml"
+		
 		;Var UnitTestType = "1"
 		Var UnitTestType = "2"
 		
-		Open "ROOT/taobin_project/xml/page_show_consent2.xml"
+		;Open "ROOT/taobin_project/xml/page_show_consent2.xml"
 		
 		;Open "ROOT/taobin_project/xml/page_payment_code.xml"
 		

xml/page_thankyou.xml

@@ -7,8 +7,10 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	Var CountDownThankyou = 3
+	Var CountDownThankyou = 2
 	Var CountDownBrewing = BrewTime
+	Var CountUpBrewing = 0
+	SAVELOG BrewTime
 	Var ShowCountDownBrewing = CountDownBrewing
 	Var Timeout = 0
 	Var ChangeFlag = 0
@@ -18,7 +20,7 @@
 	Var ChangeFlag2 = 0
 
 </EventOpen>
-<Timeout> 800 </Timeout>
+<Timeout> 600 </Timeout>
 <EventTimeout> 
 	Var CountDownBrewing = CountDownBrewing - 1
 	Var CountDownThankyou = CountDownThankyou - 1
@@ -62,6 +64,12 @@
 	If CountDownThankyou = 0 Then 
 		;Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 		;Open "ROOT/taobin_project/xml/page_brewing.xml"  
+
+		Var CountDownBrewing = BrewTime
+		Var CountUpBrewing = 0
+		SAVELOG BrewTime
+		Var ShowCountDownBrewing = CountDownBrewing
+
 		Open "ROOT/taobin_project/xml/page_collect_point_1.xml"  
 	EndIf
 
@@ -92,22 +100,22 @@
 </Image>
 
 
-<Image>
-<X> 751 </X>
-<Y> 413 </Y>
-<Filename> page_doing_show_time_image </Filename>
-</Image>
-;
-<Text>
-<X> XPosiShowCountDownBrew </X>
-<Y> 470 </Y>
-<Align> End </Align>
-<Width> 153 </Width>
-<Size> 88 </Size>
-<Font> RobotoBold </Font>
-<Color> 0x513C2F </Color>
-<Value> ShowCountDownBrewing </Value>
-</Text>
+;<Image>
+;<X> 751 </X>
+;<Y> 413 </Y>
+;<Filename> page_doing_show_time_image </Filename>
+;</Image>
+;;
+;<Text>
+;<X> XPosiShowCountDownBrew </X>
+;<Y> 470 </Y>
+;<Align> End </Align>
+;<Width> 153 </Width>
+;<Size> 88 </Size>
+;<Font> RobotoBold </Font>
+;<Color> 0x513C2F </Color>
+;<Value> ShowCountDownBrewing </Value>
+;</Text>
 
 <EventChangeStatus>
 	If ChangeStatus = "payout-end" Then 

xml/test_video_loop.xml

@@ -3,7 +3,7 @@
 <Width> HeadScreenWidth </Width>
 <Height> HeadScreenHeight </Height>
 <Video> 
-<Volume> 0 </Volume>
+;<Volume> 0 </Volume>
 <Filename>	"/mnt/sdcard/coffeevending/taobin_project/video/taobin_adv1.mp4"  </Filename>
 </Video>
 <EventOpen>

xml/vending_info.xml

@@ -74,33 +74,42 @@
 <Image>
 <X> info_startX </X>
 <Y> info_1Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick>
+	Machine DoorOpen
+</EventClick>
 </Image>
 
 
 <Image>
 <X> info_startX </X>
 <Y> info_2Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick>
+	Machine Lid
+</EventClick>
 </Image>
 
 <Image>
 <X> info_startX </X>
 <Y> info_3Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick>
+	Machine Straw
+</EventClick>
 </Image>
 
 <Image>
 <X> info_startX </X>
 <Y> info_4Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 </Image>
 
 
 <Image>
 <X> info_startX </X>
 <Y> info_5Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 </Image>
 
 
@@ -108,33 +117,33 @@
 <Image>
 <X> info2_startX </X>
 <Y> info_1Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 </Image>
 
 
 <Image>
 <X> info2_startX </X>
 <Y> info_2Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 </Image>
 
 <Image>
 <X> info2_startX </X>
 <Y> info_3Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 </Image>
 
 <Image>
 <X> info2_startX </X>
 <Y> info_4Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 </Image>
 
 
 <Image>
 <X> info2_startX </X>
 <Y> info_5Y </Y>
-<Filename> "ROOT/ui/page_03_summary/pic_summary_tab.png" </Filename>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 <EventClick>
 	Open "ROOT/xml/test_coin.xml"
 </EventClick>
@@ -238,8 +247,8 @@
 <Button>
 <X> 431 </X>
 <Y> 805 </Y>
-<Filename> "ROOT/image/BN_Cancle.bmp" </Filename>
-<FilenamePress> "ROOT/image/BP_Cancle.bmp" </FilenamePress>
+<Filename> "ROOT/taobin_project/image//bp_cancel.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/bp_cancel.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>