diff --git a/image/collect_point1/bn_negative.png b/image/collect_point1/bn_negative.png
new file mode 100644
index 00000000..2c3b3273
Binary files /dev/null and b/image/collect_point1/bn_negative.png differ
diff --git a/image/collect_point1/bn_positive.png b/image/collect_point1/bn_positive.png
new file mode 100644
index 00000000..564428f0
Binary files /dev/null and b/image/collect_point1/bn_positive.png differ
diff --git a/image/collect_point1/bp_negative.png b/image/collect_point1/bp_negative.png
new file mode 100644
index 00000000..f807aca6
Binary files /dev/null and b/image/collect_point1/bp_negative.png differ
diff --git a/image/collect_point1/bp_positive.png b/image/collect_point1/bp_positive.png
new file mode 100644
index 00000000..2da046fc
Binary files /dev/null and b/image/collect_point1/bp_positive.png differ
diff --git a/image/collect_point1/img3.png b/image/collect_point1/img3.png
new file mode 100644
index 00000000..62151f7a
Binary files /dev/null and b/image/collect_point1/img3.png differ
diff --git a/image/collect_point1/text_1.png b/image/collect_point1/text_1.png
new file mode 100644
index 00000000..9ea21c00
Binary files /dev/null and b/image/collect_point1/text_1.png differ
diff --git a/image/collect_point1/text_edit.png b/image/collect_point1/text_edit.png
new file mode 100644
index 00000000..8b0c1a2c
Binary files /dev/null and b/image/collect_point1/text_edit.png differ
diff --git a/image/collect_point1_en/bn_ignore.png b/image/collect_point1_en/bn_ignore.png
new file mode 100644
index 00000000..d4fba8c8
Binary files /dev/null and b/image/collect_point1_en/bn_ignore.png differ
diff --git a/image/collect_point1_en/bn_negative.png b/image/collect_point1_en/bn_negative.png
new file mode 100644
index 00000000..2c3b3273
Binary files /dev/null and b/image/collect_point1_en/bn_negative.png differ
diff --git a/image/collect_point1_en/bn_positive.png b/image/collect_point1_en/bn_positive.png
new file mode 100644
index 00000000..efb7c0bb
Binary files /dev/null and b/image/collect_point1_en/bn_positive.png differ
diff --git a/image/collect_point1_en/bp_negative.png b/image/collect_point1_en/bp_negative.png
new file mode 100644
index 00000000..7bb10ea0
Binary files /dev/null and b/image/collect_point1_en/bp_negative.png differ
diff --git a/image/collect_point1_en/bp_positive.png b/image/collect_point1_en/bp_positive.png
new file mode 100644
index 00000000..5264463e
Binary files /dev/null and b/image/collect_point1_en/bp_positive.png differ
diff --git a/image/collect_point1_en/img3.png b/image/collect_point1_en/img3.png
new file mode 100644
index 00000000..62151f7a
Binary files /dev/null and b/image/collect_point1_en/img3.png differ
diff --git a/image/collect_point1_en/text_1.png b/image/collect_point1_en/text_1.png
new file mode 100644
index 00000000..95049193
Binary files /dev/null and b/image/collect_point1_en/text_1.png differ
diff --git a/image/collect_point1_en/text_edit.png b/image/collect_point1_en/text_edit.png
new file mode 100644
index 00000000..65e64731
Binary files /dev/null and b/image/collect_point1_en/text_edit.png differ
diff --git a/image/page_payment_en/page_payment/bn_cash_2.png b/image/page_payment_en/page_payment/bn_cash_2.png
new file mode 100644
index 00000000..8bda29b2
Binary files /dev/null and b/image/page_payment_en/page_payment/bn_cash_2.png differ
diff --git a/image/page_payment_en/page_payment/bp_cash_2.png b/image/page_payment_en/page_payment/bp_cash_2.png
new file mode 100644
index 00000000..584ca987
Binary files /dev/null and b/image/page_payment_en/page_payment/bp_cash_2.png differ
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 48c9c318..abb4cc6f 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -43,15 +43,19 @@
 	Var ShowButtonClick = "Enable"
 	Var ShowButtonClickFull = "Invisible"
 
-	;Var XPosiShowCountDownBrew = 768
-	Var XPosiShowCountDownBrew = 693
+	SAVELOG DisplayType
+
+	If DisplayType = "2" Then
+		Var XPosiShowCountDownBrew = 693
+	Else
+		Var XPosiShowCountDownBrew = 768
+	EndIf
 
 	If MachineStage = "close-maintenance" Then
 		Open "ROOT/taobin_project/xml/page_show_error.xml"
 
 	EndIf
 
-	Var DirectoryImage = "ROOT/taobin_project/image"
 	
 
 </EventOpen>
diff --git a/xml/page_catalog_choose_drink1.pml b/xml/page_catalog_choose_drink1.pml
index a19911f8..ec6441e1 100644
--- a/xml/page_catalog_choose_drink1.pml
+++ b/xml/page_catalog_choose_drink1.pml
@@ -112,7 +112,7 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 420 </Y>
+<Y> 397 </Y>
 <Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -124,7 +124,7 @@
 </Button>
 
 <Button>
-<X> 990 </X>
+<X> 1000 </X>
 <Y> 415 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
@@ -169,7 +169,7 @@
 </Button>
 
 <Button>
-<X> 397 </X>
+<X> 394 </X>
 <Y> 395 </Y>
 <Filename> Var( DirImage + "/bn_tea.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_tea.png") </FilenamePress>
diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml
index 717864d8..4d9543dd 100644
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@@ -57,7 +57,7 @@
 ; back
 <Button>
 <X> 19 </X>
-<Y> 420 </Y>
+<Y> 397 </Y>
 <Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -69,7 +69,7 @@
 </Button>
 
 <Button>
-<X> 990 </X>
+<X> 1000 </X>
 <Y> 415 </Y>
 <Filename> show_btn </Filename>
 <FilenamePress> show_btp </FilenamePress>
@@ -114,7 +114,7 @@
 </Button>
 
 <Button>
-<X> 397 </X>
+<X> 394 </X>
 <Y> 395 </Y>
 <Filename> Var( DirImage + "/bn_tea.png") </Filename>
 <FilenamePress> Var( DirImage + "/bp_tea.png") </FilenamePress>
diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml
index c54de7d3..dc57110f 100644
--- a/xml/page_collect_point_1.xml
+++ b/xml/page_collect_point_1.xml
@@ -14,9 +14,9 @@
 	Var TelephoneNumber = ""
     
     If show_eng = "true" Then 
-		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+		Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
 	Else
-		Var DirImage = "ROOT/taobin_project/image/collectiing"
+		Var DirImage = "ROOT/taobin_project/image/collect_point1"
 	EndIf
 
 </EventOpen>
@@ -51,6 +51,23 @@
 	Refresh
 </EventTimeout> 
 
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+</Image>
+
+
+
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/img_popup1.png" </Filename>
+</Image>
+
 <Button>
 <X> 333 </X>
 <Y> 1086 </Y>
@@ -254,22 +271,6 @@
 </EventClick>
 </Button>
 
-
-<Button>
-<X> 44 </X>
-<Y> 1783 </Y>
-<Filename> Var( DirImage + "/bn_back.png" ) </Filename>
-<FilenamePress> Var( DirImage + "/bp_back.png" )</FilenamePress>
-<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var PayState1 = "PressForever"
-	Var PayState2 = "Enable"
-	Var QRChannel = 0
-	Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
-</EventClick>
-</Button>
-
 <Button>
 <X> 620 </X>
 <Y> 1517 </Y>
@@ -294,6 +295,7 @@
 </EventClick>
 </Button>
 
+
 <Text>
 <X> 0 </X>
 <Y> 873 </Y>
@@ -307,10 +309,10 @@
 </Text>
 
 <Button>
-<X> 44 </X>
-<Y> 1783 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_ignore.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_ignore.png" </FilenamePress>
+<X> 218 </X>
+<Y> 1671 </Y>
+<Filename> Var( DirImage + "/bn_negative.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_negative.png") </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -321,12 +323,12 @@
 
 
 <Button>
-<X> 751 </X>
-<Y> 1783 </Y>
+<X> 577 </X>
+<Y> 1671 </Y>
 <State> Tel_Confirm_State </State>
-<Filename> "ROOT/taobin_project/image/collectiing/bn_confirm.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_confirm.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_confirm.png" </FilenameDisable>
+<Filename>  Var( DirImage + "/bn_positive.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_positive.png") </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bn_positive.png") </FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -343,29 +345,28 @@
 </EventClick>
 </Button>
 
-
+; Border Edit
 <Image>
 <X> 217 </X>
-<Y> 833 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/img3.png" </Filename>
+<Y> 866 </Y>
+<Filename> "ROOT/taobin_project/image/collect_point1/img3.png" </Filename>
 </Image>
 
 <Image>
-<X> 364 </X>
-<Y> 887 </Y>
+<X> 157 </X>
+<Y> 868 </Y>
 <State> ShowTextNumber </State>
-<Filename> "ROOT/taobin_project/image/collectiing/text21.png" </Filename>
+<Filename> Var( DirImage + "/text_edit.png") </Filename>
 </Image>
 
 
-
 <Image>
-<X> 178 </X>
-<Y> 680 </Y>
-<Filename> "ROOT/taobin_project/image/collectiing/text20.png" </Filename>
+<X> 236 </X>
+<Y> 699 </Y>
+<Filename> Var( DirImage + "/text_1.png") </Filename>
 </Image>
 
-
+; Advertise
 <Image>
 <X> 0 </X>
 <Y> 0 </Y>
@@ -376,7 +377,7 @@
 <Image>
 <X> 751 </X>
 <Y> 413 </Y>
-<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
+<Filename> page_doing_show_time_image </Filename>
 </Image>
 ;
 <Text>
diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml
index a8cde5b4..4e2a507d 100644
--- a/xml/page_collect_point_2.xml
+++ b/xml/page_collect_point_2.xml
@@ -9,9 +9,12 @@
 	; On open
 
 	Var Timeout = 0
+	SAVELOG UnitTestType
 	
-    ;Open "ROOT/taobin_project/xml/page_show_consent.xml" 
-    ;Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+	If UnitTestType = "1" Then
+		Var CoffeePoint = 10
+		Open "ROOT/taobin_project/xml/page_show_consent.xml"
+	EndIf
 		
 </EventOpen>
 <Timeout> 1000 </Timeout>
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 323868ee..44487214 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -704,13 +704,21 @@
 	EndIf
 
 	If countClick2 = 5 Then
+
 		Var MachineStage = "make-drink"
+		; make drink
 		;MakeDrinkV1  SelectDrink SelectSugarID
+		
+		Var UnitTestType = "1"
+		Open "ROOT/taobin_project/xml/page_thankyou.xml"
+
+		;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+		
+		; show consent
 		;Open "ROOT/taobin_project/xml/page_show_consent.xml"
 		;Open "ROOT/taobin_project/xml/page_drinkok.xml"
 
-		Open "ROOT/taobin_project/xml/page_thankyou.xml"
-
+		
 		;Var CoffeePoint = 11
 		;Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
 		
diff --git a/xml/page_show_consent.xml b/xml/page_show_consent.xml
index 150ad78c..d9a0faff 100644
--- a/xml/page_show_consent.xml
+++ b/xml/page_show_consent.xml
@@ -83,7 +83,11 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-   
+    If UnitTestType = "1" Then
+		Var CoffeePoint = 10
+		Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
+	EndIf
+
     Var StepGetPoint = 1
     GETACCEXT TelephoneNumber 5
 	; goto lid straw