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

xml/page_board.xml

@@ -60,6 +60,10 @@
 
 	EndIf
 
+	Var TestLoopMakeDrink = 0
+	Var TestLoopSuccess = 0
+	Var TestLoopFailed = 0
+
 	Var IgnoreNetCore = "false"
 	
 
@@ -77,6 +81,8 @@
 				Open "/ROOT/xml/offline.xml" 
 		EndIf
 
+	
+
 		If MachineStage = "close-maintenance" Then
 			Open "ROOT/taobin_project/xml/page_show_error.xml"
 
@@ -155,6 +161,8 @@
 	Var countClick = countClick + 1
 	If countClick = 3 Then
 
+		;Var TestLoopMakeDrink = 1
+
 	EndIf
 
 	If countClick = 5 Then
@@ -227,7 +235,7 @@
 
 <Text>
 <X> 0 </X>
-<Y> 1886 </Y>
+<Y> 1860 </Y>
 <Size> 20 </Size>
 <Width> 1080</Width>
 <Align> Center </Align>

xml/page_brewing2.xml

@@ -219,6 +219,23 @@
 	EndIf
 
 
+	If TestLoopMakeDrink = 1 Then
+
+		If MachineState_Result = 1 Then
+			Var MachineState_Result = 0
+			Var TestLoopSuccess = TestLoopSuccess + 1
+			Open "ROOT/taobin_project/xml/page_drinkloop.xml" 
+		EndIf
+
+		If MachineState_Result = 2 Then
+			;Var MachineState_Result = 0
+			Var TestLoopFailed = TestLoopFailed + 1
+			Open "ROOT/taobin_project/xml/page_drinkloop.xml" 
+		EndIf
+
+	EndIf
+
+
 	If MachineState_Result = 1 Then
 		Var Timeout = 0
 	  	Var ProcessText = "" 

xml/page_drinkloop.xml

@@ -0,0 +1,129 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	Var LidState = "Enable"
+	Var StarwState = "Enable"
+	Var videoEnd = 0
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/complete_en/"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/complete/"
+	EndIf
+
+
+    If MachineState_Result = 2 Then
+
+        Var MachineErrorDetailAll = MachineErrorDetail + " / "
+        Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+
+    Else
+
+        Var MachineErrorDetailAll = ""
+	
+    EndIf
+
+
+</EventOpen>
+<Timeout> 5000 </Timeout>
+<EventTimeout> 
+
+    If MachineState_Result = 2 Then
+
+   
+
+    Else
+
+        
+	
+	    Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+    EndIf
+
+	TimerReset
+
+</EventTimeout> 
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 0 </Y>
+<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+</Image>
+
+; Old
+
+
+<Video>
+<X> 82 </X>
+<Y> 717 </Y>
+<Width> 917 </Width>
+<Height> 917 </Height>
+<Loop> "true" </Loop>
+<Filename> "ROOT/taobin_project/video/taobin_drink_ok.mov" </Filename>
+</Video>
+
+<Image>
+<X> 0 </X>
+<Y> 547 </Y>
+<Filename> Var( DirImage + "/img2.png" ) </Filename>
+</Image>
+
+
+
+<Button>
+<X> 0 </X>
+<Y> 1860 </Y>
+<Width> 200 </Width>
+<Height> 50 </Height>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	
+</EventClick>
+</Button>
+
+
+
+<Text>
+<X> 0 </X>
+<Y> 1132 </Y>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Size> 72 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0xB78F24 </Color>
+<Value> TestLoopSuccess </Value>
+</Text>
+
+<Text>
+<X> 0 </X>
+<Y> 1200 </Y>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Size> 72 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0xB78F24 </Color>
+<Value> TestLoopFailed </Value>
+</Text>
+
+
+<Text>
+<X> 5 </X>
+<Y> 1868 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xDE794E </Color>
+<Value> MachineErrorDetailAll </Value>
+</Text>
+
+
+</Popup>

xml/page_payment_cash.xml

@@ -261,7 +261,12 @@
 	Var Timeout = Timeout + 1
 
 
-	If Timeout > 90 Then
+	If Timeout >= 120 Then
+	  Var alphaState = "Invisible"
+	EndIf
+
+
+	If Timeout > 210 Then
 		If ActionOKCase = 1 Then
 			Var PayInfoCFlag = 1
 		EndIf
@@ -305,13 +310,19 @@
 	EndIf
 
 
+	If TestLoopMakeDrink = 1 Then 
+		MakeDrinkV1  SelectDrink SelectSugarID
+		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
+	EndIf
+    
+
 
 	If CoinInOK = 1 Then
 		Var CoinInCounter = CoinInCounter + 1
 		If CoinInCounter = 1 Then
 
 			Var ChangeOK = 1
-			Var Timeout = 60
+			Var Timeout = 180
 			Var PayOK = 1
 
 		EndIf
@@ -322,7 +333,7 @@
 	Var stringLog = stringLog + PayOK
 
 
-	If Timeout > 60 Then
+	If Timeout > 180 Then
 		If PayOK = 1 Then
 			
 			MakeDrinkV1  SelectDrink SelectSugarID
@@ -595,21 +606,25 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 
-	If CoinInFlag = 0 Then
-		If CancelFlag = 0 Then
-		Var alphaState = "Enable"
-		;CoinVending OFF
-		VendingQR ON
-		Refresh
 
-		If CoinAmount > 0 Then
+	If Timeout < 120 Then
-			Change CoinAmount
-			Var ChangeOK = 0
-			Var CancelFlag = 1
-			Var CancelCounter = 0
-			Var NoGotoMenupage = "true"
 
-		EndIf
+		If CoinInFlag = 0 Then
+			If CancelFlag = 0 Then
+			Var alphaState = "Enable"
+			;CoinVending OFF
+			VendingQR ON
+			Refresh
+
+			If CoinAmount > 0 Then
+				Change CoinAmount
+				Var ChangeOK = 0
+				Var CancelFlag = 1
+				Var CancelCounter = 0
+				Var NoGotoMenupage = "true"
+						
+			EndIf
+			EndIf
 		EndIf
 	EndIf
 
@@ -726,7 +741,7 @@
 <EventClick> 
 	  Var alphaState = "Invisible"
 	  ;CoinVending ON
-	  VendingQR OFF
+	  ;VendingQR OFF
 	  Refresh
 </EventClick>
 </Button>
@@ -872,4 +887,7 @@
 ;<Value> countClick2 </Value>
 ;</Text>
 
+
+
+
 </Popup>

xml/page_thankyou.xml

@@ -78,10 +78,16 @@
 		;Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 		;Open "ROOT/taobin_project/xml/page_brewing.xml"  
 
+<<<<<<< HEAD
+		If TestLoopMakeDrink = 1 Then 
+			Open "ROOT/taobin_project/xml/page_brewing2.xml"  
+		EndIf
+=======
 		Var CountDownBrewing = BrewTime
 		Var CountUpBrewing = 0
 		SAVELOG BrewTime
 		Var ShowCountDownBrewing = CountDownBrewing
+>>>>>>> f36bbe70987e89d48bcc2837537db37c4f90c33b
 
 		Open "ROOT/taobin_project/xml/page_collect_point_1.xml"  
 	EndIf