Do point

xml/page_board.xml

@@ -35,6 +35,8 @@
 	Var ShowButtonClick = "Enable"
 	Var ShowButtonClickFull = "Invisible"
 
+	Var XPosiShowCountDownBrew = 788
+
 </EventOpen>
 
 <Timeout> 800 </Timeout>

xml/page_brewing2.xml

@@ -188,7 +188,7 @@
 </Image>
 
 <Text>
-<X> 808 </X>
+<X> XPosiShowCountDownBrew </X>
 <Y> 480 </Y>
 <Width> 1080</Width>
 <Align> "Hurr" </Align>

xml/page_collect_point_1.xml

@@ -8,19 +8,37 @@
 <EventOpen>
 	; On open
 
+	Var Tel_Confirm_State = "Disable"
+	Var ShowTextNumber = "Enable"
 	Var Timeout = 0
 	Var TelephoneNumber = ""
     
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
-	
 
+	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
+
+	
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen > 0 Then
+		Var ShowTextNumber = "Invisible"
+	EndIf
 	
 
 	Var Timeout = Timeout + 1
 	If Timeout > 20 Then
-        Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
+        ;Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 	EndIf
 
 	TimerReset
@@ -285,8 +303,8 @@
 <Button>
 <X> 44 </X>
 <Y> 1783 </Y>
-<Filename> "ROOT/taobin_project/image/enter_point/bn_ignore.png" </Filename>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_ignore.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/enter_point/bp_ignore.png" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_ignore.png" </FilenamePress>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -300,15 +318,14 @@
 <X> 751 </X>
 <Y> 1783 </Y>
 <State> Tel_Confirm_State </State>
-<Filename> "ROOT/taobin_project/image/enter_point/bn_confirm.png" </Filename>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_confirm.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/enter_point/bp_confirm.bmp" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_confirm.png" </FilenamePress>
-<FilenameDisable> "ROOT/taobin_project/image/enter_point/bn_confirm.bmp" </FilenameDisable>
+<FilenameDisable> "ROOT/taobin_project/image/collectiing/bd_confirm.png" </FilenameDisable>
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	Var StepGetPoint = 0
 
-	;GETACCEXT TelephoneNumber 5
 	Var PdpaAsk = 0
 	
 	Var OperatorTemp = ""
@@ -316,7 +333,7 @@
 	Var OperatorStatus = ""
 	Var AccountType = ""
 	GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
-	Open "/media/bt/xml/page_collect_point_2.xml"  
+	Open "ROOT/taobin_project/xml/page_collect_point_2.xml"  
 </EventClick>
 </Button>
 
@@ -328,18 +345,18 @@
 </Image>
 
 <Image>
-<X> 378 </X>
+<X> 364 </X>
-<Y> 874 </Y>
+<Y> 887 </Y>
 <State> ShowTextNumber </State>
-<Filename> "ROOT/taobin_project/image/enter_point/text3.png" </Filename>
+<Filename> "ROOT/taobin_project/image/collectiing/text21.png" </Filename>
 </Image>
 
 
 
 <Image>
-<X> 240 </X>
+<X> 178 </X>
-<Y> 606 </Y>
+<Y> 680 </Y>
-<Filename> "ROOT/taobin_project/image/enter_point/text2.png" </Filename>
+<Filename> "ROOT/taobin_project/image/collectiing/text20.png" </Filename>
 </Image>
 
 
@@ -348,6 +365,26 @@
 <Y> 0 </Y>
 <Filename> "ROOT/taobin_project/image/ad_medium_2.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> 480 </Y>
+<Width> 1080</Width>
+<Align> "Hurr" </Align>
+<Size> 88 </Size>
+<Font> KanitRegularTTF</Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+			
+
 			
 <EventSecurity> 
 	Open "/media/bt/xml/security_alarm.xml" 

xml/page_collect_point_2.xml

@@ -11,6 +11,8 @@
 	Var Timeout = 0
 	Var TelephoneNumber = ""
     
+    ;Open "ROOT/taobin_project/xml/page_show_consent.xml" 
+		
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -18,7 +20,7 @@
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
         ;Var CoffeePoint = 1 
-		;Open "/media/bt/xml/page_collect_point_3.xml" 
+		;Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 		
 		If StepGetPoint = 0 Then
 			Open "ROOT/taobin_project/xml/page_show_consent.xml" 
@@ -110,10 +112,31 @@
 	EndIf
 
 	If MachineStage = "drink-failed" Then
-		Var MachineState_Result = 1
+		Var MachineState_Result = 2
 	EndIf
 </EventMachine>
 
 
+
+
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
+</Image>
+
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 480 </Y>
+<Width> 1080</Width>
+<Align> "Hurr" </Align>
+<Size> 88 </Size>
+<Font> KanitRegularTTF</Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+			
+
+
 </Popup>
 	

xml/page_lid_straw.xml

@@ -163,7 +163,7 @@
 </Image>
 ; show counter brewing
 <Text>
-<X> 808 </X>
+<X> XPosiShowCountDownBrew </X>
 <Y> 480 </Y>
 <Width> 1080</Width>
 <Align> "Hurr" </Align>

xml/page_payment_cash.xml

@@ -323,10 +323,13 @@
 <Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
 <EventClick>
 	Var MachineStage = "make-drink"
+	Var CountDownBrewing = 120
+
 	;Var BrewingTextThai = "เตรียมแก้ว"
 	;MakeDrinkV1  SelectDrink SelectSugarID
 	
 	;Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+	
 	Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
 
 </EventClick>

xml/page_show_consent.xml

@@ -16,12 +16,22 @@
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
-	;Open "ROOT/xml/page_board.xml" 
+	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
 
 	Var Timeout = Timeout + 1
 	If Timeout > 20 Then
         ; goto lid straw
-	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 	EndIf
 
 	TimerReset
@@ -44,8 +54,8 @@
 <Button>
 <X> 750 </X>
 <Y> 1782 </Y>
-<Filename> "ROOT/taobin_project/image/bn_accept.bmp" </Filename>
+<Filename> "ROOT/taobin_project/image/consent/bn_accept.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/bp_accept.bmp" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/consent/bp_accept.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -61,8 +71,8 @@
 <Button>
 <X> 44 </X>
 <Y> 1782 </Y>
-<Filename> "ROOT/taobin_project/image/bn_decline.bmp" </Filename>
+<Filename> "ROOT/taobin_project/image/consent/bn_decline.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/bย_decline.bmp" </FilenamePress>
+<FilenamePress> "ROOT/taobin_project/image/consent/bย_decline.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
@@ -84,16 +94,35 @@
 <Image>
 <X> 59 </X>
 <Y> 1290 </Y>
-<Filename> "ROOT/taobin_project/image/img1.png" </Filename>
+<Filename> "ROOT/taobin_project/image/consent/img1.png" </Filename>
 </Image>
 
 <Image>
 <X> 106 </X>
 <Y> 469 </Y>
-<Filename> "ROOT/taobin_project/image/img3.png" </Filename>
+<Filename> "ROOT/taobin_project/image/consent/img3.png" </Filename>
 </Image>
+
+
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
+</Image>
+
+<Text>
+<X> 808 </X>
+<Y> 480 </Y>
+<Width> 1080</Width>
+<Align> "Hurr" </Align>
+<Size> 88 </Size>
+<Font> "ROOT/taobin_project/font/Roboto/Roboto-Regular.ttf"</Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
 			
 
+
 ; show counter brewing
 <Image>
 <X> 751 </X>