DO brewing3

xml/page_brewing3.xml

@@ -303,6 +303,7 @@
 
 	DEBUGVAR NeedUpgrade
 
+
 	; zone Language
 	If LanguageObjectShow = "Enable" Then
 	
@@ -310,10 +311,26 @@
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 
 		Var IMG_CNT = "ROOT/taobin_project/image/page_doing_inter/bg_show_time_remaining.png"
+
+		Var bg_lidProblem_ST = "Invisible"
+		Var GetLidButtonState = "Invisible"
+		Var bg_strawProblem_ST = "Invisible"
+		var EnableGetMoreStrawFileName = "Invisible"
 	EndIf
 	If NoLangObjectShow = "Enable" Then
 		Var SelectMenuBetweenBrewEnable2 = "Invisible"
 
+
+
+		DEBUGVAR bg_lidProblem_ST
+
+
+		If bg_lidProblem_ST = "Invisible" Then 
+			Var GetLidButtonState = "Enable"
+			Var XStraw = 265
+		EndIf
+
+
 	EndIf
 
 	DEBUGVAR SelectMenuBetweenBrewEnable1
@@ -338,15 +355,6 @@
 	Var CampaignEnable = 0
 
 
-	DEBUGVAR bg_lidProblem_ST
-
-
-	If bg_lidProblem_ST = "Invisible" Then 
-		Var GetLidButtonState = "Enable"
-		Var XStraw = 265
-	EndIf
-
-
 	Var GetLidButtonCountDown = 0
 
 	; language instance
@@ -493,6 +501,7 @@
 	Var Timeout = Timeout + 1
 
 	DEBUGVAR MachineState_Result
+	DEBUGVAR BREW_COUNT_DOWN_FROM_APP
 
 
 	If MOVE_CUP_TO_DOOR = "true" Then
@@ -1205,19 +1214,23 @@
 				Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
 
 				If EnableGetMoreStrawFileNameCountDown = 0 Then
+					If NoLangObjectShow = "Enable" Then
 						Var EnableGetMoreStrawFileName = "Enable"
 					EndIf
 				EndIf
+			EndIf
 
 		EndIf
 	EndIf
 		
 	If GetMoreStrawCount <= 0 Then
-
 		If StrawProblemStatus = 1 Then
 			Var StrawProblemStatus = 2
+			
+			If NoLangObjectShow = "Enable" Then
 				Var bg_strawProblem_ST = "Enable"
 			EndIf
+		EndIf
 
 	EndIf
 
@@ -1226,12 +1239,16 @@
 		DEBUGVAR GetLidButtonCountDown
 	EndIf
 
+	
+	If NoLangObjectShow = "Enable" Then
+
 		If GetLidButtonCountDown = 1 Then
 			Var GetLidButtonState = "Invisible"
 			Var bg_lidProblem_ST = "Enable"
 			Var XStraw = 356
 
 		EndIf
+	EndIf
 
 
 	Refresh
@@ -1369,7 +1386,7 @@
 </Text>
 
 <EventUnitTest1>
-
+	Var BREW_COUNT_DOWN_FROM_APP = "off"
 	Var CountDownBrewing = 121
 </EventUnitTest1>
 

xml/page_catalog.lxml

@@ -685,6 +685,13 @@
 
 
 <EventUnitTest1>
+	Var MachineState_Result = 0
+	Var waitAckPay = 1
+	Var CountDownBrewing = 122
+	Var BREW_CNT = 122
+	Var StrawGetMoreState = "Enable"
+	Var GetLidButtonState = "Enable"
+
 	Var InternationalEnable = 0
 	DEBUGVAR InternationalEnable
 	If InternationalEnable = 1 Then
@@ -696,9 +703,15 @@
 	EndIf
 
 </EventUnitTest1>
+
+; Initial for jump to page_brewing3.xml
 <EventUnitTest2>
-	Var waitAckPay = 0
+	Var MachineState_Result = 0
+	Var waitAckPay = 1
 	Var CountDownBrewing = 122
+	Var BREW_CNT = 122
+	Var StrawGetMoreState = "Enable"
+	Var GetLidButtonState = "Enable"
 	
 	Var InternationalEnable = 1
 	DEBUGVAR InternationalEnable