Do point

xml/page_board.xml

@@ -15,8 +15,11 @@
 	Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf"
 	Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf"
 
+	Var KanitBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Bold.ttf"
+
 	Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf"
 	Var RobotoBlack = "ROOT/taobin_project/font/Roboto/Roboto-Black.ttf"
+	Var RobotoRegular = "ROOT/taobin_project/font/Roboto/Roboto-Regular.ttf"
 
 	Var KanitMediumTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
 	Var KanitRegularTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
@@ -35,7 +38,7 @@
 	Var ShowButtonClick = "Enable"
 	Var ShowButtonClickFull = "Invisible"
 
-	Var XPosiShowCountDownBrew = 788
+	Var XPosiShowCountDownBrew = 768
 
 </EventOpen>
 

xml/page_brewing2.xml

@@ -181,24 +181,25 @@
 <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> 480 </Y>
+<Y> 470 </Y>
-<Width> 1080</Width>
+<Align> End </Align>
-<Align> "Hurr" </Align>
+<Width> 153 </Width>
 <Size> 88 </Size>
-<Font> "ROOT/taobin_project/font/Roboto/Roboto-Regular.ttf"</Font>
+<Font> RobotoBold </Font>
 <Color> 0x513C2F </Color>
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
-
 <Text>
 <X> 0 </X>
 <Y> 1880 </Y>

xml/page_collect_point_1.xml

@@ -366,20 +366,20 @@
 <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>
+<Y> 470 </Y>
-<Width> 1080</Width>
+<Align> End </Align>
-<Align> "Hurr" </Align>
+<Width> 153 </Width>
 <Size> 88 </Size>
-<Font> KanitRegularTTF</Font>
+<Font> RobotoBold </Font>
 <Color> 0x513C2F </Color>
 <Value> ShowCountDownBrewing </Value>
 </Text>
@@ -395,7 +395,7 @@
 	EndIf
 
 	If MachineStage = "drink-failed" Then
-		Var MachineState_Result = 1
+		Var MachineState_Result = 2
 	EndIf
 </EventMachine>
 

xml/page_collect_point_2.xml

@@ -9,16 +9,28 @@
 	; On open
 
 	Var Timeout = 0
-	Var TelephoneNumber = ""
+	
-    
     ;Open "ROOT/taobin_project/xml/page_show_consent.xml" 
+    Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
 		
 </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
+
+
 	Var Timeout = Timeout + 1
-	If Timeout > 30 Then
+	If Timeout > 5 Then
         ;Var CoffeePoint = 1 
 		;Open "ROOT/taobin_project/xml/page_show_consent.xml" 
 		
@@ -36,29 +48,6 @@
 </EventTimeout> 
 
 
-<Text>
-<X> 310 </X>
-<Y> 380 </Y>
-<Width> 474 </Width>
-<Align> Center </Align>
-<Size> 50 </Size>
-<Font> fontType1 </Font>
-<Color> 0xF0E000 </Color>
-<Value> TelephoneNumber </Value>
-<Format> Telnum </Format>
-</Text>
-
-<Text>
-<X> 310 </X>
-<Y> 550 </Y>
-<Width> 474 </Width>
-<Align> Center </Align>
-<Size> 50 </Size>
-<Font> fontType1 </Font>
-<Color> 0xF0E000 </Color>
-<Value> "กรุณารอซักครู่..." </Value>
-</Text>
-
 
 
 			
@@ -118,24 +107,50 @@
 
 
 
+<Image>
+<X> 178 </X>
+<Y> 680 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/text20.png" </Filename>
+</Image>
 
+
+<Image>
+<X> 0 </X>
+<Y> 0 </Y>
+<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+</Image>
+
+
+<Text>
+<X> 0 </X>
+<Y> 873 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 62 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> TelephoneNumber </Value>
+<Format> Telnum </Format>
+</Text>
+
+
+;
 <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>
+<Y> 470 </Y>
-<Width> 1080</Width>
+<Align> End </Align>
-<Align> "Hurr" </Align>
+<Width> 153 </Width>
 <Size> 88 </Size>
-<Font> KanitRegularTTF</Font>
+<Font> RobotoBold </Font>
 <Color> 0x513C2F </Color>
 <Value> ShowCountDownBrewing </Value>
 </Text>
-			
 
 
 </Popup>

xml/page_collect_point_3.xml

@@ -0,0 +1,175 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+
+	Var Timeout = 0
+	;CoffeePoint
+	Var CoffeePoint = 5
+    Var BmiYear = "0/0/0/1/0/0"
+    Var PointCrm = "pdpa1"
+    Var GetScore = ""
+	AddData 4 TelephoneNumber  BmiYear PointCrm GetScore
+
+
+    Var CoffeePointStr = CoffeePoint
+
+    SAVELOG 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
+
+	Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
+
+	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>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+</EventMachine>
+
+
+<Image>
+<X> 0 </X>
+<Y> 0 </Y>
+<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+</Image>
+
+
+<Image>
+<X> 252 </X>
+<Y> 666 </Y>
+<Filename> "ROOT/taobin_project/image/display_point/text1.png" </Filename>
+</Image>
+
+<Image>
+<X> 452 </X>
+<Y> 743 </Y>
+<Filename> "ROOT/taobin_project/image/display_point/text2.png" </Filename>
+</Image>
+
+
+<Image>
+<X> 323 </X>
+<Y> 825 </Y>
+<Filename> "ROOT/taobin_project/image/display_point/text3.png" </Filename>
+</Image>
+
+
+<Button>
+<X> 324 </X>
+<Y> 1083 </Y>
+<Filename> "ROOT/taobin_project/image/display_point/bn_10free1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/display_point/bp_10free1.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+    ; use point.
+</EventClick>
+</Button>
+
+
+
+<Button>
+<X> 397 </X>
+<Y> 1783 </Y>
+<Filename> "ROOT/taobin_project/image/display_point/bn_next.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/display_point/bp_next.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>
+
+<Text>
+<X> 420 </X>
+<Y> 638 </Y>
+<Size> 56 </Size>
+<Font> KanitBoldTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> TelephoneNumber </Value>
+<Format> Telnum </Format>
+</Text>
+
+
+<Text>
+<X> 323 </X>
+<Y> 865 </Y>
+<Width> 434 </Width>
+<Align> Center </Align>
+<Size> 64 </Size>
+<Font> KanitSemiBoldTTF </Font>
+<Color> 0xDE794E </Color>
+<Value> CoffeePoint </Value>
+</Text>
+
+;
+<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

@@ -155,26 +155,25 @@
 </Button>
 
 
-; show counter brewing
+
+;
 <Image>
 <X> 751 </X>
 <Y> 413 </Y>
-<Filename> "ROOT/taobin_project/image/page_lid_straw/img2.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
 </Image>
-; show counter brewing
+;
 <Text>
 <X> XPosiShowCountDownBrew </X>
-<Y> 480 </Y>
+<Y> 470 </Y>
-<Width> 1080</Width>
+<Align> End </Align>
-<Align> "Hurr" </Align>
+<Width> 153 </Width>
 <Size> 88 </Size>
-<Font> KanitRegularTTF </Font>
+<Font> RobotoBold </Font>
 <Color> 0x513C2F </Color>
 <Value> ShowCountDownBrewing </Value>
 </Text>
 
-
-
 ;<GIF>
 ;<X> 182 </X>
 ;<Y> 700 </Y>

xml/page_show_consent.xml

@@ -123,20 +123,21 @@
 			
 
 
-; show counter brewing
+
+;
 <Image>
 <X> 751 </X>
 <Y> 413 </Y>
-<Filename> "ROOT/taobin_project/image/page_lid_straw/img2.png" </Filename>
+<Filename> "ROOT/taobin_project/image/page_doing/img2.png" </Filename>
 </Image>
-; show counter brewing
+;
 <Text>
-<X> 808 </X>
+<X> XPosiShowCountDownBrew </X>
-<Y> 480 </Y>
+<Y> 470 </Y>
-<Width> 1080</Width>
+<Align> End </Align>
-<Align> "Hurr" </Align>
+<Width> 153 </Width>
 <Size> 88 </Size>
-<Font> KanitRegularTTF </Font>
+<Font> RobotoBold </Font>
 <Color> 0x513C2F </Color>
 <Value> ShowCountDownBrewing </Value>
 </Text>