MYS: add support for cold menu slots (change to paper cup -22-), SGP: move cashless reset & add delay to cashless cancel btn & WIP full screen video

This commit is contained in:
Pakin 2025-03-20 10:59:15 +07:00
parent b141606ecf
commit ddcb4273c5
26 changed files with 10029 additions and 6780 deletions

View file

@ -129,6 +129,9 @@
Var ShowButtonClickFull = "Invisible"
Var ShowButtonClick2 = "Invisible"
Var ShowButtonClick_WTC = "Invisible"
Var ShowButtonClickFull_WTC = "Invisible"
;SAVELOG DisplayType
If DisplayType = "2" Then
@ -210,9 +213,9 @@
STRCONTAIN "1037" MaterialAvailable 7UpSyrupEnable
STRCONTAIN "1038" MaterialAvailable PepsiHighYSyrupEnable
STRCONTAIN "1052" MaterialAvailable CollagenPowderEnable
STRCONTAIN "1062" MaterialAvailable MatchaPowderEnable
STRCONTAIN "1065" MaterialAvailable HaveIngredientOvaltine
;Var AppFastEnable = "false"
@ -284,7 +287,7 @@
If TermTemOnline = "false" Then
; TODO
Machine Initial
Open "/ROOT/xml/outservice.xml"
OpenInst 0 "/ROOT/xml/outservice.xml"
EndIf
EndIf
@ -547,7 +550,7 @@
EndIf
If ConnectWithPOSMachine = 1 Then
Open "ROOT/taobin_project/xml/page_network_down_pos_machine.xml"
OpenInst 0 "ROOT/taobin_project/xml/page_network_down_pos_machine.xml"
EndIf
EndIf
@ -652,6 +655,7 @@
DEBUGVAR EventTurnOn
Var UsePepsiTheme = 0
Var PepsiFullScreenPageBoard = "ROOT/taobin_project/inter/whatthecup/common/xml/feature.page_board_fullscreen/page_board_wtc.lxml"
Var NoTrickPriceProfile = 0
Var NeedRefreshProfile = 0
@ -666,6 +670,8 @@
; very-big-btn-init
Var UseVeryBigRemoveCupButton = "false"
Var EnablePepsiFullscreen = 0
;inter-page-board
If CountryName = "Malaysia" Then
@ -741,6 +747,25 @@
STRCONTAIN "1215" MaterialAvailable SugarZeroCalEnable
STRCONTAIN "9502" MaterialAvailable CupPlastic9502Enable
STRCONTAIN "9512" MaterialAvailable CupPaper9512Enable
DEBUGVAR MaterialAvailable
DEBUGVAR CupPlastic9502Enable
DEBUGVAR CupPaper9512Enable
If CupPlastic9502Enable = "true" Then
SET-MENU-SHOW 1
Else
If CupPaper9512Enable = "true" Then
SET-MENU-SHOW 2
EndIf
Endif
DEBUGVAR XSlot
Var MinPhoneNumber = 10
Var MaxPhoneNumber = 11
@ -981,7 +1006,9 @@
; Var = "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
;OpenInst 2 PepsiFullScreenPageBoard
;Var EnablePepsiFullscreen = 1
EndIf
@ -1064,7 +1091,7 @@
EnableLanguage "ENG"
EnableLanguage "MSC"
EnableLanguage "MTC"
Var LanguageShow = "ENG"
Var LanguageShow = "ENG"
SetLanguage "ENG"
LanguageControl "UpdateList" "-"
@ -1345,7 +1372,7 @@
RootLayoutVisible 3 "hide"
If SELLSTATUS = "DEACTIVE" Then
Open "/ROOT/xml/offline.xml"
OpenInst 0 "/ROOT/xml/offline.xml"
EndIf
Var CheckCupStateDoorCupClose = ""
@ -1512,12 +1539,21 @@
If UsePepsiTheme = 1 Then
Var ShowButtonClickFull = "Enable"
If EnablePepsiFullscreen = 1 Then
Var ShowButtonClickFull = "Invisible"
Var ShowButtonClickFull_WTC = "Enable"
EndIf
EndIf
Else
Var ShowButtonClick = "Invisible"
Var ShowButtonClickFull = "Invisible"
Var ShowButtonClick_WTC = "Invisible"
Var ShowButtonClickFull_WTC = "Invisible"
EndIf
Var onResume = "false"
@ -1527,6 +1563,18 @@
Machine NewPaymentOpenBrewingXMLEnable
;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
If EnablePepsiFullscreen = 1 Then
DEBUGVAR EnablePepsiFullscreen
TopView "hide"
RootLayoutVisible 2 "show"
Var ShowButtonClick_WTC = "Enable"
Var ShowButtonClickFull_WTC = "Enable"
OpenInst 2 PepsiFullScreenPageBoard
EndIf
</EventOpen>
<EventActionOk>
@ -1756,14 +1804,14 @@ PRICE "Reset" "-"
If CNTDOWN_PROTECT_SCREEN_BLANK = 0 Then
SAVELOG "CNTDOWN_PROTECT_SCREEN_BLANK"
Open "ROOT/taobin_project/xml/page_board.xml"
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
EndIf
If IgnoreNetCore = "true" Then
Else
If SELLSTATUS = "DEACTIVE" Then
Open "/ROOT/xml/offline.xml"
OpenInst 0 "/ROOT/xml/offline.xml"
EndIf
If NoWaitMachineEnable = 1 Then
@ -1843,7 +1891,7 @@ PRICE "Reset" "-"
EndIf
If MachineStage = "remove-cup" Then
Open "ROOT/taobin_project/xml/page_remove_cup.xml"
OpenInst 0 "ROOT/taobin_project/xml/page_remove_cup.xml"
EndIf
@ -1897,6 +1945,12 @@ PRICE "Reset" "-"
If UsePepsiTheme = 1 Then
Var ShowButtonClickFull = "Enable"
If EnablePepsiFullScreen = "true" Then
Var ShowButtonClickFull = "Invisible"
Var ShowButtonClickFull_WTC = "Enable"
EndIf
EndIf
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
@ -1915,6 +1969,11 @@ PRICE "Reset" "-"
If UsePepsiTheme = 1 Then
Var ShowButtonClickFull = "Enable"
If EnablePepsiFullScreen = "true" Then
Var ShowButtonClickFull = "Invisible"
Var ShowButtonClickFull_WTC = "Enable"
EndIf
EndIf
@ -1930,15 +1989,18 @@ PRICE "Reset" "-"
DEBUGVAR CountDownPauseVideo2
If CountDownPauseVideo = 2 Then
TapScreen 30 638
If EnablePepsiFullscreen = 0 Then
TapScreen 30 638
EndIf
EndIf
If CountDownPauseVideo = 1 Then
TapScreen 860 1004
If EnablePepsiFullscreen = 0 Then
TapScreen 860 1004
EndIf
EndIf
@ -1989,7 +2051,7 @@ PRICE "Reset" "-"
Machine DoorClose
TopView "show"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
EndIf
EndIf