:wq

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

xml/page_brewing3.xml

@@ -562,6 +562,7 @@
 
 		Var ServiceSuccess = "yes"
 		If  waitAckPay = 0 Then
+			;Open "ROOT/taobin_project/xml/page_drinkfail2.xml" 
 			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 		EndIf
 

xml/page_drinkfail2-2.xml

@@ -0,0 +1,142 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+<Refresh> "Partial" </Refresh>
+<EventOpen>
+	; On open
+	
+	
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/collectiing/"
+	EndIf
+
+	
+	Var Timeout = 0
+	StopLongPlay
+
+
+	
+
+   
+
+    Var MachineErrorDetailAll = MachineErrorDetail + " / "
+	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+
+	
+
+
+	
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+	
+
+    Var Timeout = Timeout + 1
+
+	If Timeout > 60 Then
+
+		StrLen TelephoneNumberProblem TelNumLen
+		If TelNumLen >= 10 Then  
+
+			Var ChooseProblem = "taobin purchasing problems"
+			PROBLEM  TelephoneNumberProblem ChooseProblem
+
+		EndIf
+
+
+
+
+        If MachineStage = "remove-cup" Then
+			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+		Else
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+		EndIf
+	EndIf
+
+	
+
+	TimerReset
+
+</EventTimeout> 
+
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+</Video>
+
+
+
+
+
+
+<Button>
+<X> 398 </X>
+<Y> 1720 </Y>
+<Filename> Var( DirImage + "/bn_close.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+
+	StrLen TelephoneNumberProblem TelNumLen
+	If TelNumLen >= 10 Then  
+
+		Var ChooseProblem = "taobin purchasing problems"
+		PROBLEM  TelephoneNumberProblem ChooseProblem
+
+	EndIf
+
+
+
+			
+	If MachineStage = "remove-cup" Then
+		Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+	Else
+		
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	EndIf
+
+
+</EventClick>
+</Button>
+
+
+
+<Image>
+<X> 47 </X>
+<Y> 428 </Y>
+<Filename> Var( DirImage + "/text23.png" ) </Filename>
+</Image>
+
+<Image>
+<X> 392 </X>
+<Y> 642 </Y>
+<Filename> Var( DirImage + "/Businessman_sorry2.png" ) </Filename>
+</Image>
+
+<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_drinkfail2.xml

@@ -7,6 +7,16 @@
 <Refresh> "Partial" </Refresh>
 <EventOpen>
 	; On open
+
+
+	If TelephoneNumberProblem = "" Then
+
+	Else
+		Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml" 
+	EndIf
+
+
+	
 	
 	
 
@@ -119,13 +129,7 @@
 
 	If Timeout > 60 Then
 
-		StrLen TelephoneNumberProblem TelNumLen
-		If TelNumLen >= 10 Then  
-
-			Var ChooseProblem = "taobin purchasing problems  (No Call)"
-			PROBLEM  TelephoneNumberProblem ChooseProblem
-
-		EndIf
+		
 
 
 
@@ -440,15 +444,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-	StrLen TelephoneNumberProblem TelNumLen
-	If TelNumLen >= 10 Then  
-
-		Var ChooseProblem = "taobin purchasing problems (No Call)"
-		PROBLEM  TelephoneNumberProblem ChooseProblem
-
-	EndIf
-
-
+	
 
 			
 	If MachineStage = "remove-cup" Then