Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

xml/page_board.xml

@@ -667,7 +667,7 @@
 	Var PromotionOreoVolcanoEnable = 0
 
 	If SystemDateMonthInt = 2 Then
-		If SystemDateDayInt = 21 Then
+		If SystemDateDayInt = 20 Then
 			Var PromotionOreoVolcanoEnable = 1
 		EndIf
 		

xml/page_brewing3.xml

@@ -303,6 +303,7 @@
 
 	DEBUGVAR NeedUpgrade
 
+
 	; zone Language
 	If LanguageObjectShow = "Enable" Then
 	
@@ -310,10 +311,29 @@
 		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
@@ -336,15 +356,6 @@
 	EndIf
 
 	Var CampaignEnable = 0
-	
-
-	DEBUGVAR bg_lidProblem_ST
-
-
-	If bg_lidProblem_ST = "Invisible" Then 
-		Var GetLidButtonState = "Enable"
-		Var XStraw = 265
-	EndIf
 
 
 	Var GetLidButtonCountDown = 0
@@ -493,6 +504,7 @@
 	Var Timeout = Timeout + 1
 
 	DEBUGVAR MachineState_Result
+	DEBUGVAR BREW_COUNT_DOWN_FROM_APP
 
 
 	If MOVE_CUP_TO_DOOR = "true" Then
@@ -1205,7 +1217,9 @@
 				Var EnableGetMoreStrawFileNameCountDown = EnableGetMoreStrawFileNameCountDown - 1
 
 				If EnableGetMoreStrawFileNameCountDown = 0 Then
-					Var EnableGetMoreStrawFileName = "Enable"
+					If NoLangObjectShow = "Enable" Then
+						Var EnableGetMoreStrawFileName = "Enable"
+					EndIf
 				EndIf
 			EndIf
 
@@ -1213,10 +1227,12 @@
 	EndIf
 		
 	If GetMoreStrawCount <= 0 Then
-
 		If StrawProblemStatus = 1 Then
 			Var StrawProblemStatus = 2
-			Var bg_strawProblem_ST = "Enable"
+			
+			If NoLangObjectShow = "Enable" Then
+				Var bg_strawProblem_ST = "Enable"
+			EndIf
 		EndIf
 
 	EndIf
@@ -1226,11 +1242,15 @@
 		DEBUGVAR GetLidButtonCountDown
 	EndIf
 
-	If GetLidButtonCountDown = 1 Then
+	
-		Var GetLidButtonState = "Invisible"
+	If NoLangObjectShow = "Enable" Then
-		Var bg_lidProblem_ST = "Enable"
-		Var XStraw = 356
 
+		If GetLidButtonCountDown = 1 Then
+			Var GetLidButtonState = "Invisible"
+			Var bg_lidProblem_ST = "Enable"
+			Var XStraw = 356
+
+		EndIf
 	EndIf
 
 
@@ -1369,11 +1389,17 @@
 </Text>
 
 <EventUnitTest1>
-
+	Var BREW_COUNT_DOWN_FROM_APP = "off"
 	Var CountDownBrewing = 121
 </EventUnitTest1>
-
+;
-
+;
+;
+;
+;
+;
+; Next Order
+;
 <Button>
 <X> 733 </X>
 <Y> 1787 </Y>
@@ -1420,8 +1446,14 @@
 </Language>
 </Button>
 
-
+;
-
+;
+;
+;
+;
+;
+; Button Straw, More request and report.
+;
 <Button>
 <X> XStraw </X>
 <Y> 1787 </Y>
@@ -1459,8 +1491,14 @@
 	Refresh
 </EventClick> 
 </Button>
-
+;
-
+;
+;
+;
+;
+;
+; Next Order
+;
 <Button>
 <X> 14 </X>
 <Y> 1787 </Y>

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,10 +703,16 @@
 	EndIf
 
 </EventUnitTest1>
-<EventUnitTest2>
-	Var waitAckPay = 0
-	Var CountDownBrewing = 122
 
+; Initial for jump to page_brewing3.xml
+<EventUnitTest2>
+	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
 	If InternationalEnable = 1 Then

xml/page_catalog_group_oreo.skt

@@ -0,0 +1,45 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.xml
+    ?>
+    
+
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.xml
+    ?>
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_inc.py
+?>
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>