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

This commit is contained in:
wanlop run 2025-04-06 15:55:20 +07:00
commit c624f208f9
31 changed files with 50570 additions and 49870 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 7 KiB

View file

@ -119,7 +119,7 @@
Else
DEBUGVAR a_video_menu[ads_idx]
If CountryName = "Singapore" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_main.xml" Then
Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_" + a_video_menu[ads_idx]
Var DisplayAds = AdvTaobinMenu + ".mp4"
@ -160,6 +160,9 @@
EndIf
Else
DEBUGVAR "NotBackToMain"
DEBUGVAR CurrPageInst0
DEBUGVAR CurrentXMLFileName2
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
@ -179,6 +182,19 @@
Var DisplayAds = AdvTaobinMenu + ".mp4"
EndIf
Else
DEBUGVAR "NotEmptyCurrInst2"
DEBUGVAR CurrPageInst0
DEBUGVAR CurrentXMLFileName2
If CurrPageInst0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then
Var AdvTaobinMenu = DefaultLargeBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
DEBUGVAR "Detect page board"
EndIf
EndIf
Else
Var AdvTaobinMenu = DefaultNormBanner
@ -254,7 +270,7 @@
If CountryName = "Singapore" Then
DEBUGVAR CountryName
DEBUGVAR CurrentXMLFileName2
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 2 Then
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"
@ -283,6 +299,9 @@
EndIf
;page_remove_cup-SGP_blue.lxml
DEBUGVAR "VideoEnd"
DEBUGVAR CurrPageInst0
DEBUGVAR CurrentXMLFileName2
Else
@ -323,7 +342,7 @@
Else
DEBUGVAR a_video_menu[ads_idx]
If CountryName = "Singapore" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending//taobin_project/xml/page_back_to_main.xml" Then
If CurrentXMLFileName2 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_back_to_main.xml" Then
If CountDownPauseVideo2 < 1 Then
Var AdvTaobinMenu = DefaultNormBanner
Var DisplayAds = AdvTaobinMenu + ".mp4"

File diff suppressed because it is too large Load diff

View file

@ -6561,13 +6561,13 @@
Var PD_CODE2 = "54-03-02-0081"
Var PD_CODE3 = "##-##-##-####"
; begin lang
Var aliasName[0] = "ICED SANTA GINGER"
Var aliasName[0] = "GINGER LATTE"
Var aliasDesc[0] = "GINGER , MILK, CARAMEL SYRUP AND WATER"
Var aliasName[1] = "冰圣诞生姜荼"
Var aliasName[1] = "生姜焦糖牛奶"
Var aliasDesc[1] = "生姜、牛奶、焦糖糖浆、水"
Var aliasName[2] = "冰聖誕生薑荼"
Var aliasName[2] = "生薑焦糖牛奶"
Var aliasDesc[2] = "生薑、牛奶、焦糖糖漿、水"
Var aliasName[3] = "冰聖誕生薑荼"
Var aliasName[3] = "生薑焦糖牛奶"
Var aliasDesc[3] = "生薑、牛奶、焦糖糖漿、水"
Var aliasName[4] = ""
Var aliasDesc[4] = ""
@ -6585,7 +6585,7 @@
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var DescLang[0][5] = ""
Var NameLang[1][0] = "GINGER CAFE LATTE"
Var NameLang[1][0] = "GINGER LATTE"
Var NameLang[1][1] = "生姜拿铁咖啡"
Var NameLang[1][2] = "生薑拿鐵咖啡"
Var NameLang[1][3] = ""
@ -6684,12 +6684,12 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<LanguageGroup>
<LanguageSlot1>ICED SANTA GINGER</LanguageSlot1>
<LanguageSlot2>冰圣诞生姜荼</LanguageSlot2>
<LanguageSlot3>冰聖誕生薑荼</LanguageSlot3>
<LanguageSlot4>ICED SANTA GINGER</LanguageSlot4>
<LanguageSlot5>冰圣诞生姜荼</LanguageSlot5>
<LanguageSlot6>冰聖誕生薑荼</LanguageSlot6>
<LanguageSlot1>GINGER LATTE</LanguageSlot1>
<LanguageSlot2>生姜焦糖牛奶</LanguageSlot2>
<LanguageSlot3>生薑焦糖牛奶</LanguageSlot3>
<LanguageSlot4>GINGER LATTE</LanguageSlot4>
<LanguageSlot5>生姜焦糖牛奶</LanguageSlot5>
<LanguageSlot6>生薑焦糖牛奶</LanguageSlot6>
</LanguageGroup>
</Text>
<Text>

View file

@ -2934,7 +2934,7 @@
Var PD_CODE3 = "##-##-##-####"
; begin lang
Var aliasName[0] = "7UP TAO POWER\nPLUM SODA"
Var aliasDesc[0] = "7Up , Medicine drink, Ume, Ice"
Var aliasDesc[0] = "7Up , Energy drink, Ume, Ice"
Var aliasName[1] = "特鳖能量梅子七喜"
Var aliasDesc[1] = "七喜、特鳖能量水、梅子,冰"
Var aliasName[2] = "特鳖能量梅子七喜"
@ -3072,10 +3072,10 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<LanguageGroup>
<LanguageSlot1>7Up , Medicine drink, Ume, Ice</LanguageSlot1>
<LanguageSlot1>7Up , Energy drink, Ume, Ice</LanguageSlot1>
<LanguageSlot2>七喜、特鳖能量水、梅子,冰</LanguageSlot2>
<LanguageSlot3>七喜、特鳖能量水、梅子、冰</LanguageSlot3>
<LanguageSlot4>7Up , Medicine drink, Ume, Ice</LanguageSlot4>
<LanguageSlot4>7Up , Energy drink, Ume, Ice</LanguageSlot4>
<LanguageSlot5>七喜、特鳖能量水、梅子,冰</LanguageSlot5>
<LanguageSlot6>七喜、特鳖能量水、梅子、冰</LanguageSlot6>
</LanguageGroup>

View file

@ -1,236 +1,236 @@
<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 Menu1Selected = "PressForever"
Var OreoBigButtonEnable = "Enable"
If $12-01-01-0001.Button = "Invisible" Then
Var esp102101001Enable = "Invisible"
Var esp122101001Enable = "Enable"
Else
Var esp102101001Enable = "Enable"
Var esp122101001Enable = "Invisible"
EndIf
SAVELOG PreviseXMLFileName2
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
Var Timeout = 0
If show_eng = "true" Then
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var text_unavailable = "หมด###size=32"
EndIf
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
RootLayoutVisible 13 "show"
RootLayoutVisible 3 "show"
SetInstanceIgnoreTouch
</EventOpen>
<EventLanguageOnChange>
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_mtc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_mtc/"
Var ice_tab_text = "冰塊及時準備好了。 "
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
Var ice_tab_text = "冰块及时准备好了。 "
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;SAVELOG "EventLanguageOnChange menu -list"
Var LanguageButtonEnable = "Invisible"
Var BtnLangToggleIndex = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RefreshAll
</EventLanguageOnChange>
<Timeout> 1000 </Timeout>
<EventTimeout>
;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
;DEBUGVAR inst_show
InstanceGetString SaveStringInst
;DEBUGVAR SaveStringInst
If inst_show = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If LanguageShow = "ENG" Then
InstanceSetString "ShowEng"
EndIf
If LanguageShow = "MTC" Then
InstanceSetString "ShowMTC"
EndIf
If LanguageShow = "MSC" Then
InstanceSetString "ShowMSC"
EndIf
EndIf
EndIf
; setvarint SlientRefreshEnable 1
;DEBUGVAR SlientRefreshEnable
If SlientRefreshEnable = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If LanguageShow = "ENG" Then
InstanceSetString "ShowEng"
EndIf
If LanguageShow = "MTC" Then
InstanceSetString "ShowMTC"
EndIf
If LanguageShow = "MSC" Then
InstanceSetString "ShowMSC"
EndIf
EndIf
EndIf
Var Timeout = Timeout + 1
;include="ROOT/taobin_project/inter/hkg/xml/multi/EventTimeOutWihtOutMultiInstance.ev"
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
<EventLanguageOnChange>
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_mtc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_mtc/"
Var ice_tab_text = "冰塊及時準備好了。 "
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
Var ice_tab_text = "冰块及时准备好了。 "
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;SAVELOG "EventLanguageOnChange menu -list"
Var LanguageButtonEnable = "Invisible"
Var BtnLangToggleIndex = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
</EventLanguageOnChange>
<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 Menu1Selected = "PressForever"
Var OreoBigButtonEnable = "Enable"
If $12-01-01-0001.Button = "Invisible" Then
Var esp102101001Enable = "Invisible"
Var esp122101001Enable = "Enable"
Else
Var esp102101001Enable = "Enable"
Var esp122101001Enable = "Invisible"
EndIf
SAVELOG PreviseXMLFileName2
;include="ROOT/taobin_project/inter/hkg/xml/multi/tab_menu_show_and_refresh.lxml"
Var Timeout = 0
If show_eng = "true" Then
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var text_unavailable = "หมด###size=32"
EndIf
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new_menu.lxml"
RootLayoutVisible 13 "show"
RootLayoutVisible 3 "show"
SetInstanceIgnoreTouch
</EventOpen>
<EventLanguageOnChange>
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_mtc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_mtc/"
Var ice_tab_text = "冰塊及時準備好了。 "
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
Var ice_tab_text = "冰块及时准备好了。 "
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;SAVELOG "EventLanguageOnChange menu -list"
Var LanguageButtonEnable = "Invisible"
Var BtnLangToggleIndex = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
RefreshAll
</EventLanguageOnChange>
<Timeout> 1000 </Timeout>
<EventTimeout>
;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
;DEBUGVAR inst_show
InstanceGetString SaveStringInst
;DEBUGVAR SaveStringInst
If inst_show = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If LanguageShow = "ENG" Then
InstanceSetString "ShowEng"
EndIf
If LanguageShow = "MTC" Then
InstanceSetString "ShowMTC"
EndIf
If LanguageShow = "MSC" Then
InstanceSetString "ShowMSC"
EndIf
EndIf
EndIf
; setvarint SlientRefreshEnable 1
;DEBUGVAR SlientRefreshEnable
If SlientRefreshEnable = 1 Then
If SaveStringInst = "RefreshNow" Then
GetXMLFileNameCurrentRunning CurrentOpenFile
Open CurrentOpenFile
If LanguageShow = "ENG" Then
InstanceSetString "ShowEng"
EndIf
If LanguageShow = "MTC" Then
InstanceSetString "ShowMTC"
EndIf
If LanguageShow = "MSC" Then
InstanceSetString "ShowMSC"
EndIf
EndIf
EndIf
Var Timeout = Timeout + 1
;include="ROOT/taobin_project/inter/hkg/xml/multi/EventTimeOutWihtOutMultiInstance.ev"
TimerReset
</EventTimeout>
;include="ROOT/taobin_project/inter/hkg/xml/multi/menu_catalog_new.lxml"
<EventLanguageOnChange>
DEBUGVAR LanguageShow
If LanguageShow = "ENG" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
EndIf
If LanguageShow = "THAI" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
EndIf
If LanguageShow = "MYANMAR" Then
Var show_eng = "true"
DEBUGVAR show_eng
Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/"
EndIf
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_mtc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_mtc/"
Var ice_tab_text = "冰塊及時準備好了。 "
EndIf
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/drink_option_msc/"
Var DirImageAlter = "ROOT/taobin_project/inter/hkg/image/page3_2_msc/"
Var ice_tab_text = "冰块及时准备好了。 "
EndIf
;inter-image
If CountryName = "Malaysia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;inter-image
If CountryName = "australia" Then
Var DirImage2 = "ROOT/taobin_project/image/drink_option_aus/"
Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
Var DirImageAlterMilk = "ROOT/taobin_project/inter/aus/image/page3_2_en/"
Var DirImage = "ROOT/taobin_project/image/page3_en"
Var ice_tab_text = "Ice will be ready at "
EndIf
;SAVELOG "EventLanguageOnChange menu -list"
Var LanguageButtonEnable = "Invisible"
Var BtnLangToggleIndex = "Enable"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
</EventLanguageOnChange>
<FrameScroll>
<Max> 16 </Max>
<X> 10 </X>
@ -12948,29 +12948,29 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
;BigLogoLayout
</Popup>
<Button>
<X> 780 </X>
<Y> 500 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page_inter/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page_inter/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
</EventClick>
</Button>
;BigLogoLayout
</Popup>

View file

@ -1746,12 +1746,12 @@
; begin lang
Var aliasName[0] = "GINGER MILK TEA\nOREO SMOOTHIE"
Var aliasDesc[0] = "Ginger, Milk, Oreo"
Var aliasName[1] = "-"
Var aliasDesc[1] = "-"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
Var aliasName[1] = "火山生薑奧利奧沙冰"
Var aliasDesc[1] = "生薑、牛奶、糖、奥利奥、冰"
Var aliasName[2] = "火山生薑奧利奧沙冰"
Var aliasDesc[2] = "生薑、牛奶、糖、奥利奥、冰"
Var aliasName[3] = "火山生薑奧利奧沙冰"
Var aliasDesc[3] = "生薑、牛奶、糖、奥利奥、冰"
Var aliasName[4] = "TEH SUSU HALIA\nOREO SMOOTHIE"
Var aliasDesc[4] = "Ginger, Milk, Oreo"
Var aliasName[5] = ""
@ -1868,11 +1868,11 @@
<Color> 0x322B26 </Color>
<LanguageGroup>
<LanguageSlot1>GINGER MILK TEA\nOREO SMOOTHIE</LanguageSlot1>
<LanguageSlot2>-</LanguageSlot2>
<LanguageSlot3>-</LanguageSlot3>
<LanguageSlot2>火山生薑奧利奧沙冰</LanguageSlot2>
<LanguageSlot3>火山生薑奧利奧沙冰</LanguageSlot3>
<LanguageSlot4>GINGER MILK TEA\nOREO SMOOTHIE</LanguageSlot4>
<LanguageSlot5>-</LanguageSlot5>
<LanguageSlot6>-</LanguageSlot6>
<LanguageSlot5>火山生薑奧利奧沙冰</LanguageSlot5>
<LanguageSlot6>火山生薑奧利奧沙冰</LanguageSlot6>
</LanguageGroup>
</Text>
<Text>
@ -1884,11 +1884,11 @@
<Color> 0x6F5F51 </Color>
<LanguageGroup>
<LanguageSlot1>Ginger, Milk, Oreo</LanguageSlot1>
<LanguageSlot2>-</LanguageSlot2>
<LanguageSlot3>-</LanguageSlot3>
<LanguageSlot2>生薑、牛奶、糖、奥利奥、冰</LanguageSlot2>
<LanguageSlot3>生薑、牛奶、糖、奥利奥、冰</LanguageSlot3>
<LanguageSlot4>Ginger, Milk, Oreo</LanguageSlot4>
<LanguageSlot5>-</LanguageSlot5>
<LanguageSlot6>-</LanguageSlot6>
<LanguageSlot5>生薑、牛奶、糖、奥利奥、冰</LanguageSlot5>
<LanguageSlot6>生薑、牛奶、糖、奥利奥、冰</LanguageSlot6>
</LanguageGroup>
</Text>
<Image>

View file

@ -701,13 +701,13 @@
<State> Flag( 54-21-01-0061.Button,54-21-02-0061.Button,$Sum54210100615421020061) </State>
<Button>
<State> $Sum54210100615421020061 </State>
<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_ginger_cafe_latte.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_ginger_cafe_latte.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_ginger_cafe_latte.png" </FilenameDisable>
<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_santa_ginger.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_santa_ginger.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_santa_ginger.png" </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventOnClick>
Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_ginger_cafe_latte.png"
Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_santa_ginger.png"
Var OpenFromXML = CurrentXMLFileName2
Var PriceD1 = $54-21-01-0061.Price
Var PriceD2 = $54-21-02-0061.Price

View file

@ -6427,13 +6427,13 @@
Var PD_CODE2 = "54-03-02-0081"
Var PD_CODE3 = "##-##-##-####"
; begin lang
Var aliasName[0] = "ICED SANTA GINGER"
Var aliasName[0] = "GINGER LATTE"
Var aliasDesc[0] = "GINGER , MILK, CARAMEL SYRUP AND WATER"
Var aliasName[1] = "ซานต้าจินเจอร์"
Var aliasDesc[1] = "ขิง นม น้ำเชื่อมคาราเมล และน้ำ"
Var aliasName[2] = "冰圣诞生姜荼"
Var aliasName[2] = "生姜焦糖牛奶"
Var aliasDesc[2] = "生姜、牛奶、焦糖糖浆、水"
Var aliasName[3] = "冰聖誕生薑荼"
Var aliasName[3] = "生薑焦糖牛奶"
Var aliasDesc[3] = "生薑、牛奶、焦糖糖漿、水"
Var aliasName[4] = ""
Var aliasDesc[4] = ""
@ -6451,7 +6451,7 @@
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
Var DescLang[0][5] = ""
Var NameLang[1][0] = "GINGER CAFE LATTE"
Var NameLang[1][0] = "GINGER LATTE"
Var NameLang[1][1] = "生姜拿铁咖啡"
Var NameLang[1][2] = "生薑拿鐵咖啡"
Var NameLang[1][3] = ""
@ -6522,9 +6522,9 @@
<Font> KanitMediumTTF </Font>
<Color> 0x322B26 </Color>
<LanguageGroup>
<LanguageSlot1>ICED SANTA GINGER</LanguageSlot1>
<LanguageSlot1>GINGER LATTE</LanguageSlot1>
<LanguageSlot2>ซานต้าจินเจอร์</LanguageSlot2>
<LanguageSlot3>ICED SANTA GINGER</LanguageSlot3>
<LanguageSlot3>GINGER LATTE</LanguageSlot3>
<LanguageSlot4>ซานต้าจินเจอร์</LanguageSlot4>
<LanguageSlot5></LanguageSlot5>
<LanguageSlot6>ซานต้าจินเจอร์</LanguageSlot6>

View file

@ -3146,7 +3146,7 @@
Var PD_CODE3 = "##-##-##-####"
; begin lang
Var aliasName[0] = "7UP TAO POWER\nPLUM SODA"
Var aliasDesc[0] = "7Up , Medicine drink, Ume, Ice"
Var aliasDesc[0] = "7Up , Energy drink, Ume, Ice"
Var aliasName[1] = "เซเว่นอัพชูกำลัง\nบ๊วยโซดา"
Var aliasDesc[1] = "เซเว่นอัพ เครื่องดื่มเต่าทรงพลัง บ๊วย และน้ำแข็ง"
Var aliasName[2] = "特鳖能量梅子七喜"
@ -3256,9 +3256,9 @@
<Font> KanitMediumTTF </Font>
<Color> 0x6F5F51 </Color>
<LanguageGroup>
<LanguageSlot1>7Up , Medicine drink, Ume, Ice</LanguageSlot1>
<LanguageSlot1>7Up , Energy drink, Ume, Ice</LanguageSlot1>
<LanguageSlot2>เซเว่นอัพ เครื่องดื่มเต่าทรงพลัง บ๊วย และน้ำแข็ง</LanguageSlot2>
<LanguageSlot3>7Up , Medicine drink, Ume, Ice</LanguageSlot3>
<LanguageSlot3>7Up , Energy drink, Ume, Ice</LanguageSlot3>
<LanguageSlot4>เซเว่นอัพ เครื่องดื่มเต่าทรงพลัง บ๊วย และน้ำแข็ง</LanguageSlot4>
<LanguageSlot5></LanguageSlot5>
<LanguageSlot6>เซเว่นอัพ เครื่องดื่มเต่าทรงพลัง บ๊วย และน้ำแข็ง</LanguageSlot6>

View file

@ -2092,10 +2092,10 @@
Var aliasDesc[0] = "Ginger, Milk, Oreo"
Var aliasName[1] = "ชานมขิงโอริโอ้ปั่น"
Var aliasDesc[1] = "ขิง นม Oreo"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
Var aliasDesc[3] = "-"
Var aliasName[2] = "火山生薑奧利奧沙冰"
Var aliasDesc[2] = "生薑、牛奶、糖、奥利奥、冰"
Var aliasName[3] = "火山生薑奧利奧沙冰"
Var aliasDesc[3] = "生薑、牛奶、糖、奥利奥、冰"
Var aliasName[4] = "TEH SUSU HALIA\nOREO SMOOTHIE"
Var aliasDesc[4] = "Ginger, Milk, Oreo"
Var aliasName[5] = ""

View file

@ -1036,7 +1036,7 @@ TextID Note English Thai China Japan Malaysia
1300003 Beans module ชุดเมล็ดกาแฟ
1300004 Bean tray ถาดใส่เมล็ดกาแฟ
1300005 Switch tray : สวิตซ์ถาด :
1300006 Check tray shutter ตรวจสอบชัตเตอร์ถาด
1300006 Check tray shutter ตรวจสอบชัตเตอร์ของถาด
1300007 Pay beans จ่ายถั่ว
1300008 1. Select beans 1. เลือกเมล็ดกาแฟ
1300009 2. Select direction 2. เลือกทิศทาง

Can't render this file because it has a wrong number of fields in line 21.

View file

@ -1,4 +1,8 @@
if "v2" in param:
# python3 menu_inter_gen.py sheet sheet ../taobin_project/ mys new-inter-v2-gcpm
def find_templatable_product_codes(str_pd):
# find sep `|`
str_pd_spl = str_pd.split('|')

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -26,7 +26,7 @@
DEBUGVAR TelephoneNumber
DEBUGVAR TelephoneNumberX
If show_eng = "true" Then
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/display_point_en"
Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
@ -38,7 +38,7 @@
Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
EndIf
Var CoffeePointTmp = CoffeePoint
If CoffeePoint > 29 Then
@ -46,11 +46,11 @@
Var CoffeePointTmp = 30
EndIf
Var pImage = CoffeePointTmp * 20
Var pImage = pImage / 30
Var pImageStr = "/taobinPoint.png"
Var pImageStr = "/taobinPoint.png"
Var pImageStr = "ROOT/taobin_project/image/display_point" + pImageStr
@ -66,7 +66,7 @@
Var TaobinExpireDay = ""
@ -74,14 +74,14 @@
Var TaobinExpireMonthX = ""
Var TaobinExpireYear = ""
SPLIT TaobinExpire "/" 1 TaobinExpireDay
SPLIT TaobinExpire "/" 2 TaobinExpireMonth
SPLIT TaobinExpire "/" 3 TaobinExpireYear
If show_eng = "true" Then
If show_eng = "true" Then
If TaobinExpireMonth = "01" Then
Var TaobinExpireMonth = "Jan"
@ -148,7 +148,7 @@
Var TaobinExpireYear = TaobinExpireYear + 0
Else
Else
If TaobinExpireMonth = "01" Then
Var TaobinExpireMonth = "ม.ค."
@ -225,17 +225,17 @@
Var ExpireStrTmp = ExpireStrTmp + " "
Var ExpireStrTmp = ExpireStrTmp + TaobinExpireYear
If TaobinLevel = "1" Then
Var PointMaskState = "Enable"
EndIf
If show_eng = "true" Then
If show_eng = "true" Then
Var TaobinLevelDesc3 = "You have coupons "
Var TaobinLevelDesc3 = TaobinLevelDesc3 + TaobinCoupons
@ -270,7 +270,7 @@
If TaobinLevel = "3" Then
Var TaobinLevelDesc1 = "Flying turtle level until " + ExpireStrTmp
Var PointDiff = 200 - CoffeePointRank
Var TaobinLevelDesc2 = "Earn " + PointDiff
Var TaobinLevelDesc2 = TaobinLevelDesc2 + " shells "
@ -291,7 +291,7 @@
If TaobinLevel = "4" Then
Var TaobinLevelDesc1 = "Master turtle level until " + ExpireStrTmp
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel4.png"
@ -355,7 +355,7 @@
If TaobinLevel = "4" Then
Var TaobinLevelDesc1 = "ระดับสมาชิก ผู้เฒ่าเต่า จนถึง " + ExpireStrTmp
Var TaobinLevelDesc2 = ""
Var TaobinLeveImg = "/taoLevel4.png"
@ -366,7 +366,7 @@
Var CheckCoupons = 0
Var MakeDrinkState = 0
@ -622,20 +622,20 @@
Var CheckCouponState = "Disable"
EndIf
Var PointEndDate = ""
GetDateEndOfMonth PointEndDate
DEBUGVAR PointEndDate
Var xPointEndDate = 570
If show_eng = "true" Then
If show_eng = "true" Then
Var xPointEndDate = 618
EndIf
Var Point2XState = "Invisible"
Var Point2XImage = ""
If Point2X = 1 Then
Var Point2XState = "Enable"
If Point2X = 1 Then
Var Point2XState = "Enable"
If Seeker.CampaignPayChanel = "kbank" Then
Var Point2XImage = "/text9.png"
EndIf
@ -645,7 +645,7 @@
If Seeker.CampaignPayChanel = "dolfin" Then
Var Point2XImage = "/text11.png"
EndIf
EndIf
;inter-from-consent
@ -656,29 +656,29 @@
;inter-from-consent
If CountryName = "Indonesia" Then
Var Seeker.FromConsent = 0
EndIf
EndIf
;inter-from-consent
If CountryName = "Australia" Then
Var Seeker.FromConsent = 0
EndIf
EndIf
;inter-from-consent
If CountryName = "Singapore" Then
Var Seeker.FromConsent = 0
EndIf
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
<EventTimeout>
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1
If Timeout > 5 Then
@ -687,36 +687,36 @@
If CoffeePoint > 29 Then
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
If Seeker.FromConsent = 1 Then
If Seeker.FromConsent = 1 Then
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
EndIf
EndIf
TimerReset
Refresh
</EventTimeout>
</EventTimeout>
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
<EventSecurity>
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
<EventActionOk>
If CheckCoupons = 1 Then
Var MakeDrinkState = 1
Var CouponPage = 1
Var CouponPage = 1
Var CouponInfo1 = Ext1a
Var CouponInfo2 = Ext1b
Var CouponInfo3 = Ext1c
@ -727,14 +727,14 @@
Var CouponInfo8 = Ext1h
Var CouponInfo9 = Ext1i
Var CouponInfo10 = Ext1j
Var TelephoneNumber = TelephoneNumberX
GETACCEXT TelephoneNumber 13
Var CheckCoupons = 2
Var CheckCoupons = 2
Else
If CheckCoupons = 2 Then
If CheckCoupons = 2 Then
Var TaobinCredit = Ext1b
@ -751,15 +751,15 @@
Else
Open "ROOT/taobin_project/xml/page_check_member2.xml"
Open "ROOT/taobin_project/xml/page_check_member2.xml"
EndIf
EndIf
EndIf
</EventActionOk>
@ -847,10 +847,10 @@
<FilenamePress> Var( DirImage + "/bp_close.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
; goto lid straw
;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
If Seeker.FromConsent = 1 Then
If Seeker.FromConsent = 1 Then
Open "ROOT/taobin_project/xml/page_display_get_free.xml"
Else
If CoffeePoint > 29 Then
@ -858,7 +858,7 @@
EndIf
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -876,7 +876,7 @@
<FilenameDisable> Var( DirImage + "/bp_check.png" )</FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
; goto lid straw
@ -884,7 +884,7 @@
Var TelephoneNumber = TelephoneNumberX
GETACCEXT TelephoneNumber 15
Var CheckCoupons = 1
</EventClick>
</Button>
@ -1199,18 +1199,18 @@
<Image>
<X> 172 </X>
<Y> 1570 </Y>
<Filename> Var( DirImage + "/text8.png" )</Filename>
<Filename> Var( DirImage + "/text8_mys.png" )</Filename>
</Image>
<Text>
<X> xPointEndDate </X>
<Y> 1576 </Y>
<Size> 25 </Size>
<Width> 500 </Width>
<Font> KanitRegularTTF </Font>
<Color> 0xDE794E </Color>
<Value> PointEndDate </Value>
</Text>
;<Text>
;<X> xPointEndDate </X>
;<Y> 1576 </Y>
;<Size> 25 </Size>
;<Width> 500 </Width>
;<Font> KanitRegularTTF </Font>
;<Color> 0xDE794E </Color>
;<Value> PointEndDate </Value>
;</Text>
<Text>
<X> 310 </X>
@ -1253,4 +1253,3 @@
</Popup>

View file

@ -174,6 +174,8 @@ TextID Note English Thai
000410 Please press the button below to open the door.\nTake the drink out.\nAnd start ordering your drink. กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
Font=Kanit,Type=Regular,Size=64,Color=0x0025FF,PressColor=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
Font=Kanit,Type=Regular,Size=64,Color=0xA6B2FF,Align=Center,LineHeight=50
Font=Kanit,Type=Regular,Size=64,Color=0xA6B2FF,Align=Center,LineHeight=50
000411 Press Here กดที่นี่
@ -1285,3 +1287,447 @@ TextID Note English Thai
2100056 Please check before confirming Please check before confirming
2100057 Fan module Fan module
2200000 Fan พัดลม
EOF
9999999 Load language finish Load language finish

Can't render this file because it has a wrong number of fields in line 8.

View file

@ -1095,7 +1095,7 @@ TextID Note English arabic
1300016 Brew time:sec เวลาชง: วินาที
1300017 Test grind sizes ทดสอบขนาดบด
1300018 Coffee module type : ประเภทชุดกาแฟ :
1300019 1. Select grind sizes 1. เลือกขนาดบด
1300019 1. Select grind sizes 1. เลือกขนาดการบด
1300020 More coarse หยาบขึ้น
1300021 More fine ละเอียดขึ้น
1300022 2. Test grinding 2. ทดสอบการบด

Can't render this file because it has a wrong number of fields in line 22.

View file

@ -3528,7 +3528,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -7082,7 +7082,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -7094,7 +7094,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -10370,7 +10370,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -16908,7 +16908,7 @@
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "BROWN SUGAR CAFÉ SMOOTHIE"
Var NameLang[2][1] = "عصير براون شوجر كافيه"
Var NameLang[2][1] = "مشروب براون شوجر كافيه"
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = ""

View file

@ -2176,7 +2176,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Milk, Melon Syrup, and Iced"
Var DescLang[1][1] = "الحليب وشراب البطيخ والمثلج"
Var DescLang[1][1] = "الحليب، شراب البطيخ، والمثلج"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -2188,7 +2188,7 @@
Var NameLang[2][4] = ""
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Milk, Melon Syrup, and Iced"
Var DescLang[2][1] = "الحليب وشراب البطيخ والمثلج"
Var DescLang[2][1] = "الحليب، شراب البطيخ، والمثلج"
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
Var DescLang[2][4] = ""
@ -2996,7 +2996,7 @@
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "COCOA OVALTINE FLAKE VOLCANO"
Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضوية"
Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضاوية"
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = ""

View file

@ -4347,7 +4347,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Matcha and Hot water"
Var DescLang[0][1] = "ماتشا وماء ساخن"
Var DescLang[0][1] = "ماتشا والماء الساخن"
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -7099,7 +7099,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Thai tea, Limenade, Water, Ice"
Var DescLang[1][1] = "الشاي التايلاندي، الليمونيد، الماء، الثلج"
Var DescLang[1][1] = "شاي تايلاندي، ليمون، ماء، ثلج"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""

View file

@ -3797,7 +3797,7 @@
Var DescLang[1][4] = ""
Var DescLang[1][5] = ""
Var NameLang[2][0] = "COCOA OVALTINE FLAKE VOLCANO"
Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضوية"
Var NameLang[2][1] = "بركان رقاقة الكاكاو البيضاوية"
Var NameLang[2][2] = ""
Var NameLang[2][3] = ""
Var NameLang[2][4] = ""
@ -4061,7 +4061,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Milk, Melon Syrup, and Iced"
Var DescLang[1][1] = "الحليب وشراب البطيخ والمثلج"
Var DescLang[1][1] = "الحليب، شراب البطيخ، والمثلج"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -4073,7 +4073,7 @@
Var NameLang[2][4] = ""
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Milk, Melon Syrup, and Iced"
Var DescLang[2][1] = "الحليب وشراب البطيخ والمثلج"
Var DescLang[2][1] = "الحليب، شراب البطيخ، والمثلج"
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
Var DescLang[2][4] = ""

File diff suppressed because it is too large Load diff

View file

@ -1,48 +1,48 @@
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
Var Menu1Selected = "PressForever"
Var OreoBigButtonEnable = "Enable"
If $12-01-01-0001.Button = "Invisible" Then
Var esp102101001Enable = "Invisible"
Var esp122101001Enable = "Enable"
Else
Var esp102101001Enable = "Enable"
Var esp122101001Enable = "Invisible"
EndIf
SAVELOG PreviseXMLFileName2
Var Timeout = 0
If show_eng = "true" Then
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var text_unavailable = "หมด###size=32"
EndIf
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<Popup>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
;<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
Var Menu1Selected = "PressForever"
Var OreoBigButtonEnable = "Enable"
If $12-01-01-0001.Button = "Invisible" Then
Var esp102101001Enable = "Invisible"
Var esp122101001Enable = "Enable"
Else
Var esp102101001Enable = "Enable"
Var esp122101001Enable = "Invisible"
EndIf
SAVELOG PreviseXMLFileName2
Var Timeout = 0
If show_eng = "true" Then
Var text_unavailable = "UNAVAILABLE###size=16"
Else
Var text_unavailable = "หมด###size=32"
EndIf
;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
</EventOpen>
;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
<FrameScroll>
<X> 10 </X>
<Y> 497 </Y>
@ -5850,7 +5850,7 @@
Var NameLang[0][4] = ""
Var NameLang[0][5] = ""
Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[0][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[0][2] = ""
Var DescLang[0][3] = ""
Var DescLang[0][4] = ""
@ -5862,7 +5862,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
Var DescLang[1][1] = "مشوي خفيف. ملحوظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][1] = "مشوي خفيف. ملاحظة: جيلي العنب، فطيرة التفاح، الجوز، النعناع."
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -9416,7 +9416,7 @@
Var NameLang[1][4] = ""
Var NameLang[1][5] = ""
Var DescLang[1][0] = "Milk, Melon Syrup, and Iced"
Var DescLang[1][1] = "الحليب وشراب البطيخ والمثلج"
Var DescLang[1][1] = "الحليب، شراب البطيخ، والمثلج"
Var DescLang[1][2] = ""
Var DescLang[1][3] = ""
Var DescLang[1][4] = ""
@ -9428,7 +9428,7 @@
Var NameLang[2][4] = ""
Var NameLang[2][5] = ""
Var DescLang[2][0] = "Milk, Melon Syrup, and Iced"
Var DescLang[2][1] = "الحليب وشراب البطيخ والمثلج"
Var DescLang[2][1] = "الحليب، شراب البطيخ، والمثلج"
Var DescLang[2][2] = ""
Var DescLang[2][3] = ""
Var DescLang[2][4] = ""
@ -11538,15 +11538,15 @@
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>
;BigLogoLayout
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
</Popup>
;BigLogoLayout
;include="ROOT/taobin_project/inc/button_remove_cup.inc"
</Popup>

View file

@ -2936,8 +2936,8 @@
; begin lang
Var aliasName[0] = "ESPRESSO SHAKE"
Var aliasDesc[0] = "Whey protein, Espresso\n& Milk"
Var aliasName[1] = "เอสเพรสโซ่โปรตีน"
Var aliasDesc[1] = "เวย์โปรตีน กาแฟ นม"
Var aliasName[1] = "إسبرسو شيك"
Var aliasDesc[1] = "بروتين مصل اللبن، إسبرسو وحليب"
Var aliasName[2] = "-"
Var aliasDesc[2] = "-"
Var aliasName[3] = "-"
@ -3030,11 +3030,11 @@
<Color> HeadlineColor </Color>
<LanguageGroup>
<LanguageSlot1>ESPRESSO SHAKE</LanguageSlot1>
<LanguageSlot2>เอสเพรสโซ่โปรตีน</LanguageSlot2>
<LanguageSlot2>إسبرسو شيك</LanguageSlot2>
<LanguageSlot3>ESPRESSO SHAKE</LanguageSlot3>
<LanguageSlot4>เอสเพรสโซ่โปรตีน</LanguageSlot4>
<LanguageSlot4>إسبرسو شيك</LanguageSlot4>
<LanguageSlot5>ESPRESSO SHAKE</LanguageSlot5>
<LanguageSlot6>เอสเพรสโซ่โปรตีน</LanguageSlot6>
<LanguageSlot6>إسبرسو شيك</LanguageSlot6>
</LanguageGroup>
</Text>
<Text>
@ -3046,11 +3046,11 @@
<Color> BodyTextColor </Color>
<LanguageGroup>
<LanguageSlot1>Whey protein, Espresso\n& Milk</LanguageSlot1>
<LanguageSlot2>เวย์โปรตีน กาแฟ นม</LanguageSlot2>
<LanguageSlot2>بروتين مصل اللبن، إسبرسو وحليب</LanguageSlot2>
<LanguageSlot3>Whey protein, Espresso\n& Milk</LanguageSlot3>
<LanguageSlot4>เวย์โปรตีน กาแฟ นม</LanguageSlot4>
<LanguageSlot4>بروتين مصل اللبن، إسبرسو وحليب</LanguageSlot4>
<LanguageSlot5>Whey protein, Espresso\n& Milk</LanguageSlot5>
<LanguageSlot6>เวย์โปรตีน กาแฟ นม</LanguageSlot6>
<LanguageSlot6>بروتين مصل اللبن، إسبرسو وحليب</LanguageSlot6>
</LanguageGroup>
</Text>
<Image>

View file

@ -481,7 +481,12 @@
Var QR_POPUP = "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment/img_tap_card_5_sec.png"
Var CountDownAllowCancel = 5
Var CountDownAllowCancel = 9999999
Var VendingIsQueueCounter = 0
Var VendingIsFail = 0
Var VendingIsUnknown = 0
Var VendingIsIdleByPressingBtn = 0
</EventOpen>
@ -708,6 +713,8 @@
Var PayInfoCFlag = 1
EndIf
DEBUGVAR VendingCashless
DEBUGVAR Timeout
If VendingCashless = "OK" Then
DEBUGVAR CashlessCode
@ -717,6 +724,8 @@
Var QRErrorState = "Invisible"
Var LOADING_STATE = "Invisible"
Var CountDownAllowCancel = 9999999
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
@ -737,6 +746,23 @@
Else
DEBUGVAR "VendingCashless get ActOk not ok"
DEBUGVAR VendingCashless
If VendingCashless = "QUEUE" Then
Var VendingIsQueueCounter = VendingIsQueueCounter + 1
SAVELOG "State::QUEUE.ActOk.add(1)"
EndIf
If VendingCashless = "ERROR" Then
Var VendingIsError = VendingIsError + 1
SAVELOG "State::ERROR.ActOk.add(1)"
EndIf
If VendingCashless = "FAIL" Then
Var VendingIsError = VendingIsError + 1
SAVELOG "State::FAIL.ActOk.add(1) cnt as Error"
EndIf
EndIf
</EventActionOk>
@ -786,6 +812,9 @@
If alphaState = "Enable" Then
Var QRErrorState = "Enable"
Var LOADING_STATE = "Invisible"
Var CountDownAllowCancel = 0
EndIf
EndIf
@ -803,6 +832,7 @@
DEBUGVAR VendingCashless
DEBUGVAR UserChoosePayment
DEBUGVAR CoinInFlag
DEBUGVAR Timeout
@ -812,7 +842,7 @@
DEBUGVAR UserChoosePayment
DEBUGVAR VendingCashless
If Timeout < 120 Then
If UserChoosePayment = "CreditCashless" Then
If VendingCashless = "READY" Then
Var QRCODE99 = ""
@ -824,6 +854,11 @@
Var alphaState = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef
SAVELOG "Cashless by pressing button"
Var CountDownAllowCancel = 9999999
Var CashlessPayFlag = 1
EndIf
EndIf
@ -841,10 +876,16 @@
CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1
SAVELOG "Cashless without pressing button"
Var CountDownAllowCancel = 9999999
Var UserChoosePayment = "CreditCashless"
EndIf
EndIf
Else
SAVELOG "User tried to pay but timeout is > 120"
DEBUGVAR Timeout
EndIf
EndIf
Else
@ -868,11 +909,122 @@
DEBUGVAR VendingCashless
DEBUGVAR CountDownAllowCancel
DEBUGVAR VendingIsQueueCounter
DEBUGVAR VendingIsError
DEBUGVAR VendingIsUnknown
DEBUGVAR VendingIsIdleByPressingBtn
If CountDownAllowCancel > 0 Then
Var CountDownAllowCancel = CountDownAllowCancel - 1
EndIf
If VendingCashless = "" Then
Var VendingIsUnknown = VendingIsUnknown + 1
SAVELOG "VendingCashless is empty"
EndIf
If VendingCashless = "START" Then
Var VendingIsIdleByPressingBtn = VendingIsIdleByPressingBtn + 1
SAVELOG "VendingCashless is IDLE(START)"
EndIf
If VendingCashless = "ERROR" Then
Var VendingIsError = VendingIsError + 1
SAVELOG "VendingCashless is ERROR, Timeout"
EndIf
If VendingCashless = "FAIL" Then
Var VendingIsError = VendingIsError + 1
SAVELOG "VendingCashless is FAIL, Timeout"
EndIf
If VendingCashless = "QUEUE" Then
Var VendingIsQueueCounter = VendingIsQueueCounter + 1
SAVELOG "VendingCashless is QUEUE"
EndIf
If VendingIsQueueCounter > 0 Then
If VendingIsQueueCounter > 4 Then
SAVELOG "UnexpectedQueueCounter"
DEBUGVAR VendingIsQueueCounter
EndIf
If VendingCashless = "ERROR" Then
SAVELOG "VendingError::hasQueueMoreThan1 ---> Error"
Var CountDownAllowCancel = 0
Var VendingIsQueueCounter = 0
Var VendingIsError = 0
Var VendingIsUnknown = 0
EndIf
If VendingCashless = "FAIL" Then
SAVELOG "VendingError::hasQueueMoreThan1 ---> Fail"
Var CountDownAllowCancel = 0
Var VendingIsQueueCounter = 0
Var VendingIsError = 0
Var VendingIsUnknown = 0
EndIf
EndIf
If VendingIsUnknown > 59 Then
SAVELOG "VendingIsUnknown::AllowCancel60s"
Var CountDownAllowCancel = 0
Var VendingIsUnknown = 0
EndIf
If VendingIsIdleByPressingBtn > 9 Then
SAVELOG "Vending IDLE 10 s, auto exit"
Var LOADING_STATE = "Invisible"
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
Var CountDownAllowCancel = 9999999
Var QRCODE99 = ""
;CoinVending ON
;VendingQR OFF
CashlessReq OFF ""
If CashlessPayFlag = 0 Then
If UserChoosePayment = "CreditCashless" Then
Var CashlessPayFlag = 0
CashlessReq FAIL ""
EndIf
If UserChoosePayment = "" Then
Var CashlessPayFlag = 0
CashlessReq FAIL ""
EndIf
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL ""
EndIf
Refresh
Var VendingIsIdleByPressingBtn = 0
EndIf
; ok
If VendingCashless = "END" Then
Var VendingIsQueueCounter = 0
Var VendingIsUnknown = 0
Var VendingIsError = 0
Var VendingIsIdleByPressingBtn = 0
SAVELOG "VendingCashless is END, resetAll"
EndIf
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
DEBUGVAR UserChoosePayment
@ -1017,8 +1169,9 @@
EndIf
Else
Var PayState5 = "Enable"
If Timeout < 120 Then
Var PayState5 = "Enable"
EndIf
EndIf
Var stringLog = "Timeout " + Timeout
@ -1645,7 +1798,7 @@ If alphaState = "Invisible" Then
DEBUGVAR QR_POPUP
Refresh
Var alphaState = "Enable"
Var CountDownAllowCancel = 5
Var CountDownAllowCancel = 9999999
Coin CARD
EndIf
EndIf
@ -1873,6 +2026,10 @@ EndIf
Var LOADING_STATE = "Invisible"
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
Var CountDownAllowCancel = 9999999
Var VendingIsIdleByPressingBtn = 0
Var QRCODE99 = ""
;CoinVending ON
;VendingQR OFF

View file

@ -27,6 +27,14 @@
LED LedDoorDoor 5 255 255 255 255
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
Var ShowMenuNameAndImage = "Invisible"
Var RemoveCupOnArmID = -1
Var remove_cup_name = ""
Var remove_cup_image = ""
Var CheckCupStateDoorCupClose = ""
Var CheckCupStateDoorCupCloseCnt = 0
@ -50,59 +58,50 @@
;SAVELOG MachineErrorDetail
Var MachineErrorDetailAll = MachineErrorDetailEng
If MachineStage = "show-menu" Then
Open "ROOT/taobin_project/xml/page_board.xml"
If HaveCup = "false" Then
If MachineStage = "show-menu" Then
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
EndIf
If CupOnArm = "true" Then
If MachineStage = "show-menu" Then
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
EndIf
If MachineStage = "close-maintenance" Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
EndIf
Var Timeout = Timeout + 1
;include=ROOT/taobin_project/inc/remove_cup_step.inc
DEBUGVAR Timeout
If Timeout > 5 Then
Var Timeout = 0
DEBUGVAR DoorCupPosition
Var RemoveCupOnArmID = 0
If RemoveCupOnArmID > 0 Then
If DoorCupPosition = "bottom" Then
Var buttonRemoveCup = "Enable"
Var ShowMenuNameAndImage = "Invisible"
Var RemoveCupOnArmID = -1
Else
DEBUGVAR RemoveCupOnArmID
DEBUGVAR DrinkImageOnArm[RemoveCupOnArmID]
DEBUGVAR DrinkNameOnArm[RemoveCupOnArmID]
Var remove_cup_image = DrinkImageOnArm[RemoveCupOnArmID]
Var remove_cup_name = DrinkNameOnArm[RemoveCupOnArmID]
Var ShowMenuNameAndImage = "Enable"
EndIf
EndIf
; Logic have differrent drinkfail3.xml
; protect lock
;
If CheckCupStateDoorCupCloseCnt > 0 Then
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
EndIf
If CheckCupStateDoorCupCloseCnt = 0 Then
Var CheckCupStateDoorCupClose = ""
EndIf
DEBUGVAR HaveCup
If HaveCup = "true" Then
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
DEBUGVAR buttonRemoveCup
DEBUGVAR CheckCupStateDoorCupClose
Refresh
TimerReset
</EventTimeout>
;include=ROOT/taobin_project/inc/remove_cup_tag_event.inc
<Text>
<X> 50 </X>
<Y> 852 </Y>
@ -134,11 +133,9 @@
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
Var CheckCupStateDoorCupClose = "reset"
Var CheckCupStateDoorCupCloseCnt = 30
;include=ROOT/taobin_project/inc/remove_cup_button.inc
Refresh
</EventClick>
<Language>
<ID> 000411 </ID>
@ -150,6 +147,37 @@
</Button>
<Image>
<X> 125 </X>
<Y> 1700 </Y>
<Height> 300 </Height>
<Width> 320 </Width>
<State> ShowMenuNameAndImage </State>
<Filename> remove_cup_image </Filename>
</Image>
<Text>
<X> 300 </X>
<Y> 1750 </Y>
<State> ShowMenuNameAndImage </State>
<Width> 1080 </Width>
<Align> Center </Align>
<Font> KanitLightTTF </Font>
<Size> 48 </Size>
<Color> HeadlineColor </Color>
<Value>
eval(
STRCONTAIN "size" remove_cup_name SizeFromSheet
If SizeFromSheet = "true" Then
SPLIT Seeker.showname "###" 1 PureName
Var return = PureName
Else
Var return = Seeker.showname
EndIf
)
</Value>
</Text>
<Text>
<X> 5 </X>
<Y> 1868 </Y>

View file

@ -758,15 +758,21 @@
DEBUGVAR CupPlastic9502Enable
DEBUGVAR CupPaper9512Enable
SET-MENU-SHOW "Hot" 1
SET-MENU-SHOW "Cold" 1
SET-MENU-SHOW "Blend" 1
If CupPlastic9502Enable = "true" Then
SET-MENU-SHOW 1
SET-MENU-SHOW "Cold" 1
Else
If CupPaper9512Enable = "true" Then
SET-MENU-SHOW 2
SET-MENU-SHOW "Cold" 2
EndIf
Endif
DEBUGVAR XSlot
DEBUGVAR XSlot[0]
DEBUGVAR XSlot[1]
DEBUGVAR XSlot[2]

View file

@ -1178,7 +1178,6 @@
If EnablingCountDown = 0 Then
Var Timeout = 0
Var UserChoosePayment = "QRCode"
Var QRErrorState = "Enable"
Var QR_POPUP = DirQR_popup + "/img_use_qr_code.png"
Var VendingCashless = "-"
Var LOADING_STATE = "Invisible"

View file

@ -39,7 +39,7 @@
Var HeadVideoFilename = AdvTaobinHome + video_menu_0
DEBUGVAR video_main_5
EndIf
If HeadVideoFilename = "-" Then
DEBUGVAR HeadVideoFilename
Var HeadVideoFilename = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00"
@ -47,6 +47,13 @@
Var HeadVideoFilename = HeadVideoFilename + ".mp4"
If CountryName = "Singapore" Then
If UsePepsiTheme = 1 Then
Var HeadVideoFilename = DefaultLargeBanner + ".mp4"
EndIf
EndIf
DEBUGVAR VideoAdvIndex
DEBUGVAR HeadVideoFilename
@ -57,15 +64,15 @@
If VideoAdvIndex >= video_main_count Then
Var VideoAdvIndex = 0
EndIf
EndIf
Open "ROOT/taobin_project/xml/video_loop2.xml"
</EventOpen>
<Timeout> 5000 </Timeout>
<EventSecurity>
Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"
<EventSecurity>
Open "/mnt/sdcard/coffeevending/xml/security_alarm.xml"
</EventSecurity>
@ -77,7 +84,7 @@
<Height> 200 </Height>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClickLong>
<EventClickLong>
OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml"
</EventClickLong>

View file

@ -279,6 +279,18 @@
DEBUGVAR EnableNewBrewUI
DEBUGVAR GPRSStatus
DEBUGVAR GPRSState
Var GPRSStr = ""
Var GPRSStr = GPRSStr + GPRSStatus
Var GPRSStr = GPRSStr + ", "
Var GPRSStr = GPRSStr + GPRSState
Refresh
TimerReset
@ -962,6 +974,27 @@
</Text>
;GPRS
<Image>
<X> info1_startX </X>
<Y> info_13Y </Y>
<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
<EventClick>
DEBUGVAR GPRSStatus
DEBUGVAR GPRSState
</EventClick>
</Image>
<Text>
<X> info1_text_startX </X>
<Y> info_text_13Y </Y>
<Size> 30 </Size>
<Font> fontType1 </Font>
<Color> 0x000000 </Color>
<Value> GPRSStr </Value>
</Text>
<Button>
<X> 431 </X>