Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

inc/video.inc

@@ -110,6 +110,9 @@
             If ProMelonEnable = 1 Then
                 Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
             EndIf
+            If ProMysteryCup = 1 Then
+                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_27.mp4"
+            EndIf
             If UseSlideShowVideo = 1 Then
                 Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
             EndIf
@@ -224,6 +227,9 @@
         If ProMelonEnable = 1 Then
             Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
         EndIf
+        If ProMysteryCup = 1 Then
+            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_27.mp4"
+        EndIf
         If UseSlideShowVideo = 1 Then
             Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
         EndIf
@@ -333,6 +339,9 @@
             If ProMelonEnable = 1 Then
                 Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
             EndIf
+            If ProMysteryCup = 1 Then
+                Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_27.mp4"
+            EndIf
             If UseSlideShowVideo = 1 Then
                 Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
             EndIf
@@ -397,6 +406,10 @@
             Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_26.mp4"
         EndIf
 
+        If ProMysteryCup = 1 Then
+            Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_27.mp4"
+        EndIf
+
         If UseSlideShowVideo = 1 Then
             Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_22.mp4"
         EndIf

inter/aus/xml/event/tricker.ev

@@ -9,7 +9,8 @@
 ; Enable app game
 Var GameEnableFromTrickerEv = 0
 
-Var NewCollectPointFlag = 1
+Var New_Payment = 1
+Var CleanFeedbackFlag = 1
 
 Var HappyEasterPro = 0
 Var AutumnBreezePro = 0

inter/aus/xml/page_NewBrewing3Conti.lxml

@@ -0,0 +1,987 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+
+	Var ActionOKCase = 0
+	Var Seeker = "curr"
+
+	If show_eng = "true" Then
+		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2_en"
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/page_payment"
+		Var DirImage2 = "ROOT/taobin_project/image/topping2"
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf
+
+	Var next_pic_bn = DirImage + "/bn_add_order.png"
+	Var next_pic_bp = DirImage + "/bp_add_order.png"
+	Var text_next_order = DirImage + "/text_next_order.png"
+
+	Var topup_credit_bn = DirImage + "/bn_topup_credit.png"
+	Var topup_credit_bp = DirImage + "/bp_topup_credit.png"
+
+	Var EnableTopupCreditBetweenBrew = "Invisible"
+
+	If NextOrder = "true" Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+	Else
+		Var EnableSelectMenuBetweenBrew = "Enable"
+	EndIf
+
+	If GetFreeFromError = 1 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+	EndIf
+
+	If EnableSelectMenuBetweenBrew = "Enable" Then
+		Var EnableSelectMenuBetweenBrewBlink = "Enable"
+	Else
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+	EndIf
+
+
+	Var bg_strawlid = DirImage2 + "/bg_strawlidSmall.png"
+	If Seeker.thankLidFlag = 1 Then
+		Var bg_strawlid = DirImage2 + "/bg_strawSmall.png"
+		Var LidStateX = "Invisible"
+	EndIf
+
+	Var TimeoutWaitPay = 10
+
+    Var PayReference = ""
+	Var PayType = "newpay"
+	Var MachineState_Result = 0
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If LastMakeDrinkResult = "fail" Then
+			Var MachineState_Result = 2
+	EndIf
+
+
+	Var ExtendData = Seeker.ExtendData
+	Var SelectDrink = Seeker.selected_a_drink
+	Var ServiceAmount2 = Seeker.ServiceAmount2
+	Var PriceDrink = Seeker.ServiceAmount2
+
+	DEBUGVAR Seeker
+	DEBUGVAR Seeker.selected_a_drink
+	DEBUGVAR Seeker.ServiceAmount2
+	DEBUGVAR Seeker.CashlessVendingTrackNumber
+
+	DEBUGVAR Seeker.CodeNumber
+
+	Var SessionID2 = SelectSlot + ":"
+	Var SessionID2 = SessionID2 + ExtendData
+
+
+	; On open move from page_brewing3.xml
+	Var countClick2 = 0
+
+	Var Timeout = 0
+
+	Var PrintCoinAmount = 0
+
+	DEBUGVAR Seeker.TNumberTaobinMember
+	DEBUGVAR Seeker.PointTaobinStr
+
+	If LedLidBlink = "true" Then
+		Var LedLidBlink = "no"
+		LED LedDoorLid Blink 255 255 255 255
+	EndIf
+
+
+	Var CreditReference = Seeker.CreditReferenceTmp
+	Var VendingDiscount = Seeker.VendingDiscount
+	Var VendingCampaign = Seeker.VendingCampaign
+	Var TxReference = Seeker.TxRef1
+	DEBUGVAR TxReference
+
+
+	Var DirImage = "ROOT/taobin_project/image/complete/"
+	Var next_pic_bg = DirImage + "/Preparing.png"
+
+	Var bg_strawlid_ST = "Invisible"
+	Var bg_strawProblem_ST = "Invisible"
+	Var StrawStateX = "Invisible"
+	Var LidStateX = "Invisible"
+
+	If MachineState_Result > 0 Then
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+	EndIf
+
+	Var CreditCardVoid = 0
+
+	DEBUGVAR ButtonGameCountDownState
+
+	DEBUGVAR ButtonGameCountDownState
+
+	SAVELOG "New brewing3 conti AUS"
+
+</EventOpen>
+
+
+<EventActionOk>
+
+	If CreditCardVoid = 1 Then
+		Var ChangeOK = 2
+	EndIf
+
+	If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			DEBUGVAR SessionID2
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			Var ECommerce = ECommerce + PriceDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + DiscountDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SessionID2
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SelectDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C:"
+			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;Var Timeout = 0
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 142."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
+		Else
+
+			SAVELOG "back_to_main from line  > 147."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+		EndIf
+
+    Else
+
+
+
+	EndIf
+
+</EventActionOk>
+
+<EventActionError>
+   If ActionOKCase = 1 Then
+		If Seeker.CodeChannel = 1 Then
+			Var SessionID2 = SelectSlot + ":"
+			Var SessionID2 = SessionID2 + ExtendData
+
+			DEBUGVAR SessionID2
+
+			Var CreditAmount1 = ""
+			Var ServiceAmountFlow = ""
+			Var TelephoneNumber = "0899999999"
+			Var ServiceType = "coffee"
+			Var ECommerce = ""
+			Var ECommerce = ECommerce + PriceDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + DiscountDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SessionID2
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + SelectDrink
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.VendingCode
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + Seeker.CodeNumber
+			Var ECommerce =	ECommerce + "/"
+			Var ECommerce =	ECommerce + "C:"
+			Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+			Var ServiceParameter = "max"
+			Var ServiceCharge = 0
+			Var AccountType = "new"
+			Var testservice = "kbank"
+			Var tc = ""
+			Var GetScore = ""
+			Var OperatorName = ""
+			Var SessionID = ""
+
+			GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+			;Var Timeout = 0
+			Var ActionOKCase = 2
+
+			SAVELOG "back_to_main from line  > 204."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+
+		Else
+			SAVELOG "back_to_main from line  > 173."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+		EndIf
+
+    Else
+
+
+
+	EndIf
+</EventActionError>
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+	Var Timeout = Timeout + 1
+
+	If MOVE_CUP_TO_DOOR = "true" Then
+		Var MOVE_CUP_TO_DOOR = "false"
+	EndIf
+
+	If BREW_COUNT_DOWN_FROM_APP = "on" Then
+		Var CountDownBrewing = BREW_CNT
+	Else
+
+		If CountDownBrewing > 0 Then
+			Var CountDownBrewing = CountDownBrewing - 1
+		EndIf
+	Endif
+
+
+	If Timeout = 4 Then
+		PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
+	EndIf
+
+	Var ShowCountDownBrewing = CountDownBrewing
+
+
+	If Timeout > 540 Then
+		SAVELOG "back_to_main from line  > 217."
+		Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+	EndIf
+
+
+	If Timeout > 480 Then
+		Var MachineState_Result = 2
+	EndIf
+
+	If ChangeFlag = 1 Then
+		Var ChangeTimeout = ChangeTimeout + 1
+	EndIf
+
+	If  waitAckPay = 2 Then
+		If Timeout > TimeoutWaitPay Then
+
+			If Seeker.CodeChannel = 1 Then
+				Var SessionID2 = SelectSlot + ":"
+				Var SessionID2 = SessionID2 + ExtendData
+
+				DEBUGVAR SessionID2
+
+				Var CreditAmount1 = ""
+				Var ServiceAmountFlow = ""
+				Var TelephoneNumber = "0899999999"
+				Var ServiceType = "coffee"
+				Var ECommerce = ""
+				Var ECommerce = ECommerce + PriceDrink
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + DiscountDrink
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SessionID2
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + SelectDrink
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.VendingCode
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + Seeker.CodeNumber
+				Var ECommerce =	ECommerce + "/"
+				Var ECommerce =	ECommerce + "C:"
+				Var ECommerce =	ECommerce + Seeker.IntVendingCampaign
+				Var ServiceParameter = "max"
+				Var ServiceCharge = 0
+				Var AccountType = "new"
+				Var testservice = "kbank"
+				Var tc = ""
+				Var GetScore = ""
+				Var OperatorName = ""
+				Var SessionID = ""
+
+				GetPayInfo TelephoneNumber ECommerce ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
+				;Var Timeout = 0
+			EndIf
+
+			SAVELOG "back_to_main from line  > 309."
+			Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+		EndIf
+	EndIf
+
+
+	If  ChangeOK = 2 Then
+		If ActionOKCase = 0 Then
+
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+
+
+			If HURR_FOREVER = "S:0" Then
+				Var HURR_FOREVER = "F:1303"
+			EndIf
+
+
+			Var ServiceType = "coffee-refund"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
+			Var PayDetail = ""
+			Var PayDetail2 = ""
+			Var VendingOrderID = Seeker.ORDER_ID
+			Var ServiceRefund = 0
+			Var ServiceCharge = Seeker.ServiceCharge
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
+
+			Var waitAckPay = 2
+			Var TimeoutWaitPay = 45
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+	If  ChangeTimeout > 30 Then
+		If ActionOKCase = 0 Then
+			If Seeker.TNumberTaobinCredit = "" Then
+				Var TelephoneNumber = "0899999999"
+				Var PayO2 = ""
+
+				If Seeker.TNumberTaobinMember = "" Then
+				Else
+					Var TelephoneNumber = Seeker.TNumberTaobinMember
+				EndIf
+
+			Else
+				Var TelephoneNumber = Seeker.TNumberTaobinCredit
+				Var PayO2 = Seeker.CoffeePinNumber
+			EndIf
+
+
+			Var ServiceType = "coffee-refund"
+			Var ServiceCredit = SelectDrink
+			Var SuggestID  = ""
+			Var SessionID2 = ""
+
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
+			Var PayDetail = ""
+			Var PayDetail2 = ""
+			Var VendingOrderID = Seeker.ORDER_ID
+			Var ServiceRefund = 0
+			Var ServiceCharge = Seeker.ServiceCharge
+			Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceRefund ServiceCharge Donate
+
+			Var waitAckPay = 2
+			Var TimeoutWaitPay = 45
+			Var Timeout = 5
+			Var ActionOKCase = 1
+
+		EndIf
+	EndIf
+
+	If ChangeOK = 3 Then
+		If ActionOKCase = 0 Then
+
+    		Var ActionOKCase = 1
+    		If Seeker.CodeChannel = 0 Then
+    			SAVELOG "back_to_main from line  > 391."
+    			Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
+    		EndIf
+
+    		Var waitAckPay = 2
+    		Var TimeoutWaitPay = 45
+    		Var Timeout = 5
+
+		EndIf
+	EndIf
+
+	If MachineState_Result = 1 Then
+
+		;Var MachineState_Result = 2
+
+	EndIf
+
+	If MachineState_Result = 1 Then
+		DEBUGVAR PaySuccessWithDaemonTask
+
+		If  waitAckPay = 0 Then
+
+			Var waitAckPay = 0
+			Var Timeout = 0
+
+			If Seeker.PayWithQR = 0 Then
+
+				If Seeker.CreditCard = 1 Then
+					CashlessReq SUCCESS Seeker.CashlessVendingTrackNumber
+				EndIf
+
+			Else
+
+			EndIf
+
+		EndIf
+
+		__CMD "clear-stock-data" 0 "-" "-"
+
+		Var ServiceSuccess = "yes"
+		If  waitAckPay = 0 Then
+
+			SAVELOG "waitAckPay = 0 Timeout"
+
+			Open "ROOT/taobin_project/xml/page_drinkok.xml"
+		EndIf
+
+	EndIf
+
+	If MachineState_Result = 2 Then
+
+		SAVELOG MachineStage
+
+		If ErrTimeout = 0 Then
+			Var ErrTimeout = 1
+
+			If Seeker.PayWithQR = 0 Then
+
+				If Seeker.CreditCard = 1 Then
+					CashlessReq FAIL Seeker.CashlessVendingTrackNumber
+					Var ChangeFlag = 1
+					Var CreditCardVoid = 1
+				Else
+
+
+					If Seeker.CodeChannel = 0 Then
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1
+
+							If Seeker.StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								If GetFreeFromError = 1 Then
+									Var ChangeOK = 2
+								Else
+									Change ServiceAmount2
+								EndIf
+
+							EndIf
+
+						EndIf
+
+					Else
+
+
+
+						If ChangeFlag = 0 Then
+							Var ChangeFlag = 1
+							Var ServiceAmount3 = ServiceAmount2 - Seeker.IntVendingCampaign
+
+							If Seeker.StoreCreditFlag = 1 Then
+								Var ChangeOK = 2
+							Else
+								Change ServiceAmount3
+							EndIf
+
+						EndIf
+
+
+
+					EndIf
+				EndIf
+
+			Else
+				Var ChangeOK = 3
+			EndIf
+
+		EndIf
+	EndIf
+
+
+
+	DEBUGVAR LastMakeDrinkResult
+	DEBUGVAR MachineStage
+
+
+	If LastMakeDrinkResult = "success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If LastMakeDrinkResult = "fail" Then
+			Var MachineState_Result = 2
+	EndIf
+
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		If RoadShow = "true" Then
+			Open "ROOT/taobin_project/xml/page_back_to_error.xml"
+		Else
+			Var MachineState_Result = 2
+		EndIf
+	EndIf
+
+	If MachineState_Result > 0 Then
+		Var EnableSelectMenuBetweenBrew = "Invisible"
+		Var EnableTopupCreditBetweenBrew = "Invisible"
+	EndIf
+
+	If EnableSelectMenuBetweenBrew = "Enable" Then
+		If EnableSelectMenuBetweenBrewBlink = "Enable" Then
+			Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+		Else
+			Var EnableSelectMenuBetweenBrewBlink = "Enable"
+		EndIf
+
+	Else
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"
+	EndIf
+
+	DEBUGVAR CountUpBrewing
+	; animation video loop
+	If AnimationOn = "true" Then
+		Var CountUpBrewing = CountUpBrewing + 1
+
+		Var SlotVideo = CountUpBrewing / AnimationVideoPlayTime
+
+		If PreviseStepVideo = SlotVideo Then
+			;SAVELOG SlotVideo
+		Else
+			Var PreviseStepVideo = SlotVideo
+			;SAVELOG PreviseStepVideo
+			;SAVELOG SlotVideo
+			;SAVELOG CountUpBrewing
+
+			;Var CountDownVideoTime = CountDownVideoTimeReload
+
+			Var StepVideo = SlotVideo + 2
+
+			;SAVELOG StepVideo
+
+			If StepVideo = 1 Then
+				Var videoID = VideoID1
+			EndIf
+			If StepVideo = 2 Then
+				Var videoID = VideoID2
+			EndIf
+			If StepVideo = 3 Then
+				Var videoID = VideoID3
+			EndIf
+			If StepVideo = 4 Then
+				Var videoID = VideoID4
+			EndIf
+			If StepVideo = 5 Then
+				Var videoID = VideoID5
+			EndIf
+			If StepVideo = 6 Then
+				Var videoID = VideoID6
+			EndIf
+			If StepVideo = 7 Then
+				Var videoID = VideoID7
+			EndIf
+			If StepVideo = 8 Then
+				Var videoID = VideoID8
+			EndIf
+			If StepVideo = 9 Then
+				Var videoID = VideoID9
+			EndIf
+
+			;SAVELOG videoID
+
+			If videoID = 0 Then
+
+			Else
+				If videoID = "---" Then
+
+				Else
+
+					Var VideoPlayFile = VideoPath
+					Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+					Var VideoPlayFile = VideoPlayFile + videoID
+					Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+					Var PictureFile = PicturePath
+					Var PictureFile = PictureFile + PictureBegin
+					Var PictureFile = PictureFile + videoID
+					Var PictureFile = PictureFile + PictureEnd
+
+					DEBUGVAR VideoPlayFile
+					DEBUGVAR PictureFile
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
+
+	If IgnoreNetCore = "true" Then
+		If CountDownBrewing = 0 Then
+			SAVELOG "CountDownBrewing = 0"
+			Open "ROOT/taobin_project/xml/page_drinkok.xml"
+		EndIf
+	EndIf
+
+
+	If ButtonGameCountDown > 0 Then
+		If ButtonGameCountDown = 1 Then
+			Var ButtonGameCountDownState = "Invisible"
+			Var ButtonGamePressToPlayState = "Enable"
+		EndIf
+		Var ButtonGameCountDown = ButtonGameCountDown - 1
+		DEBUGVAR ButtonGameCountDown
+	EndIf
+
+
+	DEBUGVAR BREW_CNT
+	DEBUGVAR ButtonGamePressToPlayState
+	If BREW_CNT > 60 Then
+
+	Else
+		Var ButtonGamePressToPlayState = "Invisible"
+		Var Game01Enable = 0
+	EndIf
+
+
+	; TODO
+	DEBUGVAR EnableDoubleCupNoError
+	DEBUGVAR HURR_FOREVER
+	DEBUGVAR RequestPickupCupAlert
+	If RequestPickupCupAlert = "true" Then
+		Open "ROOT/taobin_project/xml/page_pickup_cup_between_order.xml"
+	EndIf
+
+
+
+
+
+	;include="ROOT/taobin_project/inc/timeout_lid_and_straw_step.inc"
+
+
+
+	Refresh
+	TimerReset
+
+</EventTimeout>
+
+<EventMachine>
+
+</EventMachine>
+
+; this copy in file menu_brew2.xml and menu_lid_straw.xml
+<EventChangeStatus>
+	If ChangeStatus = "payout-end" Then
+		If ChangeFlag = 1 Then
+			Var ChangeOK = 2
+		EndIf
+	EndIf
+</EventChangeStatus>
+
+<Video>
+<X> 0 </X>
+<Y> 380 </Y>
+<Width> 1080</Width>
+<Height> 840 </Height>
+<Refresh> "Reload" </Refresh>
+<Loop> "true" </Loop>
+<Filename> VideoPlayFile </Filename>
+</Video>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+;<Image>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
+;</Image>
+
+
+
+
+
+<Image>
+<X> 60 </X>
+<Y> 1290 </Y>
+<Filename> PictureFile</Filename>
+</Image>
+
+;<Image>
+;<X> 60 </X>
+;<Y> 1649 </Y>
+;<Filename> BottomText </Filename>
+;</Image>
+
+<Image>
+<X> 0 </X>
+<Y> 1655 </Y>
+<State>EnableSelectMenuBetweenBrew</State>
+<Filename> text_next_order </Filename>
+<Image>
+
+<Image>
+<X> 835 </X>
+<Y> 1735 </Y>
+<State>EnableSelectMenuBetweenBrewBlink</State>
+<Filename> "ROOT/taobin_project/image/page_payment/arrow_1.png" </Filename>
+<Image>
+
+
+
+
+;
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> IMG_CNT </Filename>
+</Image>
+;
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 470 </Y>
+<Align> End </Align>
+<Width> 153 </Width>
+<Size> 88 </Size>
+<Font> RobotoBold </Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+
+<Text>
+<X> 816 </X>
+<Y> 429 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000405 </ID>
+</Language>
+</Text>
+
+<Text>
+<X> 941 </X>
+<Y> 518 </Y>
+<State> LanguageObjectShow </State>
+<Language>
+	<ID> 000406 </ID>
+</Language>
+</Text>
+
+<Button>
+<X> 792 </X>
+<Y> 1787 </Y>
+<State>EnableSelectMenuBetweenBrew</State>
+<Filename> next_pic_bn </Filename>
+<FilenamePress> next_pic_bp </FilenamePress>
+<EventClick>
+	If MachineState_Result = 0 Then
+
+		SAVELOG "User click next button"
+
+		Var Seeker = "next"
+		Var MultiPayEnable = "false"
+		CoinPause
+		Var PayCredit = 0
+
+		Open "ROOT/taobin_project/xml/page_catalog.xml"
+	EndIf
+</EventClick>
+</Button>
+
+
+<GIF>
+<X> 526 </X>
+<Y> 1680 </Y>
+<Width> 241 </Width>
+<Height> 204 </Height>
+<State> ButtonGamePressToPlayState </State>
+<Filename> "ROOT/taobin_project/app/game/TAMATIAN-01.gif" </Filename>
+</GIF>
+
+<Image>
+<X> 526 </X>
+<Y> 1680 </Y>
+<Width> 241 </Width>
+<Height> 204 </Height>
+<State> ButtonGamePressToPlayState </State>
+<EventClick>
+	DEBUGVAR Game01Enable
+	SAVELOG "Press play game conti"
+	Var Game01Enable = 0
+	Var ButtonGamePressToPlayState = "Invisible"
+	RunApp "com.NDF.taobin"
+</EventClick>
+</Image>
+
+
+
+<Button>
+<X> 10 </X>
+<Y> 500 </Y>
+<State>bg_strawlid_ST</State>
+<Filename> bg_strawlid </Filename>
+<EventClick>
+
+</EventClick>
+</Button>
+
+; straw left
+<Button>
+<X> 50 </X>
+<Y> 572 </Y>
+<State> StrawStateX </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/bn_straw.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/bp_straw.png" </FilenamePress>
+<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_straw.png" </FilenameDisable>
+<EventClick>
+	SAVELOG "Click straw cb"
+	If StrawStateX = "Press" Then
+		;Var StrawStateX = "Enable"
+	Else
+		Var StrawStateX = "Press"
+		Var Seeker.strawAction = 1
+
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 377 </X>
+<Y> 579 </Y>
+<State> StrawStateX </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+<EventClick>
+	SAVELOG "Click straw cb"
+	If StrawStateX = "Press" Then
+		;Var StrawStateX = "Enable"
+	Else
+		Var StrawStateX = "Press"
+		Var Seeker.strawAction = 1
+	EndIf
+	Refresh
+</EventClick>
+</Button>
+
+
+
+; LID left
+<Button>
+<X> 50 </X>
+<Y> 648 </Y>
+<State> LidStateX </State>
+<Mode> "No" </Mode>
+<Filename>  "ROOT/taobin_project/image/topping2/bn_lid.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/bp_lid.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_lid.png" ) </FilenameDisable>
+<EventClick>
+
+	If Seeker.thankLidFlag = 0 Then
+
+		SAVELOG "Click LID pic"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"
+		Else
+			Var LidStateX = "Press"
+			Var Seeker.lidAction = 1
+		EndIf
+
+
+		DEBUGVAR SugarState1
+		Refresh
+
+	EndIf
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 377 </X>
+<Y> 655 </Y>
+<State> LidStateX </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/cb_notcheck.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/cb_checked.png" </FilenamePress>
+<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
+<EventClick>
+
+	If Seeker.thankLidFlag = 0 Then
+
+		SAVELOG "Click LID cb"
+		If LidStateX = "Press" Then
+			;Var LidStateX = "Enable"
+		Else
+			Var LidStateX = "Press"
+			Var Seeker.lidAction = 1
+		EndIf
+		Refresh
+
+	EndIf
+
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 526 </X>
+<Y> 1787 </Y>
+<State> ButtonGameCountDownState </State>
+<Filename>  "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page_doing/bn_game_cnt_down.png" </FilenamePress>
+<EventClick>
+
+</EventClick>
+<Text>
+	<X> 0 </X>
+	<Y> 0 </Y>
+	<Size> 64 </Size>
+	<Align> Center </Align>
+	<Width> 240 </Width>
+	<Font> KanitBoldTTF </Font>
+	<Color> 0xFFFFFF </Color>
+	<State> ButtonGameCountDownState </State>
+	<Value> ButtonGameCountDown </Value>
+</Text>
+</Button>
+
+;include="ROOT/taobin_project/inc/button_request_lid_and_straw.inc"
+
+</Popup>

inter/aus/xml/page_brewing3.lxml

@@ -5,6 +5,11 @@
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+
+    If New_Payment = 1 Then
+        Open "ROOT/taobin_project/inter/aus/xml/page_NewBrewing3.lxml"
+    EndIf
+
 	Var SendNotiPaySuccess = 2
 
 	Var GetMoreStrawCount = 3
@@ -1117,18 +1122,17 @@
 			If AddData = 1 Then
 				Var Cid = 26
 
-				If NewCollectPointFlag = 1 Then
-					If Seeker.redeemDiscount = "2_dollar" Then
-						Var Cid = 49
-					EndIf
 
-					If Seeker.redeemDiscount = "1_dollar" Then
-						Var Cid = 48
-					EndIf
-
-					Var Seeker.redeemDiscount = ""
+				If Seeker.redeemDiscount = "2_dollar" Then
+					Var Cid = 49
 				EndIf
 
+				If Seeker.redeemDiscount = "1_dollar" Then
+					Var Cid = 48
+				EndIf
+
+				Var Seeker.redeemDiscount = ""
+
 				AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 
@@ -1233,17 +1237,15 @@
 
 			If AddData = 1 Then
 				Var Cid = 26
-				If NewCollectPointFlag = 1 Then
-					If Seeker.redeemDiscount = "2_dollar" Then
-						Var Cid = 49
-					EndIf
-
-					If Seeker.redeemDiscount = "1_dollar" Then
-						Var Cid = 48
-					EndIf
-
-					Var Seeker.redeemDiscount = ""
+				If Seeker.redeemDiscount = "2_dollar" Then
+					Var Cid = 49
 				EndIf
+
+				If Seeker.redeemDiscount = "1_dollar" Then
+					Var Cid = 48
+				EndIf
+
+				Var Seeker.redeemDiscount = ""
 				AddData Cid Seeker.TNumberTaobinMember Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
 

inter/aus/xml/page_brewing3Conti.xml

@@ -6,6 +6,10 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 
+    If New_Payment = 1 Then
+        Open "ROOT/taobin_project/inter/aus/xml/page_NewBrewing3Conti.lxml"
+    EndIf
+
     If CoffeeFreeEnable = "true" Then
 	   Var RoadShow = "false"
 	EndIf
@@ -618,19 +622,17 @@
 			If AddData = 1 Then
 				Var Cid = 26
 				DEBUGVAR "Brewing3Conti"
-				If NewCollectPointFlag = 1 Then
-					If Seeker.redeemDiscount = "2_dollar" Then
-						Var Cid = 49
-					EndIf
-
-					If Seeker.redeemDiscount = "1_dollar" Then
-						Var Cid = 48
-					EndIf
-
-					DEBUGVAR Seeker.redeemDiscount
-					Var Seeker.redeemDiscount = ""
+				If Seeker.redeemDiscount = "2_dollar" Then
+					Var Cid = 49
 				EndIf
 
+				If Seeker.redeemDiscount = "1_dollar" Then
+					Var Cid = 48
+				EndIf
+
+				DEBUGVAR Seeker.redeemDiscount
+				Var Seeker.redeemDiscount = ""
+
 				DEBUGVAR Cid
 				DEBUGVAR Seeker
 				DEBUGVAR Seeker.TNumberTaobinMember
@@ -746,18 +748,16 @@
 			If AddData = 1 Then
 				Var Cid = 26
 
-				If NewCollectPointFlag = 1 Then
-					If Seeker.redeemDiscount = "2_dollar" Then
-						Var Cid = 49
-					EndIf
-
-					If Seeker.redeemDiscount = "1_dollar" Then
-						Var Cid = 48
-					EndIf
-
-					Var Seeker.redeemDiscount = ""
+				If Seeker.redeemDiscount = "2_dollar" Then
+					Var Cid = 49
 				EndIf
 
+				If Seeker.redeemDiscount = "1_dollar" Then
+					Var Cid = 48
+				EndIf
+
+				Var Seeker.redeemDiscount = ""
+
 				DEBUGVAR Cid
 				DEBUGVAR Seeker
 				DEBUGVAR Seeker.TNumberTaobinMember

inter/aus/xml/page_collect_point_1.lxml

@@ -185,7 +185,12 @@
 		;Open "ROOT/taobin_project/xml/page_catalog.xml"
 
 
-        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+		If CleanFeedbackFlag = 1 Then
+            Var CleanFeedBackToCollectPoint = 0
+            Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+		Else
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+		EndIf
 	EndIf
 
 	If Timeout = 18 Then
@@ -531,7 +536,12 @@
 	;Open "ROOT/taobin_project/xml/page_catalog.xml"
 	SAVELOG "collect_point1-p589."
 
-	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	If CleanFeedbackFlag = 1 Then
+        Var CleanFeedBackToCollectPoint = 0
+        Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+	Else
+        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
 </EventClick>
 </Button>
 

inter/aus/xml/page_collect_point_2.lxml

@@ -165,11 +165,12 @@
 				DEBUGVAR Seeker.PointTaobinStr
 				DEBUGVAR Seeker.TNumberTaobinMember
 
-				If NewCollectPointFlag = 1 Then
-					Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_3.lxml"
-				Else
-					Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
-				EndIf
+                If CleanFeedbackFlag = 1 Then
+                    Var CleanFeedBackToCollectPoint = 1
+                    Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+                Else
+                    Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_3.lxml"
+                EndIf
 
 			Else
 

inter/aus/xml/page_collect_point_error.lxml

@@ -7,12 +7,12 @@
 
 <EventOpen>
 	; On open
-	
+
 
 	Var Timeout = 0
 	SAVELOG show_eng
-	
-    If show_eng = "true" Then 
+
+    If show_eng = "true" Then
 		Var DirImage = "ROOT/taobin_project/image/display_get_free_en/"
 		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
 		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
@@ -24,17 +24,22 @@
 	EndIf
 </EventOpen>
 <Timeout> 1000 </Timeout>
-<EventTimeout> 
+<EventTimeout>
 
 	Var Timeout = Timeout + 1
 	If Timeout > 5 Then
         ; goto lid straw
-		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        If CleanFeedbackFlag = 1 Then
+            Var CleanFeedBackToCollectPoint = 0
+            Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+        Else
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+        EndIf
 	EndIf
 
 	TimerReset
 	Refresh
-</EventTimeout> 
+</EventTimeout>
 
 <EventMachine>
 	If MachineStage = "drink-success" Then
@@ -73,10 +78,15 @@
 <FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
-<EventClick> 
+<EventClick>
 	; goto lid straw
 
-	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	If CleanFeedbackFlag = 1 Then
+        Var CleanFeedBackToCollectPoint = 0
+        Open "ROOT/taobin_project/xml/page_clean_feedback.xml"
+    Else
+        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+    EndIf
 
 </EventClick>
 </Button>
@@ -91,17 +101,17 @@
 
 
 
-		
-
-
-			
 
 
 
 
-			
-<EventSecurity> 
-	Open "/media/bt/xml/security_alarm.xml" 
+
+
+
+
+
+<EventSecurity>
+	Open "/media/bt/xml/security_alarm.xml"
 </EventSecurity>
 
 

inter/gbr/xml/page_payment_with_ema.lxml

@@ -80,13 +80,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "1"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>
@@ -102,13 +102,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "2"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>
@@ -124,13 +124,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "3"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>
@@ -146,13 +146,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "4"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>
@@ -168,13 +168,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "5"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>
@@ -190,13 +190,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "6"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>
@@ -212,13 +212,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "7"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>
@@ -234,13 +234,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "8"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>
@@ -256,13 +256,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "9"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>
@@ -278,13 +278,13 @@
         <EventClick>
            	Var Timeout = 0
            	Var EMAMemberID = EMAMemberID + "0"
-           	Trim EMAMemberID 8
+           	Trim EMAMemberID MAX_EMA_CODE
 
            	TimerReset
            	Refresh
 
            	StrLen EMAMemberID IDNumLen
-           	If IDNumLen >= 8 Then
+           	If IDNumLen >= MAX_EMA_CODE Then
           		Var Tel_Confirm_State = "Enable"
            	EndIf
         </EventClick>

inter/hkg/xml/event/script_common_for_open_promotion_xml.ev

@@ -3,6 +3,12 @@
 
 ; ensure
 
+If OpenFromMulti = 1 Then
+	TabMenuVisibleInst 99
+EndIf
+
+Var OpenFromMulti = 0
+
 Var RecommendPageMulti = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_recommend.lxml"
 
 Var CountSecureOpenPro = 0
@@ -30,44 +36,43 @@ If SeasonPassMode = 1 Then
 EndIf
 
 ; zone promote
-If OpenFromPageBoard = 1 Then
-
-		If EnableMultiInstance = "true" Then
-			OpenInst 2 RecommendPageMulti
-			OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
-		Else
-			If SeasonPassMode = 1 Then
-
-				Var PromotionState1 = "Enable"
-				Var PromotionState2 = "Enable"
-				Var PromotionState3 = "Enable"
-
-				OpenInst 2 SeasonFile
-			Else
-				OpenInst 2 "ROOT/taobin_project/inter/hkg/xml/page_catalog_group_recommend.lxml" 
-			EndIf
-		EndIf
-
-	    
+If CatalogLayoutV3 = 1 Then
+	SAVELOG " CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 CatalogLayoutV3 "
+	TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/v3/event/script_open_promotion_v3.ev"
 Else
-		If EnableMultiInstance = "true" Then
-			Open RecommendPageMulti
-		Else
-			If SeasonPassMode = 1 Then
-				Var PromotionState1 = "Enable"
-				Var PromotionState2 = "Enable"
-				Var PromotionState3 = "Enable"
+	If OpenFromPageBoard = 1 Then
+		Var OpenFromPageBoard = 0
 
-				Open SeasonFile
+			If EnableMultiInstance = "true" Then
+				OpenInst 2 RecommendPageMulti
+				OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 			Else
-				Open "ROOT/taobin_project/inter/hkg/xml/page_catalog_group_recommend.lxml" 
+				If SeasonPassMode = 1 Then
+
+					Var PromotionState1 = "Enable"
+					Var PromotionState2 = "Enable"
+					Var PromotionState3 = "Enable"
+
+					OpenInst 2 SeasonFile
+				Else
+					OpenInst 2 "ROOT/taobin_project/inter/hkg/xml/page_catalog_group_recommend.lxml" 
+				EndIf
 			EndIf
-		EndIf
-EndIf
 
-Var OpenFromPageBoard = 0
+			
+	Else
+			If EnableMultiInstance = "true" Then
+				OpenInst 2 RecommendPageMulti
+			Else
+				If SeasonPassMode = 1 Then
+					Var PromotionState1 = "Enable"
+					Var PromotionState2 = "Enable"
+					Var PromotionState3 = "Enable"
 
-If OpenFromMulti = 1 Then
-	TabMenuVisibleInst 99
-EndIf
-Var OpenFromMulti = 0
+					Open SeasonFile
+				Else
+					Open "ROOT/taobin_project/inter/hkg/xml/page_catalog_group_recommend.lxml" 
+				EndIf
+			EndIf
+	EndIf
+EndIf

inter/hkg/xml/multi/ForProGroup.inc

@@ -0,0 +1,27 @@
+;include="ROOT/taobin_project/inter/hkg/xml/multi/InstanceGetSetString.inc"
+
+
+    GetVisible inst_show_exclude_group
+
+    If inst_show_exclude_group_counter = "" Then
+        Var inst_show_exclude_group_counter = 15
+    EndIf
+
+
+    If inst_show_exclude_group = 1 Then
+        If inst_show_exclude_group_counter > 0 Then
+
+            Var inst_show_exclude_group_counter = inst_show_exclude_group_counter - 1
+
+            If inst_show_exclude_group_counter = 0 Then
+                RefreshAll
+                Var inst_show_exclude_group_counter = 15
+            EndIf
+        EndIf
+    EndIf
+
+    If Timeout > 60 Then
+        ;include="ROOT/taobin_project/inc/return_condition.ev"
+    EndIf
+
+    Var Timeout = Timeout + 1

inter/hkg/xml/multi/InstanceGetSetString.inc

@@ -0,0 +1,17 @@
+    InstanceGetString SaveStringInst
+    ;DEBUGVAR SaveStringInst
+    ;DEBUGVAR show_eng
+
+
+
+    If SaveStringInst = "RefreshNow" Then
+        RefreshAll
+	Else
+		
+
+    EndIf
+    InstanceSetString "-"
+	;DEBUGVAR LanguageShow
+
+
+

inter/hkg/xml/multi/control_and_lang_swith.ev

@@ -1,38 +1,58 @@
+Var layoutVersion = ""
+
+If CatalogLayoutV3 = 1 Then
+    Var layoutVersion = "v3/"
+EndIf
+
+TRY "ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"
+TRY "ROOT/taobin_project/inter/hkg/xml/multi/event/tricker.ev"
+
+SAVELOG "===================== control language and switch instance ====================="
+
 OpenRedirect "/taobin_project/inter/hkg/xml/page_catalog_group_coffee.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/coffee.ev"
-Var InstanceTabOpenFile2 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_coffee.lxml"
+Var InstanceTabOpenFile2 = "ROOT/taobin_project/inter/hkg/xml/multi/" + layoutVersion
+Var InstanceTabOpenFile2 = InstanceTabOpenFile2 + "/page_catalog_group_coffee.lxml"
 
 
 OpenRedirect "/taobin_project/inter/hkg/xml/page_catalog_group_tea.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/tea.ev"
-Var InstanceTabOpenFile3 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_tea.lxml"
+Var InstanceTabOpenFile3 = "ROOT/taobin_project/inter/hkg/xml/multi/" + layoutVersion
+Var InstanceTabOpenFile3 = InstanceTabOpenFile3 + "/page_catalog_group_tea.lxml"
 
 OpenRedirect "/taobin_project/inter/hkg/xml/page_catalog_group_milk.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/milk.ev"
-Var InstanceTabOpenFile4 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_milk.lxml"
+Var InstanceTabOpenFile4 = "ROOT/taobin_project/inter/hkg/xml/multi/" + layoutVersion
+Var InstanceTabOpenFile4 = InstanceTabOpenFile4 + "/page_catalog_group_milk.lxml"
 
 
 OpenRedirect "/taobin_project/inter/hkg/xml/page_catalog_group_other.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/otherOther.ev"
-Var InstanceTabOpenFile7 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_other.lxml"
+Var InstanceTabOpenFile7 = "ROOT/taobin_project/inter/hkg/xml/multi/" + layoutVersion
+Var InstanceTabOpenFile7 = InstanceTabOpenFile7 + "/page_catalog_group_other.lxml"
 
-If AppFastButtonState = "Enable" Then
-    Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_appfast.lxml"
+If AppFastButtonState = "Enable" 
+    Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/hkg/xml/multi/" + layoutVersion
+    Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_appfast.lxml"
 EndIf
 
 If WheyButtonState = "Enable" Then
     OpenRedirect "/taobin_project/inter/hkg/xml/page_catalog_group_whey.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/kidandwhey.ev"
-    Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_whey.lxml"
+    Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/hkg/xml/multi/" + layoutVersion
+    Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_whey.lxml"
 EndIf
 
 If MenuKidButtonState = "Enable" Then
     OpenRedirect "/taobin_project/inter/hkg/xml/page_catalog_group_forkid.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/kidandwhey.ev"
-    Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_forkid.lxml"
+    Var InstanceTabOpenFile5 = "ROOT/taobin_project/inter/hkg/xml/multi/" + layoutVersion
+    Var InstanceTabOpenFile5 = InstanceTabOpenFile5 + "/page_catalog_group_forkid.lxml"
 EndIf
 
 
 If CocktailShow = "true" Then 
     OpenRedirect "/taobin_project/inter/hkg/xml/page_catalog_group_cocktail.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/health.ev"
-    Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_cocktail.lxml"
+    Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/" + layoutVersion
+    Var InstanceTabOpenFile6 = InstanceTabOpenFile6 + "page_catalog_group_cocktail.lxml"
 Else
     OpenRedirect "/taobin_project/inter/hkg/xml/page_catalog_group_health.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/health.ev"
-    Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/page_catalog_group_health.lxml"
+    Var InstanceTabOpenFile6 = "ROOT/taobin_project/inter/hkg/xml/multi/" + layoutVersion
+    Var InstanceTabOpenFile6 = InstanceTabOpenFile6 + "/page_catalog_group_health.lxml"
 EndIf
 
 TabMenuLock 15
@@ -55,4 +75,6 @@ DEBUGVAR WheyButtonState
 DEBUGVAR MenuKidButtonState
 DEBUGVAR CocktailShow
 
+Var CatalogLayoutV3Loaded = 1
+
 LanguageShow = "ENG"

inter/hkg/xml/multi/menu_new_layout_gen_v2.py

@@ -601,7 +601,7 @@
     idx_hot_product_code = 7
     idx_cold_product_code = idx_hot_product_code + 1
     idx_blend_product_code = idx_cold_product_code + 1
-    idx_default_load_topping = idx_blend_product_code + 2
+    idx_default_load_topping = idx_blend_product_code + 5
     
     # 
     idx_hot_product_code2 = idx_blend_product_code + 1

inter/hkg/xml/multi/page_catalog.lxml

@@ -287,6 +287,16 @@
 	DEBUGVAR Inst11MenuLoaded
 
 	DEBUGVAR MultiProcessTimer
+	DEBUGVAR CatalogLayoutV3
+	If CatalogLayoutV3Loaded = 1 Then
+		Var Inst5MenuLoaded = "done"
+		Var Inst6MenuLoaded = "done"
+		Var Inst7MenuLoaded = "done"
+		Var Inst8MenuLoaded = "done"
+		Var Inst9MenuLoaded = "done"
+		Var Inst10MenuLoaded = "done"
+		Var Inst11MenuLoaded = "done"
+	EndIf
 	
 
 	If MultiProcess = "Enable" Then
@@ -553,11 +563,16 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	
-	Var OpenFromMulti = 1
-	TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/event/script_common_for_open_promotion_xml.ev"
-	RootLayoutVisible 3 "hide"
-	;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	If CatalogLayoutV3 = 1 Then
+		Var OpenFromMulti = 0
+
+    	TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/v3/event/script_open_promotion_v3.ev"
+	Else
+		Var OpenFromMulti = 1
+		TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/event/script_common_for_open_promotion_xml.ev"
+		RootLayoutVisible 3 "hide"
+		;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"
+	EndIf
 	
 </EventClick>
 <Language>

inter/hkg/xml/multi/tab_menu.lxml

@@ -74,18 +74,24 @@
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick>
-            SAVELOG "Click rec"
-            Var NextPage = "-"
-            Var OpenFromMulti = 1
-            Var OpenFromPageBoard = 1
+            If CatalogLayoutV3 = 1 Then
+                SAVELOG "Click recommend CatalogLayoutV3"
+                Var NextPage = "-"
+                Var OpenFromMulti = 0
+                Var OpenFromPageBoard = 0
 
-            ;Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
-		    ;TRY OpenFileXML
+                TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/v3/event/script_open_promotion_v3.ev"
+            Else
+                SAVELOG "Click rec"
+                Var NextPage = "-"
+                Var OpenFromMulti = 1
+                Var OpenFromPageBoard = 0
 
-            RootLayoutVisible 3 "hide"
-            RootLayoutVisible 15 "hide"
-    
-            TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/event/script_common_for_open_promotion_xml.ev"
+                RootLayoutVisible 3 "hide"
+                RootLayoutVisible 15 "hide"
+        
+                TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/event/script_common_for_open_promotion_xml.ev"
+            EndIf
         </EventClick>
         </Button>
 

inter/hkg/xml/multi/v3/event/dummy_layout_promotion.py

@@ -0,0 +1,62 @@
+if "v3" in param and "promotion" in param and "other_catalog" in param:
+	file_template = open(directory_to_process + "/page_catalog_group_other_other.lxml", 'r')
+	template_content = file_template.read()
+	file_template.close()
+
+	pro_template = open(directory_to_process + "/event/event_v3/promotion_template.inc")
+	pro_template_content = pro_template.read()
+	pro_template.close()
+
+	all_active_pro = ""
+
+	files = os.listdir(directory_to_process + "/event/event_v3/catalog_other")
+	files = [f for f in files if f.endswith(".json")]
+	for filename in files:
+		pro_json_file = open(directory_to_process + "/event/event_v3/catalog_other/"+ filename)
+		pro_json = json.load(pro_json_file)
+		start_time = datetime.datetime.strptime(pro_json["start"], "%Y-%m-%dT%H:%M:%S")
+		end_time = datetime.datetime.strptime(pro_json["end"], "%Y-%m-%dT%H:%M:%S")
+		if start_time > datetime.datetime.now() or datetime.datetime.now() < end_time:
+			pro_content = str(pro_template_content)
+			pro_content = pro_content.replace("#State", pro_json["state"])
+			pro_content = pro_content.replace("#Type", pro_json["type"])
+			pro_content = pro_content.replace("#MediaThai", pro_json["media_thai"])
+			pro_content = pro_content.replace("#MediaEng", pro_json["media_eng"])
+			pro_content = pro_content.replace("#EventClick", pro_json["event_click"])
+			all_active_pro += pro_content + "\n\t"
+
+		pro_output_file = open(directory_to_process + "/event/event_v3/catalog_other/active_promotions.lxml", 'w')
+		pro_output_file.write(template_content.replace(";banners", all_active_pro))
+		pro_output_file.close()
+
+if "v3" in param and "promotion" in param:
+	file_template = open(directory_to_process + "/page_catalog_group_recommend.lxml", 'r')
+	template_content = file_template.read()
+	file_template.close()
+
+	pro_template = open(directory_to_process + "/event/event_v3/promotion_template.inc")
+	pro_template_content = pro_template.read()
+	pro_template.close()
+
+	all_active_pro = ""
+
+	files = os.listdir(directory_to_process + "/event/event_v3")
+	files = [f for f in files if f.endswith(".json")]
+	files.sort()
+	for filename in files:
+		pro_json_file = open(directory_to_process + "/event/event_v3/"+ filename)
+		pro_json = json.load(pro_json_file)
+		start_time = datetime.datetime.strptime(pro_json["start"], "%Y-%m-%dT%H:%M:%S")
+		end_time = datetime.datetime.strptime(pro_json["end"], "%Y-%m-%dT%H:%M:%S")
+		if start_time > datetime.datetime.now() or datetime.datetime.now() < end_time:
+			pro_content = str(pro_template_content)
+			pro_content = pro_content.replace("#State", pro_json["state"])
+			pro_content = pro_content.replace("#Type", pro_json["type"])
+			pro_content = pro_content.replace("#MediaThai", pro_json["media_thai"])
+			pro_content = pro_content.replace("#MediaEng", pro_json["media_eng"])
+			pro_content = pro_content.replace("#EventClick", pro_json["event_click"])
+			all_active_pro += pro_content + "\n"
+
+		pro_output_file = open(directory_to_process + "/event/event_v3/active_promotions.lxml", 'w')
+		pro_output_file.write(template_content.replace(";banners", all_active_pro))
+		pro_output_file.close()

inter/hkg/xml/multi/v3/event/event_v3/1_promotion_apple_farm_festival.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-06-01T00:00:00",
+  "end": "2025-06-30T00:00:00",
+  "state": "AppleFarmFestivalProState",
+  "type": "IMAGE",
+  "media_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+  "media_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_apple_farm_festival.lxml\""
+}

inter/hkg/xml/multi/v3/event/event_v3/2_promotion_happy_trios.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-06-01T00:00:00",
+  "end": "2025-06-30T00:00:00",
+  "state": "HappyTriosProState",
+  "type": "IMAGE",
+  "media_thai": "ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png",
+  "media_eng": "ROOT/taobin_project/image/event/happy_trios/happy_trios_2.png",
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_happy_trios.lxml\""
+}

inter/hkg/xml/multi/v3/event/event_v3/3_promotion_school_ovaltine.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-05-19T00:00:00",
+  "end": "2025-05-31T00:00:00",
+  "state": "SchoolOvaltineProState",
+  "type": "VIDEO",
+  "media_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4",
+  "media_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4",
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_school_ovaltine.lxml\""
+}

inter/hkg/xml/multi/v3/event/event_v3/4_promotion_matcha_every_day.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-05-01T00:00:00",
+  "end": "2025-05-19T00:00:00",
+  "state": "MatchaEveryDayProState",
+  "type": "IMAGE",
+  "media_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
+  "media_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day2.png",
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml\""
+}

inter/hkg/xml/multi/v3/event/event_v3/5_promotion_oreo_volcano.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-05-01T00:00:00",
+  "end": "2025-05-31T00:00:00",
+  "state": "OreoVolcanoProState",
+  "type": "IMAGE",
+  "media_thai": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+  "media_eng": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml\""
+}

inter/hkg/xml/multi/v3/event/event_v3/catalog_other/1_promotion_boost_energy.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-05-01T00:00:00",
+  "end": "2025-05-11T00:00:00",
+  "state": "BoostEnergyProState",
+  "type": "IMAGE",
+  "media_thai": "ROOT/taobin_project/image/event/boost_energy/boost_energy.png",
+  "media_eng": "ROOT/taobin_project/image/event/boost_energy/boost_energy.png",
+  "event_click": "RootLayoutVisible 10 \"hide\"\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_boost_energy.lxml\""
+}

inter/hkg/xml/multi/v3/event/event_v3/promotion_template.inc

@@ -0,0 +1,16 @@
+		<Banner>
+			<State> #State </State>
+			<Type> #Type </Type>
+			<Media>
+				eval(
+					If show_eng = "true" Then
+						Var return = "#MediaEng"
+					Else
+						Var return = "#MediaThai"
+					EndIf
+				)
+			</Media>
+			<EventOnClick>
+				#EventClick
+			</EventOnClick>
+		</Banner>

inter/hkg/xml/multi/v3/event/script_open_promotion_v3.ev

@@ -0,0 +1,50 @@
+
+Var InstanceTabOpenFile10 = "ROOT/taobin_project/inter/hkg/xml/multi/v3/event/event_v3/active_promotions.lxml"
+
+Var LanguageButtonEnable = "Invisible"
+Var BtnLangToggleIndex = "Enable"
+
+Var ButtonLanguageCurrentXPosition = 1005
+Var ButtonLanguageCurrentYPosition = 458 - 38
+
+Var ButtonLanguageListXPosition = 970
+Var ButtonLanguageListYPosition = 450 - 38
+
+OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+
+TabMenuVisibleInst 10
+OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/page_instance2.xml"
+
+Var Menu1Selected = "PressForever"
+
+OpenInst 15 "ROOT/taobin_project/inter/hkg/xml/multi/tab_menu.lxml"
+RootLayoutVisible 15 "show"
+
+;Var FileRecommendToOpen = "ROOT/taobin_project/inter/hkg/xml/multi/v3/event/event_v3/active_promotions.lxml"
+
+
+Var MatchaEveryDayProState  = "Invisible"
+Var SchoolOvaltineProState = "Invisible"
+Var OreoVolcanoProState  = "Invisible"
+Var AppleFarmFestivalProState = "Invisible"
+Var HappyTriosProState = "Invisible"
+
+If MatchaEveryDayPro = 1 Then
+    Var MatchaEveryDayProState  = "Enable"
+EndIf
+
+If SchoolOvaltinePro = 1 Then
+    Var SchoolOvaltineProState = "Enable"
+EndIf
+
+If OreoVolcanoPro = 1 Then
+	Var OreoVolcanoProState = "Enable"
+EndIf
+
+If AppleFarmFestivalPro = 1 Then
+    Var AppleFarmFestivalProState = "Enable"
+EndIf
+
+If HappyTriosPro = 1 Then
+    Var HappyTriosProState = "Enable"
+EndIf

inter/hkg/xml/multi/v3/menu_head.py

@@ -0,0 +1,106 @@
+ 
+ RoadShow = False
+
+ default_dir = 'ROOT/taobin_project/image/page_drink/'
+ default_dir2 = 'ROOT/taobin_project/image/page_drink_select/'
+ default_dir_press = 'ROOT/taobin_project/image/page_drink_press/'
+ default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable/'
+ 
+ new_default_dir = 'ROOT/taobin_project/inter/tha/image/page_drink_n/'
+ new_default_dir2 = 'ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/'
+ new_default_dir_press = 'ROOT/taobin_project/inter/tha/image/page_drink_press_n/'
+ new_default_dir_disable = 'ROOT/taobin_project/inter/tha/image/page_drink_disable_n2/'
+ 
+ menu_count = 0
+ 
+ x1 = 44
+ x2 = 301
+ x3 = 558
+ x4 = 815
+ 
+ ystep = 899 - 571
+ y1 = 20
+ y2 = y1 + ystep*1
+ y3 = y1 + ystep*2
+ y4 = y1 + ystep*3
+ y5 = y1 + ystep*4
+ y6 = y1 + ystep*5
+ y7 = y1 + ystep*6
+
+
+ 
+ x_button = [ 
+    x1,
+    x2,
+    x3,
+    x4,
+
+    x1,
+    x2,
+    x3,
+    x4,
+
+    x1,
+    x2,
+    x3,
+    x4,
+
+    x1,
+    x2,
+    x3,
+    x4,
+
+    x1,
+    x2,
+    x3,
+    x4,
+
+    x1,
+    x2,
+    x3,
+    x4,
+
+    x1,
+    x2,
+    x3,
+    x4
+
+    ]
+ y_button = [
+    y1,
+    y1,
+    y1,
+    y1,
+
+    y2,
+    y2,
+    y2,
+    y2,
+    
+    y3,
+    y3,
+    y3,
+    y3,
+    
+    y4,
+    y4,
+    y4,
+    y4,
+    
+    y5,
+    y5,
+    y5,
+    y5,
+    
+    y6,
+    y6,
+    y6,
+    y6,
+
+    y7,
+    y7,
+    y7,
+    y7
+    
+ ]
+ 

inter/hkg/xml/multi/v3/menu_new_layout_gen_v3.py

@@ -0,0 +1,513 @@
+  if "v3" in param:
+    
+    def GenMenuV3(hot_pd, cold_pd, blend_pd, start_date_time, end_date_time, product_var, default_topping):
+      out_xml( '\t\t\t; ==================> Len = ' + str(len(spl)) + '\n')
+      menu_img = spl[ idx_img][1]
+      out_xml( '\t\t; '+ hot_pd + ' ' + cold_pd + ' ' + blend_pd+ ' \n')
+      str_con = ""
+      str_con_var = ""
+      if hot_pd != '-':
+        str_con += hot_pd + '.Button,'
+      if cold_pd != '-':
+        str_con += cold_pd + '.Button,'
+      if blend_pd != '-':
+        str_con += blend_pd + '.Button,'
+
+      if hot_pd != '-':
+        str_con_var += hot_pd + '-'
+      if cold_pd != '-':
+        str_con_var += cold_pd + '-'
+      if blend_pd != '-':
+        str_con_var += blend_pd + '-'
+
+      str_con_var = str_con_var.replace("-", "")
+
+      if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', start_date_time):
+        str_con += f'DateTimeStart="{start_date_time}",'
+      if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', end_date_time):
+        str_con += f'DateTimeEnd="{end_date_time}",'
+
+      if re.match(r'^\w.*', product_var):
+        str_con += f'Var={product_var},'
+
+      if recommend_page:
+        str_con += "Disable=Invisible,"
+
+      str_con += "$Sum" + str_con_var
+
+      out_xml('\t\t<Menu>\n')
+      out_xml('\t\t<State> Flag( '+ str_con + ') </State>\n')
+
+      pd_code_1 = hot_pd
+      pd_stage1 = '$' + hot_pd + '.Button'
+      if hot_pd == "-" or len(hot_pd) == 0 :
+        pd_code_1 = pd_code_available
+        pd_stage1 = '"Disable2"'
+
+      pd_code_2 = cold_pd
+      pd_stage2 = '$' + cold_pd + '.Button'
+      if cold_pd == "-" or len(cold_pd) == 0:
+        pd_code_2 = pd_code_available
+        pd_stage2 = '"Disable2"'
+
+      pd_code_3 = blend_pd
+      pd_stage3 = '$' + blend_pd + '.Button'
+      if blend_pd == "-" or len(blend_pd) == 0:
+        pd_code_3 = pd_code_available
+        pd_stage3 = '"Disable2"'
+
+      out_xml( '\t\t<IdleImage> "' + new_default_dir + '/'+ menu_img +'" </IdleImage>\n')
+      out_xml( '\t\t<PressImage> "' + new_default_dir_press + '/'+ menu_img +'" </PressImage>\n')
+      out_xml( '\t\t<DisableImage> "' + new_default_dir_disable + '/'+ menu_img +'" </DisableImage>\n')
+
+      out_xml('\t\t<Name>\n')
+      out_xml('\t\t\t<LanguageGroup>\n')
+      out_xml('\t\t\t\t<LanguageSlot1>' + spl[ idx_name][ idx_lang_eng] + '</LanguageSlot1>\n')
+      out_xml('\t\t\t\t<LanguageSlot2>' + spl[ idx_name][ idx_lang_msc] + '</LanguageSlot2>\n')
+      out_xml('\t\t\t\t<LanguageSlot3>' + spl[ idx_name][ idx_lang_mtc] + '</LanguageSlot3>\n')
+      out_xml('\t\t\t\t<LanguageSlot4>' + spl[ idx_name][ idx_lang_eng] + '</LanguageSlot4>\n')
+      out_xml('\t\t\t\t<LanguageSlot5>' + spl[ idx_name][ idx_lang_msc] + '</LanguageSlot5>\n')
+      out_xml('\t\t\t\t<LanguageSlot6>' + spl[ idx_name][ idx_lang_mtc] + '</LanguageSlot6>\n')
+      out_xml('\t\t\t</LanguageGroup>\n')
+      out_xml('\t\t</Name>\n')
+      out_xml('\t\t<Description>\n')
+      out_xml('\t\t\t<LanguageGroup>\n')
+      out_xml('\t\t\t\t<LanguageSlot1>' + spl[ idx_name][ idx_lang_eng] + '</LanguageSlot1>\n')
+      out_xml('\t\t\t\t<LanguageSlot2>' + spl[ idx_name][ idx_lang_msc] + '</LanguageSlot2>\n')
+      out_xml('\t\t\t\t<LanguageSlot3>' + spl[ idx_name][ idx_lang_mtc] + '</LanguageSlot3>\n')
+      out_xml('\t\t\t\t<LanguageSlot4>' + spl[ idx_name][ idx_lang_eng] + '</LanguageSlot4>\n')
+      out_xml('\t\t\t\t<LanguageSlot5>' + spl[ idx_name][ idx_lang_msc] + '</LanguageSlot5>\n')
+      out_xml('\t\t\t\t<LanguageSlot6>' + spl[ idx_name][ idx_lang_mtc] + '</LanguageSlot6>\n')
+      out_xml('\t\t\t</LanguageGroup>\n')
+      out_xml('\t\t</Description>\n')
+
+      if "show-blend-only" in xml_parameter:
+        print("Hot price ignore ")
+      else:
+        out_xml('\t\t<HotState> ' + pd_stage1 + ' </HotState>\n')
+      
+      if "show-blend-only" in xml_parameter:
+        print("Cold price ignore ")
+      else:
+        out_xml('\t\t<IceState> ' + pd_stage2 + ' </IceState>\n')
+
+      out_xml('\t\t<BlendState> ' + pd_stage3 + ' </BlendState>\n')
+      
+      if "show-blend-only" in xml_parameter:
+        print("Hot price ignore ")
+      else:
+        out_xml('\t\t<HotPrice> eval( \n')
+
+        out_xml( '\t\tIf $' + pd_code_1 + '.Price = -1 Then\r\n')
+        out_xml( '\t\t\tVar return = "Free"\r\n')
+        out_xml( '\t\tElse\r\n')
+        out_xml( '\t\t\tVar return !assigned StringFmt(  $' + pd_code_1 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n')
+        out_xml( '\t\tEndIf\r\n')
+        out_xml('\t\t) </HotPrice>\n')
+
+
+      if "show-blend-only" in xml_parameter:
+        print("Cold price ignore ")
+      else:
+        out_xml('\t\t<IcePrice> eval( \n')
+        out_xml( '\t\tIf $' + pd_code_2 + '.Price = -1 Then\r\n')
+        out_xml( '\t\t\tVar return = "Free"\r\n')
+        out_xml( '\t\tElse\r\n')
+        out_xml( '\t\t\tVar return !assigned StringFmt(  $' + pd_code_2 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n')
+        out_xml( '\t\tEndIf\r\n')
+        out_xml('\t\t) </IcePrice>\n')
+
+
+      out_xml('\t\t<BlendPrice> eval( \n')
+      out_xml( '\t\tIf $' + pd_code_3 + '.Price = -1 Then\r\n')
+      out_xml( '\t\t\tVar return = "Free"\r\n')
+      out_xml( '\t\tElse\r\n')
+      out_xml( '\t\t\tVar return !assigned StringFmt(  $' + pd_code_3 + '.Price , DisplayFormat, PreScaleConvertShow) \r\n')
+      out_xml( '\t\tEndIf\r\n')
+      out_xml('\t\t) </BlendPrice>\n')
+
+
+      out_xml('\t\t<IceProcessingState>\n')
+      out_xml('\t\t\teval(\n')
+      out_xml('\t\t\t\tIf ICE_PROCESS_STATUS = 2 Then\n')
+      out_xml('\t\t\t\t\tIf $Sum510201003951020200395102030039 = "Disable" Then\n')
+      out_xml('\t\t\t\t\t\tVar ice_tab_process_show = "Disable"\n')
+      out_xml('\t\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\t\tVar ice_tab_process_show = "Enable"\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\tVar ice_tab_process_show = "Invisible"\n')
+      out_xml('\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\tVar return = ice_tab_process_show\n')
+      out_xml('\t\t\t)\n')
+      out_xml('\t\t</IceProcessingState>\n')
+      out_xml('\t\t<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>\n')
+      out_xml('\t\t<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>\n')
+
+      out_xml('\t\t<ConditionalDisable>\n')
+      out_xml('\t\t\t<Script>\n')
+      out_xml('\t\t\t\tIf $Sum' + str_con_var +' = "Disable" Then\n')
+      if "show-blend-only" in xml_parameter:
+        print("Ignore check hot and cold menu. ")
+      else:
+        out_xml('\t\t\t\t\tSTRCONTAIN "STG=CLOSE" $' + pd_code_1 + '.TAG tag1_is_disable\n')
+        out_xml('\t\t\t\t\tSTRCONTAIN "STG=CLOSE" $' + pd_code_2 + '.TAG tag2_is_disable\n')
+      out_xml('\t\t\t\t\tSTRCONTAIN "STG=CLOSE" $' + pd_code_3 + '.TAG tag3_is_disable\n')
+
+      out_xml('\t\t\t\t\tIf tag1_is_disable = "true" Then\n')
+      out_xml('\t\t\t\t\t\tVar $Sum' + str_con_var +'Tag = $' + pd_code_1 + '.TAG\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\t\tIf tag2_is_disable = "true" Then\n')
+      out_xml('\t\t\t\t\t\tVar $Sum' + str_con_var +'Tag = $' + pd_code_2 + '.TAG\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\t\tIf tag3_is_disable = "true" Then\n')
+      out_xml('\t\t\t\t\t\tVar $Sum' + str_con_var +'Tag = $' + pd_code_3 + '.TAG\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+
+      out_xml('\t\t\t\t\tVar $Sum' + str_con_var +'TextValue !assigned GETS($Sum' + str_con_var +'Tag,"MSG")\n')
+      out_xml('\t\t\t\t\tVar $Sum' + str_con_var +'TextID !assigned GETS($Sum' + str_con_var +'Tag,"TextID")\n')
+      out_xml('\t\t\t\t\tIf $Sum' + str_con_var +'TextID != "" Then\n')
+      out_xml('\t\t\t\t\t\tVar $Sum' + str_con_var +'TextValue = ""\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+
+      out_xml('\t\t\t\t\tIf $Sum' + str_con_var +'TextValue = "" Then\n')
+      out_xml('\t\t\t\t\t\tIf $Sum' + str_con_var +'TextID = "" Then\n')
+      out_xml('\t\t\t\t\t\t\tVar $Sum' + str_con_var +'TextID = "000013"\n')
+      out_xml('\t\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\tEndIf\n')
+      out_xml('\t\t\t</Script>\n')
+      out_xml('\t\t\t<ID> $Sum' + str_con_var +'TextID </ID>\n')
+      out_xml('\t\t\t<Value> $Sum' + str_con_var +'TextValue </Value>\n')
+      out_xml('\t\t</ConditionalDisable>\n')
+
+      out_xml('\t\t<EventOnClick>\n')
+      out_xml('\t\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\n')
+      out_xml('\t\t\tGetInstanceIDMenuTab OpenFromInstMenuTab\n')
+      out_xml('\t\t\tVar OpenFromXML = CurrentXMLFileName2\n')
+      out_xml('\t\t\tVar PriceD1 = $' + pd_code_1 + '.Price\n')
+      out_xml('\t\t\tVar PriceD2 = $' + pd_code_2 + '.Price\n')
+      out_xml('\t\t\tVar PriceD3 = $' + pd_code_3 + '.Price\n')
+      out_xml('\t\t\tVar PD_CODE1 = "' + pd_code_1 + '"\n')
+      out_xml('\t\t\tVar PD_CODE2 = "' + pd_code_2 + '"\n')
+      out_xml('\t\t\tVar PD_CODE3 = "' + pd_code_3 + '"\n')
+
+      out_xml( '\t\t\t; begin lang\n')
+      for x in range( max_can_have_lang):
+        if x < len( spl[ idx_name]):
+          out_xml( '\t\t\tVar aliasName['+ str(x) +'] = "'+ spl[ idx_name][ x + 1]+'"\n')
+          out_xml( '\t\t\tVar aliasDesc['+ str(x) +'] = "'+ spl[ idx_desc][ x + 1]+'"\r\n')
+
+
+      for x in range( max_can_have_lang):
+        out_xml( '\t\t\tVar NameLang[0]['+ str(x) +'] = "'+ get_name_lang( pd_code_1 , x)+'"\n')
+      for x in range( max_can_have_lang):
+        out_xml( '\t\t\tVar DescLang[0]['+ str(x) +'] = "'+ get_desc_lang( pd_code_1 , x)+'"\n')
+
+
+      for x in range( max_can_have_lang):
+        out_xml( '\t\t\tVar NameLang[1]['+ str(x) +'] = "'+ get_name_lang( pd_code_2 , x)+'"\n')
+      for x in range( max_can_have_lang):
+        out_xml( '\t\t\tVar DescLang[1]['+ str(x) +'] = "'+ get_desc_lang( pd_code_2 , x)+'"\n')
+
+      for x in range( max_can_have_lang):
+        out_xml( '\t\t\tVar NameLang[2]['+ str(x) +'] = "'+ get_name_lang( pd_code_3 , x)+'"\n')
+      for x in range( max_can_have_lang):
+        out_xml( '\t\t\tVar DescLang[2]['+ str(x) +'] = "'+ get_desc_lang( pd_code_3 , x)+'"\n')
+
+
+      out_xml( '\t\t\t; end lang\n')
+
+      out_xml('\t\t\tVar PD_STAGE_1 = ' + pd_stage1 + '\n')
+      out_xml('\t\t\tVar PD_STAGE_2 = ' + pd_stage2 + '\n')
+      out_xml('\t\t\tVar PD_STAGE_3 = ' + pd_stage3 + '\n')
+
+      out_xml( '\t\t\tVar SelectCountDrinkType = 0\n')
+      out_xml( '\t\t\tVar DefaultDrinkType = 0\n')
+
+      out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\n')
+      out_xml( '\t\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\n')
+      out_xml( '\t\t\t\tVar DefaultDrinkType = 1\n')
+      out_xml( '\t\t\tEndIf\n')
+
+
+      out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\n')
+      out_xml( '\t\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\n')
+      out_xml( '\t\t\t\tVar DefaultDrinkType = 2\n')
+      out_xml( '\t\t\tEndIf\n')
+
+
+      out_xml( '\t\t\tIf PD_STAGE_3 = "Enable" Then\n')
+      out_xml( '\t\t\t\tVar SelectCountDrinkType = SelectCountDrinkType + 1\n')
+      out_xml( '\t\t\t\tVar DefaultDrinkType = 3\n')
+      out_xml( '\t\t\tEndIf\n')
+
+      default_topping_int = 0
+      try:
+        default_topping_int = int(default_topping)
+      except:
+        print("default_topping ignore")
+
+      if default_topping_int == 3:
+        out_xml( '\t\t; default topping 3\r\n')
+        out_xml( '\t\tIf PD_STAGE_3 = "Enable" Then\r\n')
+        out_xml( '\t\t\t\tTopping "Load" "'+ blend_pd.replace("-alter", "") +'"\n')
+        out_xml( '\t\tElse\r\n')
+        out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
+        out_xml( '\t\t\t\tTopping "Load" "'+ cold_pd.replace("-alter", "") +'"\n')
+        out_xml( '\t\t\tElse\r\n')
+        out_xml( '\t\t\t\tTopping "Load" "'+ hot_pd.replace("-alter", "") +'"\n')
+        out_xml( '\t\t\tEndIf\r\n')
+        out_xml( '\t\tEndIf\r\n')
+      else:
+        out_xml( '\t\t\tIf PD_STAGE_2 = "Enable" Then\n')
+        out_xml( '\t\t\t\tTopping "Load" "'+ cold_pd.replace("-alter", "") +'"\n')
+        out_xml( '\t\t\tElse\n')
+        out_xml( '\t\t\t\tIf PD_STAGE_1 = "Enable" Then\n')
+        out_xml( '\t\t\t\tTopping "Load" "'+ hot_pd.replace("-alter", "") +'"\n')
+        out_xml( '\t\t\t\tElse\n')
+        out_xml( '\t\t\t\tTopping "Load" "'+ blend_pd.replace("-alter", "") +'"\n')
+        out_xml( '\t\t\t\tEndIf\n')
+        out_xml( '\t\t\tEndIf\n')
+
+
+
+
+      out_xml('\t\t\t;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_hide.lxml"\n')
+      current_file_name_str = current_file_name.replace(".skt", ".lxml")
+      out_xml( '\t\t\tVar OpenFromXML = "ROOT/taobin_project/inter/hkg/xml/'+ current_file_name_str + '"\n')
+      #
+
+      out_xml( '\t\t\t\n')
+      out_xml( '\t\t\t\n')
+      out_xml( '\t\t\tTabMenuVisibleInst 99\n')
+
+      out_xml( '\t\t\tDEBUGVAR RedirectToNormalVersion\n')
+      out_xml( '\t\t\tDEBUGVAR ToppingNewUINewSystem\n')
+
+      out_xml( '\t\t\tIf RedirectToNormalVersion = 1 Then\n')
+      out_xml( '\t\t\t\tVar menu_name_eng_hot = NameLang[0][0]\n')
+      out_xml( '\t\t\t\tVar menu_desc_eng_hot = DescLang[0][0]\n')
+      out_xml( '\t\t\t\tVar menu_name_eng_cold = NameLang[1][0]\n')
+      out_xml( '\t\t\t\tVar menu_desc_eng_cold = DescLang[1][0]\n')
+      out_xml( '\t\t\t\tVar menu_name_eng_blender = NameLang[2][0]\n')
+      out_xml( '\t\t\t\tVar menu_desc_eng_blender = DescLang[2][0]\n')
+      out_xml( '\t\t\t\t\n')
+      out_xml( '\t\t\t\t\n')
+      out_xml( '\t\t\t\t\n')
+      out_xml( '\t\t\t\tVar menu_name_thai_hot = NameLang[0][1]\n')
+      out_xml( '\t\t\t\tVar menu_desc_thai_hot = DescLang[0][1]\n')
+      out_xml( '\t\t\t\tVar menu_name_thai_cold = NameLang[1][1]\n')
+      out_xml( '\t\t\t\tVar menu_desc_thai_cold = DescLang[1][1]\n')
+      out_xml( '\t\t\t\tVar menu_name_thai_blender = NameLang[2][1]\n')
+      out_xml( '\t\t\t\tVar menu_desc_thai_blender = DescLang[2][1]\n')
+      out_xml( '\t\t\t\tDEBUGVAR menu_name_thai_cold\n')
+      out_xml( '\t\t\t\tDEBUGVAR menu_desc_thai_cold\n')
+
+      out_xml( '\t\t\t\t\tVar NameDrink = aliasName[0]\n')
+      out_xml( '\t\t\t\t\tVar DrinkDescription =  aliasDesc[0]\n')
+      out_xml( '\t\t\t\t\tVar NameDrinkTH = aliasName[1]\n')
+      out_xml( '\t\t\t\t\tVar DrinkDescriptionTH = aliasDesc[1]\n')
+
+      out_xml( '\t\t\tIf LanguageShow = "THAI" Then\n')
+      out_xml( '\t\t\t\tVar show_eng =  "false"\n')
+      out_xml( '\t\t\tElse\n')
+      out_xml( '\t\t\t\tVar show_eng =  "true"\n')
+      out_xml( '\t\t\tEndIf\n')
+
+      if len( topping_xml_file) > 0 :
+        print("topping_xml_file=" + topping_xml_file)
+      
+      print("current_file_name=" + current_file_name)
+      
+      if len( xml_parameter) > 0 :
+        print("xml_parameter=" + xml_parameter)
+
+      if len( topping_xml_file) == 0 :
+        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select7.xml"\n')
+      else:
+        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/'+ topping_xml_file +'"\n')
+      
+      out_xml( '\t\t\tElse\n')
+      
+      if len( topping_xml_file) == 0 :
+        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/page_topping_select6.lxml"\n')
+      else:
+        out_xml( '\t\t\t\tOpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/'+ topping_xml_file +'"\n')
+      
+      
+      out_xml( '\t\t\tEndIf\n')
+      out_xml( '\t\t\t\n')
+      out_xml( '\t\t\t\n')
+      out_xml( '\t\t\t\n')
+
+      out_xml('\t\t</EventOnClick>\n')
+      out_xml('\t\t</Menu>\n\n')
+
+    def GenBanner(type, thai_media, eng_media, event_on_click_script, start_date_time, end_date_time, state_var):
+      str_con = []
+      if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', start_date_time.strip()):
+        str_con.append(f'DateTimeStart="{start_date_time.strip()}"')
+      if re.match(r'(\d{4})/(\d{2})/(\d{2})T(\d{2}):(\d{2}):(\d{2})', end_date_time.strip()):
+        str_con.append(f'DateTimeEnd="{end_date_time.strip()}"')
+
+      if re.match(r'^\w.*', state_var.strip()):
+        str_con.append(f'Var={state_var.strip()},')
+
+      out_xml('\t\t<Banner>\n')
+      out_xml('\t\t\t<State> Flag( '+ ",".join(str_con) + ' ) </State>\n')
+      out_xml('\t\t\t<Type> ' + type + ' </Type>\n')
+      out_xml('\t\t\t<Media>\n')
+      out_xml('\t\t\t\teval(\n')
+      out_xml('\t\t\t\t\tIf show_eng = "true" Then\n')
+      out_xml('\t\t\t\t\t\tVar return = ' + eng_media + '\n')
+      out_xml('\t\t\t\t\tElse\n')
+      out_xml('\t\t\t\t\t\tVar return = ' + thai_media + '\n')
+      out_xml('\t\t\t\t\tEndIf\n')
+      out_xml('\t\t\t\t)\n')
+      out_xml('\t\t\t</Media>\n')
+      out_xml('\t\t\t<EventOnClick>\n')
+      out_xml('\t\t\t\t' + event_on_click_script.replace('\\n', '\n').replace('\\t', '\t') + '\n')
+      out_xml('\t\t\t</EventOnClick>\n')
+      out_xml('\t\t</Banner>\n')
+
+    # idx_lang_myanmar = 6
+    # idx_lang_malay = 5
+    # idx_lang_japan = 4
+    # idx_lang_china = 3
+    # idx_lang_thai = 2
+    # idx_lang_eng = 1
+
+    idx_lang_mtc = 4
+    idx_lang_msc = 3
+    idx_lang_eng = 1
+
+    idx_name = 0
+    idx_desc = 1
+    idx_img = 2
+
+
+    idx_hot_product_code = 7
+    idx_cold_product_code = idx_hot_product_code + 1
+    idx_blend_product_code = idx_cold_product_code + 1
+
+    idx_date_time_start = 11
+    idx_date_time_end = idx_date_time_start + 1
+    idx_product_var = idx_date_time_end + 1
+    idx_of_default_toppimg = idx_product_var + 1
+
+    #
+    idx_hot_product_code2 = idx_blend_product_code + 1
+    idx_cold_product_code2 = idx_hot_product_code2 + 1
+    idx_blend_product_code2 = idx_cold_product_code2 + 1
+    idx_of_eng = 2
+    idx_of_eng_des = 3
+    idx_of_thai = 0
+    idx_of_thai_des = 1
+    print ("--------------------------------------------------------------------------------------------------------------------------")
+
+
+    if current_file_name == "page_catalog_group_recommend.skt":
+      recommend_page = True
+      button_add_string = "Var OpenFromInstMenuTab = 0"
+    else:
+      recommend_page = False
+      button_add_string = ""
+
+    out_xml('<ScrollableCatalog>\n')
+    out_xml('\t<X> 0 </X>\n')
+    out_xml('\t<Y> 497 </Y>\n')
+    out_xml('\t<Width> 1080 </Width>\n')
+    out_xml('\t<Height> 1423 </Height>\n')
+    out_xml('\t<Configuration>\n')
+    out_xml('\t\t<MenuNameTextConfiguration>\n')
+    out_xml('\t\t\t<Font> KanitMediumTTF </Font>\n')
+    out_xml('\t\t\t<Color> 0x322B26 </Color>\n')
+    out_xml('\t\t\t<ColorDisable> 0xEAE6E1 </ColorDisable>\n')
+    out_xml('\t\t\t<AutoResizeConfiguration>\n')
+    out_xml('\t\t\t\t<Min> 16 </Min>\n')
+    out_xml('\t\t\t\t<Max> 22 </Max>\n')
+    out_xml('\t\t\t\t<AdjustStep> 1 </AdjustStep>\n')
+    out_xml('\t\t\t</AutoResizeConfiguration>\n')
+    out_xml('\t\t</MenuNameTextConfiguration>\n')
+    out_xml('\t\t<MenuDescriptionTextConfiguration>\n')
+    out_xml('\t\t\t<Font> KanitMediumTTF </Font>\n')
+    out_xml('\t\t\t<Color> 0x322B26 </Color>\n')
+    out_xml('\t\t\t<ColorDisable> 0xEAE6E1 </ColorDisable>\n')
+    out_xml('\t\t\t<AutoResizeConfiguration>\n')
+    out_xml('\t\t\t\t<Min> 10 </Min>\n')
+    out_xml('\t\t\t\t<Max> 14 </Max>\n')
+    out_xml('\t\t\t\t<AdjustStep> 1 </AdjustStep>\n')
+    out_xml('\t\t\t</AutoResizeConfiguration>\n')
+    out_xml('\t\t</MenuDescriptionTextConfiguration>\n')
+    out_xml('\t\t<MenuPriceTextConfiguration>\n')
+    out_xml('\t\t\t<Font> KanitRegularTTF </Font>\n')
+    out_xml('\t\t\t<Color> 0x6F5F51 </Color>\n')
+    out_xml('\t\t\t<ColorDisable> 0xEAE6E1 </ColorDisable>\n')
+    out_xml('\t\t\t<AutoResizeConfiguration>\n')
+    out_xml('\t\t\t\t<Min> 4 </Min>\n')
+    out_xml('\t\t\t\t<Max> 20 </Max>\n')
+    out_xml('\t\t\t\t<AdjustStep> 1 </AdjustStep>\n')
+    out_xml('\t\t\t</AutoResizeConfiguration>\n')
+    out_xml('\t\t</MenuPriceTextConfiguration>\n')
+    out_xml('\t\t<MenuHotPriceLabel> 000081 </MenuHotPriceLabel>\n')
+    out_xml('\t\t<MenuIcePriceLabel> 000082 </MenuIcePriceLabel>\n')
+    out_xml('\t\t<MenuBlendPriceLabel> 000083 </MenuBlendPriceLabel>\n')
+    out_xml('\t\t<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>\n')
+    out_xml('\t</Configuration>\n')
+    out_xml('\t<Menus>\n')
+    out_xml(';banners\n')
+
+    count_test = 0
+    count = 0
+    pd_code_available = '##-##-##-####'
+#   
+    print('menu_new_list=' + str(menu_new_list))
+    
+    for spl in  menu_new_list:
+      #product_code = s
+
+      if len(spl) == 1:
+        if spl[0].startswith("IGNORE"):
+          continue
+
+        if spl[0].startswith("TAG"):
+          out_xml( '\t;' + spl[0] + '\r\n')
+          continue
+
+      if spl[idx_desc][idx_lang_eng].startswith("BANNER"):
+        date_time_start = spl[idx_name][idx_date_time_start]
+        date_time_end = spl[idx_name][idx_date_time_end]
+        state_var = spl[idx_name][idx_product_var]
+
+        type = spl[idx_desc][idx_lang_thai]
+        eng_media = spl[idx_img][idx_lang_eng]
+        thai_media = spl[idx_img][idx_lang_thai]
+        on_click_script = spl[idx_name][idx_lang_thai]
+
+        GenBanner(type, thai_media, eng_media, on_click_script, date_time_start, date_time_end, state_var)
+      else:
+        [hot_pd_v1, hot_pd_v2] = spl[ idx_name][ idx_hot_product_code].split(',')
+        [cold_pd_v1, cold_pd_v2] = spl[ idx_name][ idx_cold_product_code].split(',')
+        [blend_pd_v1, blend_pd_v2] = spl[ idx_name][ idx_blend_product_code].split(',')
+
+        date_time_start = spl[idx_name][idx_date_time_start]
+        date_time_end = spl[idx_name][idx_date_time_end]
+        product_var = spl[idx_name][idx_product_var]
+        try:
+          default_topping = spl[idx_name][idx_of_default_toppimg]
+        except:
+          default_topping = "0"
+        print(f"spl[{idx_name}] =", spl[idx_name])
+        print(f"Expected indices: date_time_start:{date_time_start}, date_time_end:{date_time_end}, product_var:{product_var}  , default_topping={default_topping}")
+
+        for [hot_pd, cold_pd, blend_pd] in [[hot_pd_v1, cold_pd_v1, blend_pd_v1], [hot_pd_v2, cold_pd_v2, blend_pd_v2]]:
+          if hot_pd == '-' and cold_pd == '-' and blend_pd == '-':
+            continue
+          else:
+            print(f"Gen ==> hot={hot_pd}, cold={cold_pd}, blend={blend_pd}")
+            GenMenuV3(hot_pd, cold_pd, blend_pd, date_time_start, date_time_end, product_var, default_topping)
+    out_xml('\t\t</Menus>\n\n')
+    out_xml('</ScrollableCatalog>\n')
+
+

inter/hkg/xml/multi/v3/page_catalog_group_appfast.skt

@@ -0,0 +1,57 @@
+<?hurr 
+    #include=menu_head.py 
+    echo param
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"    
+
+        If AppFastEnable = "true" Then
+            Var Menu11Selected = "PressForever" 
+            Var Menu7Selected = "Invisible"
+        Else
+            Var Menu11Selected = "Invisible" 
+            Var Menu7Selected = "PressForever"
+        EndIf
+
+
+    
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/ForProGroup.inc"
+    
+    
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_cocktail.skt

@@ -0,0 +1,42 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"  
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/ForProGroup.inc"
+    
+    
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_coffee.skt

@@ -0,0 +1,129 @@
+<?hurr
+    #include=menu_head.py
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+
+    SetInstanceIgnoreTouch
+
+	If SlientRefreshIndex = 2 Then
+		Var SlientRefreshIndex = 3
+
+	EndIf
+
+
+</EventOpen>
+
+
+
+<EventOnShow>
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"
+    Var Menu2Selected = "PressForever"
+
+    SAVELOG "Onshow 2"
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    Var Timeout = 0
+
+    SAVELOG "Onshow 3"
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+
+    SetInstanceIgnoreTouch
+
+    Var inst_show_coffee_counter = 4
+	DEBUGVAR SlientRefreshIndex
+    
+    RefreshAll
+    
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/InstanceGetSetString.inc"
+
+
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+    
+
+    GetVisible inst_show_coffee
+    
+
+    If inst_show_coffee = 1 Then
+        If inst_show_coffee_counter > 0 Then
+            DEBUGVAR inst_show_coffee_counter
+            
+            Var inst_show_coffee_counter = inst_show_coffee_counter - 1
+
+            If inst_show_coffee_counter = 0 Then
+                RefreshAll
+                Var inst_show_coffee_counter = 4
+            EndIf
+        EndIf
+    EndIf
+    
+
+
+
+    ; setvarint RefreshCoffeeMenu 1
+    If RefreshCoffeeMenu = 1 Then
+        Var RefreshCoffeeMenu = 0
+        SAVELOG "OPEN FROM 3"
+        Open "ROOT/taobin_project/inter/hkg/xml/multi/v3/page_catalog_group_coffee.lxml"
+    EndIf 
+
+    ; setvarint ScriptCoffeeMenu 1
+    If ScriptCoffeeMenu = 1 Then
+        Var ScriptCoffeeMenu = 0
+        SAVELOG "Runscript 3"
+        Script "-" "-"
+    EndIf
+
+    If CoffeeRefreshTimeOut > 15 Then
+        Var CoffeeRefreshTimeOut = 0
+        Script "-" "-"
+    EndIf
+
+    Var CoffeeRefreshTimeOut = CoffeeRefreshTimeOut + 1
+
+
+    TimerReset
+</EventTimeout>
+
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+<Text>
+<X> 1 </X>
+<Y> 1 </Y>
+<Font> KanitTTF </Font>
+<Size> 22 </Size>
+<Width> 1080 </Width>
+<Align> end </Align>
+<Color> 0xFF0000 </Color>
+<Value> "CF1"</Value>
+</Text>
+
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_forkid.skt

@@ -0,0 +1,97 @@
+<?hurr
+    #include=menu_head.py
+    touch_less_gen = False
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+
+    SetInstanceIgnoreTouch
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 5 Then
+		Var SlientRefreshIndex = 6
+	EndIf
+
+</EventOpen>
+
+<EventOnShow>
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"
+           ; protein
+    If AppFastEnable = "true" Then
+        Var Menu11Selected = "PressForever"
+        Var Menu7Selected = "Invisible"
+        Var Menu21Selected = "Invisible"
+    Else
+        Var Menu11Selected = "Invisible"
+        Var Menu7Selected = "Invisible"
+        Var Menu21Selected = "PressForever"
+    EndIf
+
+    
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+
+    Var inst_show_for_kid_counter = 4
+    RefreshAll
+	DEBUGVAR SlientRefreshIndex
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/InstanceGetSetString.inc"
+
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+   
+
+    GetVisible inst_show_for_kid
+    
+
+    If inst_show_for_kid = 1 Then
+        If inst_show_for_kid_counter > 0 Then
+            DEBUGVAR inst_show_for_kid_counter
+            
+            Var inst_show_for_kid_counter = inst_show_for_kid_counter - 1
+
+            If inst_show_for_kid_counter = 0 Then
+                RefreshAll
+                Var inst_show_for_kid_counter = 4
+            EndIf
+        EndIf
+    EndIf
+    
+
+
+    TimerReset
+</EventTimeout>
+
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_health.skt

@@ -0,0 +1,104 @@
+<?hurr 
+    #include=menu_head.py 
+    touch_less_gen = False
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 6 Then
+		Var SlientRefreshIndex = 7
+	EndIf
+
+    Var HealthRefreshTimeOut = 0
+</EventOpen>
+
+<EventOnShow>
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"    
+    
+    Var Menu22Selected = "PressForever"
+
+
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+
+    RefreshAll
+	DEBUGVAR SlientRefreshIndex
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+    
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/InstanceGetSetString.inc"
+
+
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+
+
+    GetVisible inst_show_health
+    
+
+    If inst_show_health = 1 Then
+        If inst_show_health_counter > 0 Then
+            DEBUGVAR inst_show_health_counter
+            
+            Var inst_show_health_counter = inst_show_health_counter - 1
+
+            If inst_show_health_counter = 0 Then
+                RefreshAll
+                Var inst_show_health_counter = 7
+            EndIf
+        EndIf
+    EndIf
+    
+
+
+     If HealthRefreshTimeOut > 15 Then
+        Var HealthRefreshTimeOut = 0
+        Script "-" "-"
+    EndIf
+
+    Var HealthRefreshTimeOut = HealthRefreshTimeOut + 1
+    		
+	If RefreshHealtMenu = 1 Then
+        Var RefreshHealtMenu = 0
+        SAVELOG "OPEN FROM 6"
+
+
+        Open "ROOT/taobin_project/inter/hkg/xml/multi/v3/page_catalog_group_health.lxml"
+        
+    EndIf 
+	; setvarint RefreshHealtMenu 1
+	    
+        
+    TimerReset
+</EventTimeout>
+
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_milk.skt

@@ -0,0 +1,90 @@
+<?hurr
+    #include=menu_head.py
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 4 Then
+		Var SlientRefreshIndex = 5
+	EndIf
+</EventOpen>
+
+<EventOnShow>
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"
+    Var Menu4Selected = "PressForever"
+
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+
+    Var inst_show_milk_cupe_counter = 7
+    RefreshAll
+	DEBUGVAR SlientRefreshIndex
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+     ;include="ROOT/taobin_project/inter/hkg/xml/multi/InstanceGetSetString.inc"
+
+    ;DEBUGVAR ICE_PROCESS_STATUS
+
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+
+
+    GetVisible inst_show_milk_cupe
+
+
+    If inst_show_milk_cupe = 1 Then
+        If inst_show_milk_cupe_counter > 0 Then
+            DEBUGVAR inst_show_milk_cupe_counter
+
+            Var inst_show_milk_cupe_counter = inst_show_milk_cupe_counter - 1
+
+            If inst_show_milk_cupe_counter = 0 Then
+                RefreshAll
+                Var inst_show_milk_cupe_counter = 7
+            EndIf
+        EndIf
+    EndIf
+
+    TimerReset
+</EventTimeout>
+
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v3.py
+?>
+
+<?hurr
+    #include=./event/dummy_layout_promotion.py
+?>
+
+<EventUnitTest4>
+    RefreshAll
+</EventUnitTest4>
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_oreo.skt

@@ -0,0 +1,42 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"  
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/ForProGroup.inc"
+    
+    
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_other.skt

@@ -0,0 +1,95 @@
+<?hurr 
+    #include=menu_head.py 
+    echo param
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 7 Then
+		Var SlientRefreshIndex = 8
+	EndIf
+
+    Var OtherOtherRefreshTimeOut = 1
+	Var inst_show_other_other_counter = 10
+</EventOpen>
+
+<EventOnShow>
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"    
+     ; soda and other
+    Var Menu62Selected = "PressForever"
+
+
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+
+    Var OtherOtherRefreshTimeOut = 14
+
+	DEBUGVAR SlientRefreshIndex
+    
+	
+	RefreshAll
+
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+
+
+    
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/InstanceGetSetString.inc"
+
+    ; setvarint RefreshOtherOther 1
+    If RefreshOtherOther = 1 Then
+        Var RefreshOtherOther = 0
+        SAVELOG "OPEN FROM 8"
+        Open "ROOT/taobin_project/inter/hkg/xml/multi/v3/page_catalog_group_other.lxml"
+    EndIf 
+
+    GetVisible inst_show_other_other
+    
+	;DEBUGVAR inst_show_other_other
+
+    Var OtherOtherRefreshTimeOut = OtherOtherRefreshTimeOut + 1
+	;DEBUGVAR OtherOtherRefreshTimeOut
+
+    If OtherOtherRefreshTimeOut > 15 Then
+	
+	
+        Var OtherOtherRefreshTimeOut = 0
+        Script "-" "-"
+		If inst_show_other_other = 1 Then
+		 	;RefreshAll
+		EndIf
+    EndIf
+
+
+    TimerReset
+</EventTimeout>
+
+
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_recommend.skt

@@ -0,0 +1,74 @@
+<?hurr
+    #include=menu_head.py
+?>
+; this file for generate from page_catalog_group_recommend.skt
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+
+</EventOpen>
+
+<EventOnShow>
+    Var RecommendTimeOut = 0
+
+    ; On open
+	;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"
+    Var Menu1Selected = "PressForever"
+
+
+    SAVELOG PreviseXMLFileName2
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+
+    RefreshAll
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/InstanceGetSetString.inc"
+
+
+    GetVisible inst_show_exclude_group
+
+    If inst_show_exclude_group_counter = "" Then
+        Var inst_show_exclude_group_counter = 45
+    EndIf
+
+
+    If inst_show_exclude_group = 1 Then
+        If inst_show_exclude_group_counter > 0 Then
+
+            Var inst_show_exclude_group_counter = inst_show_exclude_group_counter - 1
+
+            If inst_show_exclude_group_counter = 0 Then
+                RefreshAll
+                Var inst_show_exclude_group_counter = 45
+            EndIf
+        EndIf
+    EndIf
+
+    Var RecommendTimeOut = RecommendTimeOut + 1
+
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_recommend_multi_pro.skt

@@ -0,0 +1,42 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"  
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/ForProGroup.inc"
+    
+    
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_tea.skt

@@ -0,0 +1,140 @@
+<?hurr 
+    #include=menu_head.py 
+    touch_less_gen = False
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	
+    SetInstanceIgnoreTouch
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 3 Then
+		Var SlientRefreshIndex = 4
+
+	EndIf
+
+    
+</EventOpen>
+
+
+<EventOnShow>
+    ; On open
+	;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"   
+    Var Menu3Selected = "PressForever"
+
+    
+    SAVELOG PreviseXMLFileName2
+     ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    Var Timeout = 0
+
+
+    Var inst_show_tea_counter = 4
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+
+    RefreshAll
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+    
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/InstanceGetSetString.inc"
+
+   
+
+    
+    GetVisible inst_show_tea
+    
+
+    If inst_show_tea = 1 Then
+        If inst_show_tea_counter > 0 Then
+            DEBUGVAR inst_show_tea_counter
+            
+            Var inst_show_tea_counter = inst_show_tea_counter - 1
+
+            If inst_show_tea_counter = 0 Then
+                RefreshAll
+                Var inst_show_tea_counter = 4
+            EndIf
+        EndIf
+    EndIf
+    
+
+   
+
+    TimerReset
+</EventTimeout>
+
+<EventOnShow>
+    InstanceGetString SaveStringInst
+    DEBUGVAR SaveStringInst
+    DEBUGVAR show_eng
+
+    If SaveStringInst = "RefreshNow" Then
+        GetXMLFileNameCurrentRunning CurrentOpenFile
+        Open CurrentOpenFile
+    EndIf
+	DEBUGVAR LanguageShow
+
+
+    If SaveStringInst = "ShowMTC" Then
+        If LanguageShow = "MTC" Then
+
+        Else
+            Var show_eng = "true"
+            InstanceSetString "ShowMSC"
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+        EndIf
+    EndIf
+
+    If SaveStringInst = "ShowMSC" Then
+        If LanguageShow = "MSC" Then
+
+        Else
+            Var show_eng = "false"
+            InstanceSetString "ShowEng"
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+        EndIf
+    EndIf
+
+    If SaveStringInst = "ShowEng" Then
+        If LanguageShow = "ENG" Then
+
+        Else
+            Var show_eng = "false"
+            InstanceSetString "ShowMTC"
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+        EndIf
+    EndIf
+
+	
+    RefreshAll
+
+</EventOnShow>
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+</Popup>

inter/hkg/xml/multi/v3/page_catalog_group_whey.skt

@@ -0,0 +1,86 @@
+<?hurr 
+    #include=menu_head.py 
+    touch_less_gen = False
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+
+	DEBUGVAR SlientRefreshIndex
+
+	If SlientRefreshIndex = 5 Then
+		Var SlientRefreshIndex = 6
+	EndIf
+
+    Var inst_show_whey_counter = 5
+</EventOpen>
+
+<EventOnShow>
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_default_init.lxml"    
+    If AppFastEnable = "true" Then
+        Var Menu11Selected = "PressForever" 
+        Var Menu7Selected = "Invisible"
+    Else
+        Var Menu11Selected = "Invisible" 
+        Var Menu7Selected = "PressForever"
+    EndIf
+
+
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
+
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
+
+	DEBUGVAR SlientRefreshIndex
+</EventOnShow>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+    ;include="ROOT/taobin_project/inter/hkg/xml/multi/InstanceGetSetString.inc"
+
+    
+    GetVisible inst_show_whey
+    
+
+    If inst_show_whey = 1 Then
+        If inst_show_whey_counter > 0 Then
+            DEBUGVAR inst_show_whey_counter
+            
+            Var inst_show_whey_counter = inst_show_whey_counter - 1
+
+            If inst_show_whey_counter = 0 Then
+                RefreshAll
+                Var inst_show_whey_counter = 4
+            EndIf
+        EndIf
+    EndIf
+    
+    TimerReset
+</EventTimeout>
+
+<EventOnShow>
+	
+    
+
+</EventOnShow>
+
+;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+</Popup>

inter/mys/image/event/image_template3

@@ -1,6 +1,6 @@
-normal_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
-normal_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
-press_eng=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
-press_thai=ROOT/taobin_project/image/event/bn_MerdekaPromotionPepsi1.png
-disable_eng=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
-disable_thai=ROOT/taobin_project/image/event/bd_MerdekaPromotionPepsi1.png
+normal_eng=ROOT/taobin_project/inter/mys/image/event/pro_myst_cup/pro_myst_cup.png
+normal_thai=ROOT/taobin_project/inter/mys/image/event/pro_myst_cup/pro_myst_cup.png
+press_eng=ROOT/taobin_project/inter/mys/image/event/pro_myst_cup/pro_myst_cup.png
+press_thai=ROOT/taobin_project/inter/mys/image/event/pro_myst_cup/pro_myst_cup.png
+disable_eng=ROOT/taobin_project/inter/mys/image/event/pro_myst_cup/pro_myst_cup.png
+disable_thai=ROOT/taobin_project/inter/mys/image/event/pro_myst_cup/pro_myst_cup.png