Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

xml/page_back_to_remove_cup.xml

@@ -0,0 +1,55 @@
+<Popup>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+
+<EventOpen>
+	
+	OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
+	
+	If TermTemOnline = "true" Then
+		OpenInst 1 "/mnt/sdcard/coffeevending/termtem_project/xml/test_video_loop.xml"
+	Else
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
+	EndIf
+
+	TopView "hide"
+
+	If TNumberTaobinMember = "" Then
+
+	Else
+		If PayWithQR = 1 Then
+			Var VendingTSID = VendingTSIDTmp
+		EndIf 	
+
+
+		Var BmiYear = PointTaobinStr
+		Var PointCrm = ""
+
+		If FromConsent = 1 Then 
+			Var PointCrm = "pdpa1"
+		EndIf
+
+		Var GetScore = VendingTSID
+		If TaobinErrorNetwork = 0 Then
+			AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
+		Else
+			Var PointCrm = ""
+			AddData 14 TNumberTaobinMember  BmiYear PointCrm GetScore
+		EndIf
+
+		Var TNumberTaobinMember = ""
+		Var VendingTSID = ""
+
+	EndIf
+	
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
+
+
+</EventOpen>
+<Timeout> 60000 </Timeout>
+<EventTimeout> 
+	;Var menu_status = "stop"
+	
+</EventTimeout> 
+
+</Popup>

xml/page_board.xml

@@ -11,7 +11,7 @@
 	OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml"
 	Var FileNumber = 1
 
-	Var taobin_version = "1.47"
+	Var taobin_version = "1.49"
 
 	; On open
 	Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -95,10 +95,12 @@
 
 
 	If TaobinOnline = "true" Then
-		Var ShowButtonClickFull = "Invisible"
+		Var CountDownShowButton = 35
+	Var ShowButtonClickFull = "Invisible"
 		Var VideoMainPage = "ROOT/taobin_project/video/main_page.mp4"
 	EndIf
 	If TermTemOnline = "true" Then
+		Var CountDownShowButton = 28
 		Var ShowButtonClickFull = "Enable"
 		Var VideoMainPage = "ROOT/termtem_project/video/termtem01.mp4"
 	EndIf
@@ -124,7 +126,6 @@
 	;SAVELOG ShowPrice
 
 
-	Var CountDownShowButton = 35
 	Var CountDownPauseVideo = 0
 	Var NextPage = "-"
 
@@ -253,11 +254,34 @@
 
 	If TermTemOnline = "true" Then
 
+		If CountDownShowButton = 31 Then
+			Var ShowButtonClickFull = "Enable"
+			Var ShowButtonClick = "Invisible"
+			Refresh
+		EndIf
+
 		If CountDownShowButton = 3 Then
 			
-			Var ShowButtonClickFull = "Enable"	
+			Var ShowButtonClick = "Enable"
+			Var ShowButtonClickFull = "Invisible"	
 			Refresh
 		EndIf
+
+		If CountDownPauseVideo > 0 Then
+			; ignore
+			Var CountDownPauseVideo = CountDownPauseVideo - 1
+			If CountDownPauseVideo  = 0 Then
+
+				Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
+
+				OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+				OpenInst 2 "/mnt/sdcard/coffeevending/termtem_project/xml/page_tt__catalog_choose_drink1.xml"
+				
+				TopView "show"
+				Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+
+			EndIf
+		EndIf
 	EndIf
 
 
@@ -268,7 +292,7 @@
 
 		DEBUGVAR CountUpReloadAll
 		
-		If CountUpReloadAll > 130 Then
+		If CountUpReloadAll > 80 Then
 
 			Var StartUpExt = "-"
 			Var CountUpReloadAll = 0
@@ -292,7 +316,15 @@
 
 <EventEnd> 
 	;SAVELOG ShowButtonClick
-	Var CountDownShowButton = 35
+	
+	If TaobinOnline = "true" Then
+		Var CountDownShowButton = 35
+	EndIf
+	
+	If TermTemOnline = "true" Then
+		Var CountDownShowButton = 28
+	EndIf
+	
 	Var CountDownPauseVideo = 6
 	If TaobinOnline = "true" Then
 		TouchTapClose

xml/page_board_0.xml

@@ -29,6 +29,7 @@
 
 	Var RoadShow = "false"
 	Var IgnorePoint = "true"
+	Var ResetNumber = "0899999999"
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -110,6 +111,7 @@
 	If countClick = 3 Then
 		
 	EndIf
+	numberPhone = ""
 
 	If countClick = 5 Then
 		Var countClick = 0
@@ -127,7 +129,7 @@
 <Align> Center </Align>
 <Font> RobotoBlack </Font>
 <Color> 0x513C2F </Color>
-<Value> countClick </Value>
+<Value> numberPhone </Value>
 </Text>
 
 

xml/page_brewing3.xml

@@ -653,18 +653,6 @@
 	EndIf
 
 	DEBUGVAR CountUpBrewing
-
-	If CountUpBrewing = 5 Then
-		If StarwState = "Press" Then
-			Machine Straw
-			LED LedDoorLid Blink 255 255 255 255
-		EndIf
-		If LidState = "Press" Then
-			Machine Lid
-			LED LedDoorLid Blink 255 255 255 255
-		EndIf
-	EndIf
-
 	; animation video loop
 	If AnimationOn = "true" Then
 		Var CountUpBrewing = CountUpBrewing + 1

xml/page_drinkok.xml

@@ -74,7 +74,7 @@
 	EndIf
 	
 	If MachineStage = "remove-cup" Then
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 
 	EndIf
 

xml/page_payment.xml

@@ -65,7 +65,7 @@
 	EndIf
 
 	If MachineStage = "remove-cup" Then
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 
 	EndIf
 	
@@ -74,6 +74,17 @@
 </EventOpen>
 <Timeout> 900 </Timeout>
 <EventTimeout> 
+	
+	If ReadyForBrew = "false" Then
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		Var ReadyForBrew = "false"
+	EndIf
+
+	If MachineStage = "remove-cup" Then
+		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+
+	EndIf
+
 	Var CountStepPackPayment = CountStepPackPayment + 1
 	If CountStepPackPayment = 1 Then
 

xml/page_thankyou.xml

@@ -37,7 +37,14 @@
 	DEBUGVAR StarwState
 	DEBUGVAR LidState
 	
-
+	If StarwState = "Press" Then
+		Machine StrawWithDelay
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+	If LidState = "Press" Then
+		Machine LidWithDelay
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
 	
 
 </EventOpen>

xml/page_topping_select.xml

@@ -92,7 +92,11 @@
 		Var PriceDrinkTmp = "Free"
 	EndIf
 
-	Var StateImgKeto = "Invisible"
+	STRCONTAIN "ID=1058" MaterialAvailable sugarKeto
+	DEBUGVAR sugarKeto
+	If sugarKeto = "true" Then
+		Open "ROOT/taobin_project/xml/page_topping_select2.xml"  
+	EndIf
 
 
 	Var ToppingGotoPayment = "true"
@@ -206,13 +210,10 @@
 	DEBUGVAR toppingID2index3
 	DEBUGVAR toppingID2index4
 	DEBUGVAR toppingID2index5
-	
+		
-	Var sugarKeto = "false"
 
-
-	STRCONTAIN "ID=1058" MaterialAvailable sugarKeto
-	DEBUGVAR sugarKeto
 	
+
 	
 	DEBUGVAR MenuCodeName
 	DEBUGVAR toppingID1Default
@@ -233,7 +234,7 @@
 		DEBUGVAR BrewParam
 		DEBUGVAR IgnoreLidStraw
 		
-		Var h_block_of_sugar = 210
+		
 
 		If IgnoreLidStraw = "true" Then
 			Var IgnoreLidStraw = "false"
@@ -258,14 +259,7 @@
 
 		;PressForever
 		If TOPPING1 = "Sugar" Then
-			
+			Var BGSugar = "Enable"
-			If sugarKeto = "true" Then
-				Var StateImgKeto = "Enable"
-				Var BGSugar = "Invisible"
-			Else
-				Var BGSugar = "Enable"
-			Endif
-
 			Var ShiftSugarStep = 1
 			Var SugarState1 = "Enable"
 			Var SugarState2 = "Enable"
@@ -296,15 +290,7 @@
 		EndIf
 		
 		If TOPPING1 = "Powder Sugar" Then
-
+			Var BGSugar = "Enable"
-			If sugarKeto = "true" Then
-				Var StateImgKeto = "Enable"
-				Var BGSugar = "Enable"
-				Var h_block_of_sugar = 262
-			Else
-				Var BGSugar = "Enable"
-			EndIf
-			;Var BGSugar = "Enable"
 			Var ShiftSugarStep = 1
 			Var SugarState1 = "Enable"
 			Var SugarState2 = "Enable"
@@ -633,22 +619,15 @@
 ;- Begin topping1
 <Block>
 <Width> 986 </Width>
-<Height> h_block_of_sugar </Height>
+<Height> 210 </Height>
 <MarginTop> 5 </MarginTop>
 <State> BGSugar </State> 
 ; sugar layout
-;<Image>
-;<State> BGSugar </State>
-;<Filename> Var( DirImage + "/img_sugar.png" )</Filename>
-;</Image>
-
 <Image>
-<State> StateImgKeto </State>
+<State> BGSugar </State>
-<Filename> Var( DirImage + "/img_sugar_keto.png" )</Filename>
+<Filename> Var( DirImage + "/img_sugar.png" )</Filename>
 </Image>
 
-;
-
 ; sugar1
 <Button>
 <X> 137 </X>

xml/page_topping_select2.xml

@@ -92,6 +92,7 @@
 		Var PriceDrinkTmp = "Free"
 	EndIf
 
+	Var StateImgKeto = "Invisible"
 
 
 	Var ToppingGotoPayment = "true"
@@ -205,10 +206,13 @@
 	DEBUGVAR toppingID2index3
 	DEBUGVAR toppingID2index4
 	DEBUGVAR toppingID2index5
-		
+	
+	If toppingID1index5 > 0 Then
+		SAVELOG "toppingID1index5 not set"
+	EndIf
 
 	
-
+	
 	
 	DEBUGVAR MenuCodeName
 	DEBUGVAR toppingID1Default
@@ -229,7 +233,7 @@
 		DEBUGVAR BrewParam
 		DEBUGVAR IgnoreLidStraw
 		
-		
+		Var h_block_of_sugar = 210
 
 		If IgnoreLidStraw = "true" Then
 			Var IgnoreLidStraw = "false"
@@ -254,7 +258,14 @@
 
 		;PressForever
 		If TOPPING1 = "Sugar" Then
-			Var BGSugar = "Enable"
+			
+			If sugarKeto = "true" Then
+				Var StateImgKeto = "Enable"
+				Var BGSugar = "Invisible"
+			Else
+				Var BGSugar = "Enable"
+			Endif
+
 			Var ShiftSugarStep = 1
 			Var SugarState1 = "Enable"
 			Var SugarState2 = "Enable"
@@ -285,7 +296,15 @@
 		EndIf
 		
 		If TOPPING1 = "Powder Sugar" Then
-			Var BGSugar = "Enable"
+
+			If sugarKeto = "true" Then
+				Var StateImgKeto = "Enable"
+				Var BGSugar = "Enable"
+				Var h_block_of_sugar = 262
+			Else
+				Var BGSugar = "Enable"
+			EndIf
+			;Var BGSugar = "Enable"
 			Var ShiftSugarStep = 1
 			Var SugarState1 = "Enable"
 			Var SugarState2 = "Enable"
@@ -614,15 +633,22 @@
 ;- Begin topping1
 <Block>
 <Width> 986 </Width>
-<Height> 210 </Height>
+<Height> h_block_of_sugar </Height>
 <MarginTop> 5 </MarginTop>
 <State> BGSugar </State> 
 ; sugar layout
+;<Image>
+;<State> BGSugar </State>
+;<Filename> Var( DirImage + "/img_sugar.png" )</Filename>
+;</Image>
+
 <Image>
-<State> BGSugar </State>
+<State> StateImgKeto </State>
-<Filename> Var( DirImage + "/img_sugar.png" )</Filename>
+<Filename> Var( DirImage + "/img_sugar_keto.png" )</Filename>
 </Image>
 
+;
+
 ; sugar1
 <Button>
 <X> 137 </X>