pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

MYS: fix desc & hide button in page_catalog, SGP: change video main WTC

Browse source
This commit is contained in:
Pakin 2025-01-13 21:05:12 +07:00
parent 45c3eaef1a
commit 0837626090
8 changed files with 134 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
inter/whatthecup/common/video/video_main_wtc_new.mp4 Normal file
View file

Binary file not shown.

208
inter/whatthecup/sgp/xml/page_catalog.lxml
View file

@ -22,7 +22,7 @@
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
TopView "show"
; On open
@ -41,16 +41,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
@ -59,11 +59,11 @@
CoinVending OFF
; Clear value
Topping "clear" "-"
Var DirImage = "ROOT/taobin_project/image/page2_inter/"
If UsePepsiTheme = 1 Then
@ -71,7 +71,7 @@
Var DirImage = "ROOT/taobin_project/inter/whatthecup/" + CountryShortName
Var DirImage = DirImage + "/image/page2_en/"
EndIf
Var StrawAutoRelease1 = "false"
Var StrawAutoRelease2 = "false"
@ -100,7 +100,7 @@
;GenHashWithTimeStamp QRCODE99x
WEB "ENABLE"
Else
Var ShowNetworkProblem = "Enable"
Var ShowButtonClick2 = "Invisible"
@ -116,9 +116,9 @@
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"
@ -133,8 +133,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"
@ -143,7 +143,7 @@
Var QRCODE99_Y = 1580
EndIf
If CART_COUNT = 2 Then
Var showCart = "Enable"
Var cart_image_bn = DirImageCart + "/bn_cart2.png"
@ -153,7 +153,7 @@
EndIf
If CART_COUNT = 3 Then
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
@ -169,10 +169,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 = ""
@ -190,12 +190,12 @@
Var menu_desc_thai_blender = ""
If BoxID = 0 Then
If BoxID = 0 Then
RebootWithCause "BoxID was zero"
EndIf
DEBUGVAR ShowButtonClick2
@ -212,7 +212,7 @@
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
<EventTimeout>
;SAVELOG SoundPlaying
@ -221,15 +221,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
If CupOnArm = "true" Then
@ -250,10 +250,10 @@
Refresh
TimerReset
</EventTimeout>
</EventTimeout>
<EventChangeStatus>
;If ChangeStatus = "payout-end" Then
;If ChangeStatus = "payout-end" Then
; Var ChangeOK = 1
;EndIf
</EventChangeStatus>
@ -266,15 +266,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>
@ -295,12 +295,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"
@ -323,10 +323,10 @@
<FilenamePress> "ROOT/taobin_project/inter/whatthecup/sgp/image/page2_en/bn_back_arrow_2.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
@ -362,11 +362,11 @@
<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"
@ -390,19 +390,19 @@
<FilenamePress> Var(DirImage + "/bp_coffee.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var TextOnCatalogColor = ButtonTextPressedColor2
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
@ -425,17 +425,17 @@
<FilenamePress> Var(DirImage + "/bp_tea.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var TextOnCatalogColor = ButtonTextPressedColor2
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
@ -456,17 +456,17 @@
<FilenamePress> Var(DirImage + "/bp_cho_caramel.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var TextOnCatalogColor = ButtonTextPressedColor2
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
@ -489,17 +489,17 @@
<FilenamePress> Var(DirImage + "/bn_kidmenu.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var TextOnCatalogColor = ButtonTextPressedColor2
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
@ -521,17 +521,17 @@
<FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var TextOnCatalogColor = ButtonTextPressedColor2
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
@ -554,17 +554,17 @@
<FilenamePress> bpSodaAndOther </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var TextOnCatalogColor = ButtonTextPressedColor2
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
@ -595,12 +595,12 @@
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
@ -624,18 +624,18 @@
<FilenamePress> Var(DirImage + "/bp_HealthyOption.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
<EventClick>
Var TextOnCatalogColor = ButtonTextPressedColor2
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
@ -661,11 +661,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>
@ -678,11 +678,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>
@ -693,10 +693,10 @@
<Color> "0xFF0000" </Color>
<Width> 1080 </Width>
<Height> 60 </Height>
<EventClick>
<EventClick>
Open "ROOT/taobin_project/xml/page_camera.xml"
</EventClick>
</Button>
@ -722,12 +722,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>
@ -739,7 +739,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"
@ -747,7 +747,7 @@
EndIf
Else
EndIf
</EventWebApp>
@ -761,7 +761,7 @@
<Interval> 500 </Interval>
<Filename> Var(RootPath + "image/main_page_inter/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page_inter/bp_remove_cup.png") </Filename>
<EventClick>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
@ -776,7 +776,7 @@
Var bg_lidProblem_ST = "Invisible"
Var GetLidButtonState2 = "Enable"
Var bg_lidProblem_ST2 ="Invisible"
Var EnableGetMoreStrawFileName2 = "Enable"
Var bg_strawProblem_ST2 ="Invisible"
</EventUnitTest1>
@ -786,7 +786,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"
@ -800,7 +800,7 @@
Var CountDownBrewing = 122
Var MachineStage = "testing"
Var BREW_CNT = 122
Var InternationalEnable = 1
DEBUGVAR InternationalEnable
Var LanguageObjectShow = "Enable"
@ -813,7 +813,9 @@
</EventUnitTest2>
; Initial for jump to page_brewing3.xml
<EventUnitTest3>
Var buttonRemoveCup = "Enable"
DEBUGVAR buttonRemoveCup
</EventUnitTest3>
</Popup>

2
inter/whatthecup/sgp/xml/page_topping_select6_blue.lxml
View file

@ -1536,6 +1536,8 @@
<Image>
<X> 374 </X>
<Y> 382 </Y>
<Width> 361 </Width>
<Height> 466 </Height>
<Filename> OverlayMenuFilter </Filename>
</Image>