Before merge

xml/page_catalog.xml

@@ -146,7 +146,7 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink2_ext.xml" 
+	Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
 </EventClick>
 </Button>
 

xml/page_id_card_result.xml

@@ -0,0 +1,107 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	Var Timeout = 0
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/display_get_free_en"
+		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/display_get_free"
+		Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	Var CountDownBrewing = CountDownBrewing - 1
+	
+	Var Timeout = Timeout + 1
+	If Timeout > 10 Then
+    	; goto lid straw
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+
+
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+<EventActionOk>
+	;
+
+</EventActionOk>
+
+
+<EventMachine>
+	
+</EventMachine>
+
+
+<Image>
+<X> 0 </X>
+<Y> 0 </Y>
+<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+</Image>
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/display_get_free/alpha.png" </Filename>
+</Image>
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<Filename> Var( DirImage + "/img_popup1.png" )</Filename>
+</Image>
+
+
+<Button>
+<X> 397 </X>
+<Y> 1680 </Y>
+<Filename> Var( DirImage + "/bp_accept.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+
+</EventClick>
+</Button>
+
+;
+<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>
+
+
+</Popup>

xml/page_lid_straw.xml

@@ -191,12 +191,7 @@
 
 <EventMachine>
 	
-	If MachineStage = "drink-failed" Then
-		Var MachineState_Result = 1
-		Open "ROOT/taobin_project/xml/page_brewing2.xml" 
-	EndIf
 
-	<EventMachine>
 	If MachineStage = "drink-success" Then
 		Var MachineState_Result = 1
 	EndIf

xml/page_payment_cash.xml

@@ -709,8 +709,14 @@
 		; make drink
 		;MakeDrinkV1  SelectDrink SelectSugarID
 
-		Var UnitTestType = "1"
+		;Var UnitTestType = "1"
-		Open "ROOT/taobin_project/xml/page_thankyou.xml"
+		Var UnitTestType = "2"
+		
+		Open "ROOT/taobin_project/xml/page_id_card_result.xml"
+		
+		;Open "ROOT/taobin_project/xml/page_payment_code.xml"
+		
+		;Open "ROOT/taobin_project/xml/page_thankyou.xml"
 
 		;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
 		

xml/page_payment_code.xml

@@ -461,7 +461,7 @@
 
 		
 
-	If RoadShow = "true" Then
+	If UnitTestType = "2" Then
 		If TelephoneNumber = "00000000" Then
 			Var ShowErrorText = "Enable"
 		EndIf
@@ -566,7 +566,7 @@
 
 <Image>
 <X> 330 </X>
-<Y> 993 </Y>
+<Y> 942 </Y>
 <State> ShowErrorText </State>
 <Filename> "ROOT/taobin_project/image/collectiing/text_show_error.png" </Filename>
 </Image>