Merge remote-tracking branch 'origin/masterpiece' into hkg_multi

adv/sync_1.file

@@ -1,5 +1,5 @@
-total 143868
--rw-rw---- 1 root sdcard_rw        0 2025-02-17 17:04 sync_1.file
+total 146016
+-rw-rw---- 1 root sdcard_rw        0 2025-02-27 14:12 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2023-09-18 18:44 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
 -rw-rw---- 1 root sdcard_rw  7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4
@@ -21,4 +21,4 @@ total 143868
 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4
 -rw-rw---- 1 root sdcard_rw 10038728 2024-11-19 11:49 taobin_adv_menu_18.mp4
 -rw-rw---- 1 root sdcard_rw 10498599 2023-10-31 17:06 taobin_adv_menu_19.mp4
--rw-rw---- 1 root sdcard_rw  2353764 2024-11-01 10:02 taobin_adv_menu_20.mp4
+-rw-rw---- 1 root sdcard_rw  4563918 2025-02-18 14:01 taobin_adv_menu_20.mp4

animation01/play_list.tsv

@@ -1283,9 +1283,14 @@ Yuzu Fizzy	11-99-05-0049	1	27	28							24	100	7:40	32
 กาแฟชานมไต้หวันร้อน	12-21-01-0030	1	2	3	4	5	10				24	100	7:40	32
 กาแฟชานมไต้หวันเย็น	12-21-02-0030	1	2	3	4	5	10	23			24	100	7:40	32
 กาแฟชานมไต้หวันปั่น	12-21-03-0030	1	2	3	4	5	10	23	41		24	100	7:40	32
-ชานมไต้หวันร้อน	12-02-01-0025	1	1	6	70	10					24	100	7:40	32
-ชานมไต้หวันเย็น	12-02-02-0025	1	1	6	70	10	23				24	100	7:40	32
-ชานมไต้หวันปั่น	12-02-03-0025	1	1	6	70	10	23	41			24	100	7:40	32
-ชานมไต้หวันโกโก้ร้อน	12-02-01-0089	1	1	6	70	15	10				24	100	7:40	32
-ชานมไต้หวันโกโก้เย็น	12-02-02-0089	1	1	6	70	15	10	23			24	100	7:40	32
-ชานมไต้หวันโกโก้ปั่น	12-02-03-0089	1	1	6	70	15	10	23	41		24	100	7:40	32
+ชานมไต้หวันร้อน	12-02-01-0025	1	6	70	10						24	100	7:40	32
+ชานมไต้หวันเย็น	12-02-02-0025	1	6	70	10	23					24	100	7:40	32
+ชานมไต้หวันปั่น	12-02-03-0025	1	6	70	10	23	41				24	100	7:40	32
+ชานมไต้หวันโกโก้ร้อน	12-02-01-0089	1	6	70	15	10					24	100	7:40	32
+ชานมไต้หวันโกโก้เย็น	12-02-02-0089	1	6	70	15	10	23				24	100	7:40	32
+ชานมไต้หวันโกโก้ปั่น	12-02-03-0089	1	6	70	15	10	23	41			24	100	7:40	32
+
+เก๊กฮวยร้อน	12-02-01-0066	1									24	100	7:40	32
+เก๊กฮวยเย็น	12-02-02-0066	1	23								24	100	7:40	32
+เก๊กฮวยปั่น	12-02-03-0066	1	23	41							24	100	7:40	32
+เก๊กฮวยนมเย็น	12-02-02-0090	1	6	70	23						24	100	7:40	32

animation01/sync_1.file

@@ -1,4 +1,4 @@
-total 249484
+total 243440
 -rw-rw---- 1 root sdcard_rw   948282 2023-09-18 18:44 TaoBin2_draft02_art1.mp4
 -rw-rw---- 1 root sdcard_rw  3603060 2023-09-18 18:44 TaoBin2_draft02_art10.mp4
 -rw-rw---- 1 root sdcard_rw  3166935 2023-09-18 18:44 TaoBin2_draft02_art11.mp4
@@ -51,12 +51,12 @@ total 249484
 -rw-rw---- 1 root sdcard_rw  2287421 2023-12-07 10:26 TaoBin2_draft02_art60.mp4
 -rw-rw---- 1 root sdcard_rw  3824693 2024-04-25 15:27 TaoBin2_draft02_art61.mp4
 -rw-rw---- 1 root sdcard_rw  1797839 2024-04-25 17:00 TaoBin2_draft02_art62.mp4
--rw-rw---- 1 root sdcard_rw  8448873 2024-09-25 13:35 TaoBin2_draft02_art63.mp4
+-rw-rw---- 1 root sdcard_rw  2240889 2025-02-06 13:38 TaoBin2_draft02_art63.mp4
 -rw-rw---- 1 root sdcard_rw  3740266 2023-09-18 18:44 TaoBin2_draft02_art7.mp4
 -rw-rw---- 1 root sdcard_rw  3740266 2023-09-18 18:44 TaoBin2_draft02_art70.mp4
 -rw-rw---- 1 root sdcard_rw  3998856 2023-09-18 18:44 TaoBin2_draft02_art8.mp4
 -rw-rw---- 1 root sdcard_rw  3616423 2023-09-18 18:44 TaoBin2_draft02_art9.mp4
 -rw-rw---- 1 root sdcard_rw  9159813 2024-09-04 13:55 TaoBinShowCoffeeProcess.mp4
 -rw-rw---- 1 root sdcard_rw      326 2024-08-26 13:31 last-cmd
--rw-rw---- 1 root sdcard_rw    71508 2024-09-27 14:02 play_list.tsv
--rw-rw---- 1 root sdcard_rw        0 2021-03-18 15:06 sync_1.file
+-rw-rw---- 1 root sdcard_rw    87995 2025-02-10 21:39 play_list.tsv
+-rw-rw---- 1 root sdcard_rw        0 2025-02-10 22:17 sync_1.file

image/event/image_template2

@@ -1,6 +1,3 @@
-normal_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-normal_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-press_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-press_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-disable_eng=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
-disable_thai=ROOT/taobin_project/image/event/strawberry_series/strawberry_series.png
+normal_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
+press_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png
+disable_thai=ROOT/taobin_project/image/event/coconut_milk/coconut_milk.png

inter/aus/video/script_video.ev

@@ -1,5 +1,7 @@
 Var MainfileSize = 0
 Var EventTurnOn = 0
+Var EventAO = 0
+Var StPatrickEvent = 0
 
 
 
@@ -33,6 +35,15 @@ If SystemDateMonthInt = 1 Then
     EndIf
 EndIf
 
+If SystemDateMonthInt = 3 Then
+    GetFileSizeK "taobin_project/inter/aus/video/video_main_StPatrick.mp4" MainfileSize
+    DEBUGVAR MainfileSize
+    If MainfileSize = 17941307 Then
+        Var StPatrickEvent = 1
+    Else
+        DEBUGVAR "StPatrick: Video size incorrect"
+    EndIf
+EndIf
 
 DEBUGVAR EventTurnOn
 
@@ -49,4 +60,8 @@ EndIf
 If EventAO = 1 Then
 
     Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main_ao.mp4"
+EndIf
+
+If StPatrickEvent = 1 Then
+    Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main_StPatrick.mp4"
 EndIf

inter/aus/xml/page_brewing3.lxml

@@ -1172,8 +1172,8 @@
 
 					If Seeker.CreditCard = 1 Then
 
-							;CashlessReq SUCCESS
-							;CashlessReq FAIL
+							;CashlessReq SUCCESS ""
+							;CashlessReq FAIL ""
 
 					EndIf
 
@@ -1182,8 +1182,8 @@
 
 						If Seeker.CreditCard = 1 Then
 
-							;CashlessReq SUCCESS
-							;CashlessReq FAIL
+							;CashlessReq SUCCESS ""
+							;CashlessReq FAIL ""
 
 						EndIf
 
@@ -1251,7 +1251,7 @@
 			If Seeker.PayWithQR = 0 Then
 
 				If Seeker.CreditCard = 1 Then
-					;CashlessReq FAIL
+					;CashlessReq FAIL ""
 					Var ChangeFlag = 1
 					Var CreditCardVoid = 1
 				Else

inter/aus/xml/page_brewing3Conti.xml

@@ -678,8 +678,8 @@
 
 					If Seeker.CreditCard = 1 Then
 
-							CashlessReq SUCCESS
-							;CashlessReq FAIL
+							CashlessReq SUCCESS ""
+							;CashlessReq FAIL ""
 
 					EndIf
 					Var PayDetail2 = Seeker.PayDetail2
@@ -690,8 +690,8 @@
 						If Seeker.CreditCard = 1 Then
 
 
-							CashlessReq SUCCESS
-							;CashlessReq FAIL
+							CashlessReq SUCCESS ""
+							;CashlessReq FAIL ""
 
 						EndIf
 						Var PayDetail2 = Seeker.PayDetail2
@@ -770,7 +770,7 @@
 			If Seeker.PayWithQR = 0 Then
 
 				If Seeker.CreditCard = 1 Then
-					;CashlessReq FAIL
+					;CashlessReq FAIL ""
 					Var ChangeFlag = 1
 					Var CreditCardVoid = 1
 					Var ChangeOK = 2

inter/aus/xml/page_collect_point_3.lxml

@@ -980,39 +980,39 @@
 </EventClick>
 </Button>
 
-;<Button>
-;<X> 548 </X>
-;<Y> 1752 </Y>
-;<State> redeemButtonState </State>
-;<Filename> Var( DirImage + "/redeem_btn.png" )</Filename>
-;<FilenamePress> Var( DirImage + "/redeem_btn_pressed.png" )</FilenamePress>
-;<FilenameDisable> Var( DirImage + "/redeem_btn_disable.png" ) </FilenameDisable>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick>
-;	; goto lid straw
-;
-;	If CoffeePoint >= 10 Then
-;		Var RedeemType = "1_dollar"
-;	EndIf
-;
-;	If CoffeePoint >= 20 Then
-;		Var RedeemType = "2_dollar"
-;	EndIf
-;
-;	If CoffeePoint >= 30 Then
-;		Var RedeemType = "get_free"
-;	EndIf
-;
-;	DEBUGVAR RedeemType
-;
-;	If RedeemType = "" Then
-;		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-;	Else
-;		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
-;	EndIf
-;</EventClick>
-;</Button>
+<Button>
+<X> 548 </X>
+<Y> 1752 </Y>
+<State> redeemButtonState </State>
+<Filename> Var( DirImage + "/redeem_btn.png" )</Filename>
+<FilenamePress> Var( DirImage + "/redeem_btn_pressed.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/redeem_btn_disable.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	; goto lid straw
+
+	If CoffeePoint >= 10 Then
+		Var RedeemType = "1_dollar"
+	EndIf
+
+	If CoffeePoint >= 20 Then
+		Var RedeemType = "2_dollar"
+	EndIf
+
+	If CoffeePoint >= 30 Then
+		Var RedeemType = "get_free"
+	EndIf
+
+	DEBUGVAR RedeemType
+
+	If RedeemType = "" Then
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	Else
+		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
+	EndIf
+</EventClick>
+</Button>
 
 
 

inter/aus/xml/page_member_topup.lxml

@@ -80,9 +80,9 @@
 
 		If CashlessPayFlag = 1 Then
 			Var CashlessPayFlag = 0
-			CashlessReq FAIL
+			CashlessReq FAIL ""
 		Else
-			CashlessReq OFF
+			CashlessReq OFF ""
 		EndIf
 
 		VendingQR OFF
@@ -120,7 +120,7 @@
     If WaitQRPay = 1 Then
         If VendingExtResult = "" Then
         Else
-            Var PayCreditChannel = "fatzebra"
+            Var PayCreditChannel = "qr_code"
 
     		Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
     		Open ToppupSuccessPage
@@ -163,7 +163,7 @@
     EndIf
 
 	If VendingCashless = "OK" Then
-		CashlessReq SUCCESS
+		CashlessReq SUCCESS ""
 
 		Var PayCreditChannel = "credit-card"
 
@@ -184,7 +184,7 @@
 			Var LOADING_STATE = "Invisible"
 		EndIf
 
-		CashlessReq FAIL
+		CashlessReq FAIL ""
 
 	EndIf
 
@@ -261,13 +261,12 @@
 <Button>
 <X> 287 </X>
 <Y> 778 </Y>
-<State> "Invisible" </State>
-<Filename> Var( DirImage2 + "/bn_fatzebra.png" ) </Filename>
-<FilenamePress> Var( DirImage2 + "/bp_fatzebra.png" ) </FilenamePress>
-<FilenameDisable> Var( DirImage2 + "/bd_fatzebra.png" ) </FilenameDisable>
+<Filename> Var( DirImage2 + "/bn_qr_code.png" ) </Filename>
+<FilenamePress> Var( DirImage2 + "/bp_qr_code.png" ) </FilenamePress>
+<FilenameDisable> Var( DirImage2 + "/bd_qr_code.png" ) </FilenameDisable>
 <EventOnClick>
     Var Timeout = 0
-    Var SelectedPaymentMedthod = "fatzebra"
+    Var SelectedPaymentMedthod = "qr_code"
     Var SelectOptionPopupState = "Enable"
     Var BlurBackgroundState = "Enable"
 </EventOnClick>
@@ -492,15 +491,15 @@
         SAVELOG "Canceling credit card"
         Var QR_POPUP = "/img_popup8-2.png"
 
-        CashlessReq OFF
+        CashlessReq OFF ""
         If CashlessPayFlag = 1 Then
             Var CashlessPayFlag = 0
-            CashlessReq FAIL
+            CashlessReq FAIL ""
         EndIf
 	EndIf
 
-	If SelectedPaymentMedthod = "fatzebra" Then
-	   SAVELOG "Canceling fatzebra"
+	If SelectedPaymentMedthod = "qr_code" Then
+	   SAVELOG "Canceling qr_code"
 	   VendingQR OFF
 	EndIf
 
@@ -541,7 +540,7 @@
         Coin CARD
     EndIf
 
-    if SelectedPaymentMedthod = "fatzebra" Then
+    if SelectedPaymentMedthod = "qr_code" Then
         Var QR_POPUP = "/img_popup1-AUS.png"
         Var LOADING_TEXT = "Just Moment Please"
         Var LOADING_STATE = "Enable"

inter/aus/xml/page_remove_cup.lxml

@@ -18,68 +18,66 @@
 		
 	LED LedDoorDoor 5 255 255 255 255
 
-	Var CheckCupStateDoorCupClose = ""
-	Var CheckCupStateDoorCupCloseCnt = 0
+	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
 
-	DEBUGVAR DoorCupPosition
-	If DoorCupPosition = "bottom" Then
-		Var buttonRemoveCup = "Enable"
-	EndIf
+	Var ShowMenuNameAndImage = "Invisible"
+	Var RemoveCupOnArmID = -1
+	Var remove_cup_name = ""
+	Var remove_cup_image = ""
+
+	RootLayoutVisible 3 "show"
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
 	
 	;SAVELOG MachineErrorDetail
-	Var MachineErrorDetailAll = MachineErrorDetailEng
-
-
-	If MachineStage = "show-menu" Then
-		Open "ROOT/taobin_project/xml/page_board.xml"
+	Var MachineErrorDetailAll = MachineErrorDetail + " / "
+	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
 
+	If InternationalEnable = 1 Then
+		Var MachineErrorDetailAll = MachineErrorDetailEng
 	EndIf
+
+
+	; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
+	If HaveCup = "false" Then
+		If MachineStage = "show-menu" Then
+			Open "ROOT/taobin_project/xml/page_board.xml"
+
+		EndIf
+	EndIf
+	If CupOnArm = "true" Then
+		If MachineStage = "show-menu" Then
+			Open "ROOT/taobin_project/xml/page_board.xml"
+
+		EndIf
+	EndIf
+
 	If MachineStage = "close-maintenance" Then
-		Open "ROOT/taobin_project/xml/page_show_error.lxml"
+		Open "ROOT/taobin_project/xml/page_show_error.xml"
+
 	EndIf
 
-	Var Timeout = Timeout + 1
-	DEBUGVAR Timeout
-	If Timeout > 5 Then
-		Var Timeout = 0
+	;include=ROOT/taobin_project/inc/remove_cup_step.inc
 
-		DEBUGVAR DoorCupPosition
+
+	Var RemoveCupOnArmID = 0
+	If RemoveCupOnArmID > 0 Then
 		If DoorCupPosition = "bottom" Then
-			Var buttonRemoveCup = "Enable"
+			Var ShowMenuNameAndImage = "Invisible"
+			Var RemoveCupOnArmID = -1
+		Else
+			DEBUGVAR RemoveCupOnArmID
+			DEBUGVAR DrinkImageOnArm[RemoveCupOnArmID]
+			DEBUGVAR DrinkNameOnArm[RemoveCupOnArmID]
+
+			Var remove_cup_image = DrinkImageOnArm[RemoveCupOnArmID]
+			Var remove_cup_name = DrinkNameOnArm[RemoveCupOnArmID]
+			Var ShowMenuNameAndImage = "Enable"
 		EndIf
 	EndIf
 
-	; Logic have differrent drinkfail3.xml 
-	; protect lock 
-	; 
-
-	If CheckCupStateDoorCupCloseCnt > 0 Then
-		Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
-	EndIf
-
-	If CheckCupStateDoorCupCloseCnt = 0 Then
-		Var CheckCupStateDoorCupClose = ""
-	EndIf
-
-	DEBUGVAR HaveCup
-
-	If HaveCup = "true" Then
-
-
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
-
-	DEBUGVAR buttonRemoveCup
-	DEBUGVAR CheckCupStateDoorCupClose
-
-
 	Refresh
 	TimerReset
 
@@ -115,13 +113,7 @@
 <Volume> SoundVolume </Volume>
 <State> buttonRemoveCup </State>
 <EventClick> 
-
-
-	Machine RemoveCup
-	Machine DoorLidOpen
-	Var buttonRemoveCup = "Invisible"
-   Var CheckCupStateDoorCupClose = "reset"
-   Var CheckCupStateDoorCupCloseCnt = 30
+	;include=ROOT/taobin_project/inc/remove_cup_button.inc
 </EventClick>
 <Language>
   <ID> 000411 </ID>
@@ -133,6 +125,38 @@
 </Button>
 
 
+<Image>
+<X> 125 </X>
+<Y> 1700 </Y>
+<Height> 300 </Height>
+<Width> 320 </Width>
+<State> ShowMenuNameAndImage </State>
+<Filename> remove_cup_image </Filename>
+</Image>
+
+<Text>
+<X> 300 </X>
+<Y> 1750 </Y>
+<State> ShowMenuNameAndImage </State>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Font> KanitLightTTF </Font>
+<Size> 48 </Size>
+<Color> HeadlineColor </Color>
+<Value>
+	eval(
+		STRCONTAIN "size" remove_cup_name SizeFromSheet
+		If SizeFromSheet = "true" Then
+			SPLIT Seeker.showname "###" 1 PureName
+			Var return = PureName
+		Else
+			Var return = Seeker.showname
+		EndIf
+	)
+</Value>
+</Text>
+
+
 <Text>
 <X> 5 </X>
 <Y> 1868 </Y>

inter/aus/xml/page_topping_select6.lxml

@@ -1270,6 +1270,8 @@
 			EndIf
 
 			DEBUGVAR RecipeTag2
+			DEBUGVAR NoSugarStepRight2
+			DEBUGVAR TOPPING1
 			;
 			If TOPPING1 = "Sugar" Then
 				Var SugarZeroCalOption = "Enable"
@@ -1318,6 +1320,17 @@
 					Var SugarZeroCalOption = "Invisible"
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
 
 			EndIf
 
@@ -1374,6 +1387,18 @@
 
 				DEBUGVAR toppingID1Default
 				DEBUGVAR SugarState1
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
 			EndIf
 
 
@@ -1422,6 +1447,17 @@
 					Var SugarState2 = "PressForever"
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
 			EndIf
 
 			If TOPPING1 = "Powder Sugar Premix 50" Then
@@ -1466,6 +1502,18 @@
 					Var SugarState3 = "PressForever"
 				EndIf
 
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
+
 			EndIf
 
 			If TOPPING1 = "Powder Sugar Premix 25" Then
@@ -1511,6 +1559,18 @@
 				If sugar_default_flag = 0 Then
 					Var SugarState2 = "PressForever"
 				EndIf
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState5 = "Disable"
+						Var SugarState6 = "Disable"
+					Else
+						Var SugarState5 = "Disable"
+					EndIf
+
+				EndIf
 			EndIf
 
 			Var SugarModeUpdateWhenChangeDrinkType = 0
@@ -2336,6 +2396,14 @@
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
 			Var topping1 = toppingID1index1
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
 		EndIf
 
 		Var SugarZeroCalOption = "Invisible"
@@ -2392,6 +2460,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2402,6 +2479,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2456,6 +2542,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2466,6 +2561,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2518,6 +2622,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2528,6 +2641,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2536,6 +2658,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2588,6 +2719,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -2598,6 +2738,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2606,6 +2755,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -2658,6 +2816,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index6
 		EndIf
 
@@ -2668,6 +2835,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -2676,6 +2852,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -2782,6 +2967,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -2838,6 +3031,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+			
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -2890,6 +3091,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 
 			Var SugarZeroCalCheck = "Enable"
@@ -2943,6 +3152,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 
 			Var SugarZeroCalCheck = "Enable"
@@ -3050,6 +3267,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -3107,6 +3332,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -3159,6 +3392,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3211,6 +3452,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3446,6 +3695,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -3509,6 +3767,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -3519,6 +3786,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 
 			; select no sugar
@@ -3586,6 +3862,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3596,6 +3881,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 
 			; select no sugar
@@ -3662,6 +3956,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3672,6 +3975,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3680,6 +3992,15 @@
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 
 			; select no sugar
@@ -3747,6 +4068,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -3757,6 +4087,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -3765,6 +4104,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "PressForever"
 			Var SugarState6 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -3821,6 +4169,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index6
 		EndIf
 
@@ -3831,6 +4188,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index5
 		EndIf
 
@@ -3839,6 +4205,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var SugarState6 = "PressForever"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+				Var SugarState6 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -4057,6 +4432,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -4114,6 +4497,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -4170,6 +4561,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -4225,6 +4624,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 
@@ -4445,6 +4852,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index1
 		EndIf
 
@@ -4505,6 +4920,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index2
 		EndIf
 
@@ -4560,6 +4983,14 @@
 			Var SugarState3 = "PressForever"
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index3
 		EndIf
 
@@ -4614,6 +5045,14 @@
 			Var SugarState3 = "Enable"
 			Var SugarState4 = "PressForever"
 			Var SugarState5 = "Enable"
+
+			; No 2 right steps
+			If NoSugarStepRight2 = "true" Then
+
+				Var SugarState5 = "Disable"
+
+			EndIf
+
 			Var topping1 = toppingID1index4
 		EndIf
 

inter/hkg/xml/page_topping_select6.lxml

@@ -2223,9 +2223,11 @@
 <Button>
 <X> 680 </X>
 <Y> 79 </Y>
-<Filename> "ROOT/taobin_project/image/topping_inter/bn_sugar_6lvl.png" </Filename>
-<FilenamePress>  "ROOT/taobin_project/image/topping_inter/bp_sugar_6lvl.png" </FilenamePress>
-<FilenameDisable>  "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" </FilenameDisable>
+;<State> SugarState5 </State>
+<State> "Invisible" </State>
+<Filename> SugarNormalPicLv5 </Filename>
+<FilenamePress>  SugarPressPicLv5 </FilenamePress>
+<FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg5.png" </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -2290,10 +2292,11 @@
 <Button>
 <X> 820 </X>
 <Y> 79 </Y>
-<State> SugarState6 </State>
-<Filename> "ROOT/taobin_project/image/topping_inter/bn_sugar_6lvl.png" </Filename>
-<FilenamePress>  "ROOT/taobin_project/image/topping_inter/bp_sugar_6lvl.png" </FilenamePress>
-<FilenameDisable>  "ROOT/taobin_project/image/topping_inter/bd_sugar_6lvl.png" </FilenameDisable>
+;<State> SugarState6 </State>
+<State> "Invisible" </State>
+<Filename> SugarNormalPicLv6 </Filename>
+<FilenamePress>  SugarPressPicLv6 </FilenamePress>
+<FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg6.png" </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>