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

This commit is contained in:
Ittipat Lusuk 2025-03-21 09:05:15 +07:00
commit 5f26b723dc
289 changed files with 80292 additions and 34111 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
@ -663,6 +667,11 @@
READ_FILE "/mnt/sdcard/enable_load_lang_fast" ENABLE_LOAD_LANG_V2
STRCONTAIN "1" ENABLE_LOAD_LANG_V2 UseLoadLangV2
; very-big-btn-init
Var UseVeryBigRemoveCupButton = "false"
Var EnablePepsiFullscreen = 0
;inter-page-board
If CountryName = "Malaysia" Then
@ -738,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
@ -978,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
@ -1061,7 +1091,7 @@
EnableLanguage "ENG"
EnableLanguage "MSC"
EnableLanguage "MTC"
Var LanguageShow = "ENG"
Var LanguageShow = "ENG"
SetLanguage "ENG"
LanguageControl "UpdateList" "-"
@ -1345,7 +1375,7 @@
RootLayoutVisible 3 "hide"
If SELLSTATUS = "DEACTIVE" Then
Open "/ROOT/xml/offline.xml"
OpenInst 0 "/ROOT/xml/offline.xml"
EndIf
Var CheckCupStateDoorCupClose = ""
@ -1359,8 +1389,6 @@
Var btnRemoveCupY = 630
Var btnRemoveCupYNotPageBoard = 500
Var UseVeryBigRemoveCupButton = "false"
If UseVeryBigRemoveCupButton = "true" Then
Var btnRemoveCupX = 580
Var btnRemoveCupY = 530
@ -1514,12 +1542,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"
@ -1529,6 +1566,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>
@ -1758,14 +1807,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
@ -1845,7 +1894,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
@ -1899,6 +1948,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
@ -1917,6 +1972,11 @@ PRICE "Reset" "-"
If UsePepsiTheme = 1 Then
Var ShowButtonClickFull = "Enable"
If EnablePepsiFullScreen = "true" Then
Var ShowButtonClickFull = "Invisible"
Var ShowButtonClickFull_WTC = "Enable"
EndIf
EndIf
@ -1932,15 +1992,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
@ -1991,7 +2054,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