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

xml/page_brewing3.xml

@@ -63,6 +63,27 @@
 		EndIf
 	EndIf
 
+	If TNumberTaobinCredit = "" Then
+
+		If TNumberTaobinMember = "" Then
+			Var TelephoneNumberProblem = ""
+		Else
+			Var TelephoneNumberProblem = TNumberTaobinMember
+		EndIf
+				
+	Else
+		Var TelephoneNumberProblem = TNumberTaobinCredit
+	EndIf
+
+	If TelephoneNumberProblem = "" Then
+		;Var TelephoneNumberProblem = ""
+    	Var ShowTextNumber = "Enable"
+    	Var Tel_Confirm_State = "Disable"
+	Else
+		Var ShowTextNumber = "Invisible"
+    	Var Tel_Confirm_State = "Enable"
+	EndIf
+
 
 
 	If TNumberTaobinMember = "" Then

xml/page_drinkfail2.xml

@@ -48,9 +48,10 @@
 
 	StopLongPlay
 
-    Var TelephoneNumberProblem = ""
-    Var ShowTextNumber = "Enable"
-    Var Tel_Confirm_State = "Disable"
+
+	
+
+   
 
     Var MachineErrorDetailAll = MachineErrorDetail + " / "
 	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
@@ -116,7 +117,19 @@
 
     Var Timeout = Timeout + 1
 
-	If Timeout > 120 Then
+	If Timeout > 60 Then
+
+		StrLen TelephoneNumberProblem TelNumLen
+		If TelNumLen >= 10 Then  
+
+			Var ChooseProblem = "taobin purchasing problems  (No Call)"
+			PROBLEM  TelephoneNumberProblem ChooseProblem
+
+		EndIf
+
+
+
+
         If MachineStage = "remove-cup" Then
 			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
 		Else
@@ -427,6 +440,14 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
 
+	StrLen TelephoneNumberProblem TelNumLen
+	If TelNumLen >= 10 Then  
+
+		Var ChooseProblem = "taobin purchasing problems (No Call)"
+		PROBLEM  TelephoneNumberProblem ChooseProblem
+
+	EndIf
+
 
 
 			
@@ -464,7 +485,6 @@
 		If MachineStage = "remove-cup" Then
 			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
 		Else
-			;Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
 			Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
 		EndIf