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

This commit is contained in:
Ittipat Lusuk 2025-02-17 09:12:50 +07:00
commit ab2c6e6976
1068 changed files with 345745 additions and 284584 deletions

View file

@ -14,8 +14,9 @@
If CountryName = "Thailand" Then
If InternationalEnable = 1 Then
If EnableMultiInstance = "true" Then
Var OpenFromPageBoard = 1
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_catalog.lxml"
EndIf
Else
OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
@ -31,14 +32,7 @@
EndIf
If CountryName = "Malaysia" Then
DEBUGVAR FromFruityRaya
DEBUGVAR FromProThaiTea
DEBUGVAR FromProYuzu
Var FromFruityRaya = 0
Var FromProThaiTea = 0
Var FromProYuzu = 0
Var FromProYuzu250 = 0
Var ShowButtonClick2 = "Invisible"
EndIf
If UsePepsiTheme = 1 Then
@ -50,7 +44,7 @@
EndIf
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
TopView "show"
; On open
@ -69,16 +63,16 @@
Var web_telnumOK = ""
Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/"
If CocktailShow = "true" Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
If CocktailShow = "true" Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml"
EndIf
If TermTemOnline = "true" Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml"
EndIf
If Seeker = "curr" Then
If Seeker = "curr" Then
Machine DoorLidClose
EndIf
@ -87,13 +81,13 @@
CoinVending OFF
; Clear value
Topping "clear" "-"
Var DirImage = "ROOT/taobin_project/image/page2_inter/"
Var StrawAutoRelease1 = "false"
Var StrawAutoRelease2 = "false"
@ -122,7 +116,7 @@
;GenHashWithTimeStamp QRCODE99x
WEB "ENABLE"
Else
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
@ -134,13 +128,17 @@
EndIf
If CountryName = "HongKong" Then
Var ShowButtonClick2 = "Invisible"
EndIf
If RoadShow = "true" Then
Var ShowNetworkProblem = "Invisible"
Var ShowNetworkProblemText = ""
EndIf
; 1035 is Coke.
STRCONTAIN "1035" MaterialAvailable CokeUI
STRCONTAIN "1035" MaterialAvailable CokeUI
Var bnSodaAndOther = DirImage + "/bn_soda_coke.png"
Var bpSodaAndOther = DirImage + "/bp_soda_coke.png"
@ -155,8 +153,8 @@
Var QRCODE99_Y = 1718
Var showCart = "Invisible"
If MultiPayEnable = "true" Then
If MultiPayEnable = "true" Then
If CART_COUNT = 1 Then
Var showCart = "Enable"
Var cart_image_bn = DirImageCart + "/bn_cart1.png"
@ -165,7 +163,7 @@
Var QRCODE99_Y = 1580
EndIf
If CART_COUNT = 2 Then
Var showCart = "Enable"
Var cart_image_bn = DirImageCart + "/bn_cart2.png"
@ -175,7 +173,7 @@
EndIf
If CART_COUNT = 3 Then
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
@ -191,10 +189,10 @@
If XMLProfile = "taobin_notopup" Then
Var ButtontoTopupMenu = "Disable"
EndIf
Var menu_name_eng_hot = ""
Var menu_desc_eng_hot = ""
Var menu_name_thai_hot = ""
@ -212,12 +210,17 @@
Var menu_desc_thai_blender = ""
If BoxID = 0 Then
If BoxID = 0 Then
RebootWithCause "BoxID was zero"
EndIf
If CountryName = "Malaysia" Then
Var ShowButtonClick2 = "Invisible"
Var ButtontoTopupMenu = "Invisible"
EndIf
DEBUGVAR ShowButtonClick2
@ -233,7 +236,7 @@
; reset-if-empty
DEBUGVAR buttonRemoveCup
If buttonRemoveCup = "Invisible" Then
Else
@ -245,7 +248,7 @@
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
<EventTimeout>
;SAVELOG SoundPlaying
@ -254,15 +257,15 @@
EndIf
If countDownRetrun = 0 Then
If Seeker = "next" Then
If Seeker = "next" Then
RootLayoutVisible 3 "hide"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
EndIf
; zone cup on arm
DEBUGVAR CheckCupStateDoorCupClose
@ -287,10 +290,10 @@
Refresh
TimerReset
</EventTimeout>
</EventTimeout>
<EventChangeStatus>
;If ChangeStatus = "payout-end" Then
;If ChangeStatus = "payout-end" Then
; Var ChangeOK = 1
;EndIf
</EventChangeStatus>
@ -303,15 +306,15 @@
Cart "DeleteMenuID" "ALL"
Var web_readyOK = web_ready
Var web_telnumOK = web_telnum
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
EndIf
Else
EndIf
</EventWebApp>
<Image>
@ -332,12 +335,12 @@
If LanguageShow = "MALAY" Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3"
EndIf
If LanguageShow = "THAI" Then
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3"
EndIf
Play PlaySoundLag
Play PlaySoundLag
Var countDownRetrun = 300
Var LanguageButtonEnable = "Enable"
@ -360,10 +363,10 @@
<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If Seeker = "next" Then
<EventClick>
If Seeker = "next" Then
RootLayoutVisible 3 "hide"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
@ -399,10 +402,10 @@
<FilenamePress> Var(DirImage + "/bp_diy.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
If CountryName = "Thailand" Then
If CountryName = "Thailand" Then
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
Else
Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
@ -426,17 +429,17 @@
<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_coffee.lxml"
DEBUGVAR CountryRootPath
DEBUGVAR OpenFileXML
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml"
Else
Open OpenFileXML
EndIf
@ -459,15 +462,15 @@
<FilenamePress> Var(DirImage + "/bp_tea.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml"
;Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_tea.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml"
Else
Open OpenFileXML
EndIf
@ -488,15 +491,15 @@
<FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml"
;Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_milk.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml"
Else
Open OpenFileXML
EndIf
@ -519,15 +522,15 @@
<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml"
;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml"
Else
Open OpenFileXML
EndIf
@ -549,15 +552,15 @@
<FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml"
;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml"
Else
Open OpenFileXML
EndIf
@ -580,15 +583,15 @@
<FilenamePress> bpSodaAndOther </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml"
;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml"
Else
Open OpenFileXML
EndIf
@ -614,15 +617,15 @@
<FilenamePress> Var(DirImage + "/bp_protein.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml"
;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml"
Else
Open OpenFileXML
EndIf
@ -646,16 +649,16 @@
<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
If CountryName = "Thailand" Then
Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml"
Else
Open OpenFileXML
EndIf
@ -681,11 +684,11 @@
<FilenamePress> Var(DirImage + "/bp_main_page_member.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
; eng
Var CheckMemberPage = CountryRootPath + "xml/page_check_member.lxml"
Open CheckMemberPage
</EventClick>
</Button>
@ -698,11 +701,11 @@
<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
; eng
Var PayDetail=""
Open "ROOT/taobin_project/xml/page_back_to_topup.xml"
Open "ROOT/taobin_project/xml/page_back_to_topup.xml"
</EventClick>
</Button>
@ -713,10 +716,10 @@
<Color> "0xFF0000" </Color>
<Width> 1080 </Width>
<Height> 60 </Height>
<EventClick>
<EventClick>
Open "ROOT/taobin_project/xml/page_camera.xml"
</EventClick>
</Button>
@ -742,12 +745,12 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<Interval> 400</Interval>
<EventClick>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
@ -759,7 +762,7 @@
Var web_readyOK = web_ready
Var web_telnumOK = web_telnum
Var web_app_prepar = "true"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
@ -767,7 +770,7 @@
EndIf
Else
EndIf
</EventWebApp>
@ -781,7 +784,7 @@
<Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
@ -796,7 +799,7 @@
Var bg_lidProblem_ST = "Invisible"
Var GetLidButtonState2 = "Enable"
Var bg_lidProblem_ST2 ="Invisible"
Var EnableGetMoreStrawFileName2 = "Enable"
Var bg_strawProblem_ST2 ="Invisible"
</EventUnitTest1>
@ -806,7 +809,7 @@
Var bg_lidProblem_ST = "Enable"
Var GetLidButtonState2 = "Invisible"
Var bg_lidProblem_ST2 ="Enable"
Var XStraw = 376
Var EnableGetMoreStrawFileName2 = "Invisible"
Var bg_strawProblem_ST2 ="Enable"
@ -820,7 +823,7 @@
Var CountDownBrewing = 122
Var MachineStage = "testing"
Var BREW_CNT = 122
Var InternationalEnable = 1
DEBUGVAR InternationalEnable
Var LanguageObjectShow = "Enable"