From bc20c55e7401318d6b24dd62177e672db2de932e Mon Sep 17 00:00:00 2001 From: wanlop run Date: Tue, 26 Nov 2024 21:56:59 +0700 Subject: [PATCH] Do inter + multi part hybirde promotion --- image/main_page/bp_remove_cup-1.png | Bin 15436 -> 0 bytes inter/tha/xml/multi/menu_catalog_new.lxml | 10 +- inter/tha/xml/multi/page_catalog.lxml | 6 +- .../multi/page_catalog_group_other_other.lxml | 544 ++++++++++++ inter/tha/xml/multi/page_instance2.xml | 4 +- inter/tha/xml/multi/tab_menu.lxml | 13 +- inter/tha/xml/page_catalog.lxml | 826 ------------------ inter/tha/xml/page_topping_select6.lxml | 39 + menu/new-layout.tsv | 4 +- video/script1.ev | 5 +- video/sync_1.file | 6 +- xml/menu_catalog_default_init.xml | 11 + xml/menu_catalog_new.xml | 142 +-- xml/menutab/menu_catalog_default_init.xml | 9 - xml/page_board.xml | 248 ++---- xml/page_catalog.lxml | 1 + xml/page_catalog3.xml | 2 +- xml/page_catalog_group_other_other.xml | 504 ++++++++++- xml/page_catalog_group_pro_15THB.xml | 11 + xml/page_catalog_group_songkran.xml | 11 + xml_main/startup.xml | 4 +- 21 files changed, 1337 insertions(+), 1063 deletions(-) delete mode 100644 image/main_page/bp_remove_cup-1.png delete mode 100644 inter/tha/xml/page_catalog.lxml diff --git a/image/main_page/bp_remove_cup-1.png b/image/main_page/bp_remove_cup-1.png deleted file mode 100644 index bf94f568302c0679d726f03d2af6494a575942c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15436 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 DEBUGVAR LanguageShow If LanguageShow = "ENG" Then + Var show_eng = "true" Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" EndIf If LanguageShow = "THAI" Then + Var show_eng = "false" Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -69,14 +71,8 @@ Var DirImage2 = "ROOT/taobin_project/image/drink_option_mmr/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_mmr/" 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 + DEBUGVAR DirImageAlter SAVELOG "EventLanguageOnChange menu -list" diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index 8bc1f0fa..f7c65c5f 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -353,8 +353,10 @@ Var OpenFromMulti = 1 - TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + RootLayoutVisible 3 "hide" + RootLayoutVisible 13 "hide" + 000003 diff --git a/inter/tha/xml/multi/page_catalog_group_other_other.lxml b/inter/tha/xml/multi/page_catalog_group_other_other.lxml index 6e1d3c14..f6f5baed 100644 --- a/inter/tha/xml/multi/page_catalog_group_other_other.lxml +++ b/inter/tha/xml/multi/page_catalog_group_other_other.lxml @@ -162,6 +162,550 @@ Var block_index_move = 0 ;dummy_layout.inc + ; ==================> Len = 3 + ; - 12-05-02-0094 12-05-03-0094 + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0094.Button,12-05-03-0094.Button,$Sum12050200941205030094) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + PEPSI + เป๊ปซี่น้ำแข็ง + PEPSI + เป๊ปซี่น้ำแข็ง + + PEPSI + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + Pepsi & Ice + เป๊ปซี่ + Pepsi & Ice + เป๊ปซี่ + + Pepsi နှင့် ရေခဲ + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0094.Button + + + 123 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0094.Button + Var( "฿" + $12-05-02-0094.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0094.Button + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0094.Button + Var( "฿" + $12-05-03-0094.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050200941205030094 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0094.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0094.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum12050200941205030094 + + 000013 + + center-vertical-horizontal + + + ; ==================> Len = 3 + ; - 12-05-02-0095 - + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0095.Button,$Sum1205020095) + + + 16 + 164 + 22 + 222 + "multi2" + KanitMediumTTF + 0x322B26 + + 7UP + เซเว่นอัพ + 7UP + เซเว่นอัพ + + 7UP + + + + 16 + 220 + 14 + 222 + KanitMediumTTF + 0x6F5F51 + + 7UP & Ice + เซเว่นอัพ + 7UP & Ice + เซเว่นอัพ + + 7UP & ရေခဲ + + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + TextPriceMenuHotX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0095.Button + + + 123 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0095.Button + Var( "฿" + $12-05-02-0095.Price ) + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + TextPriceMenuBlendX + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + Var( "฿" + $-.Price ) + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1205020095 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0095.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + "disable-show" + $Sum1205020095 + + 000013 + + center-vertical-horizontal + + ; ==================> Len = 3 ; - 12-05-02-0035 12-05-03-0035 diff --git a/inter/tha/xml/multi/page_instance2.xml b/inter/tha/xml/multi/page_instance2.xml index e54e73a4..b0a6b5fd 100644 --- a/inter/tha/xml/multi/page_instance2.xml +++ b/inter/tha/xml/multi/page_instance2.xml @@ -6,8 +6,10 @@ ; open from page_catalog.lxml - + RootLayoutVisible 3 "show" RootLayoutVisible 13 "show" + + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" Var Timeout = 0 diff --git a/inter/tha/xml/multi/tab_menu.lxml b/inter/tha/xml/multi/tab_menu.lxml index 4da82cb9..cf8a0d3c 100644 --- a/inter/tha/xml/multi/tab_menu.lxml +++ b/inter/tha/xml/multi/tab_menu.lxml @@ -4,11 +4,13 @@ If LanguageShow = "ENG" Then + Var show_eng = "true" Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" EndIf If LanguageShow = "THAI" Then + Var show_eng = "false" Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -58,8 +60,15 @@ SAVELOG "Click rec" Var NextPage = "-" Var OpenFromMulti = 1 - Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" - TRY OpenFileXML + Var OpenFromPageBoard = 1 + + ;Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" + ;TRY OpenFileXML + + RootLayoutVisible 3 "hide" + RootLayoutVisible 13 "hide" + + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" diff --git a/inter/tha/xml/page_catalog.lxml b/inter/tha/xml/page_catalog.lxml deleted file mode 100644 index 79371991..00000000 --- a/inter/tha/xml/page_catalog.lxml +++ /dev/null @@ -1,826 +0,0 @@ - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - - - TopView "show" - ; On open - - Machine WakeUp - - DEBUGVAR ToppingNewShow - - Var NextPage = "-" - - Var Seeker.thankLidFlag = 0 - Var Seeker.thankStrawFlag = 0 - - WEB "DISABLE" - - Var web_readyOK = "false" - Var web_telnumOK = "" - - DEBUGVAR LanguageShowByIndex - Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex) - DEBUGVAR StringToppingOreoWithPrice - - - - 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" - EndIf - - If TermTemOnline = "true" Then - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_tt_catalog.xml" - EndIf - - If Seeker = "curr" Then - Machine DoorLidClose - EndIf - - Var GetPayInfoFlag = 0 - Var countDownRetrun = 300 - - Var OpenRouteManTest = 0 - - CoinVending OFF - - - ; Clear value - Topping "clear" "-" - - - Var DirImage = "ROOT/taobin_project/image/page2_inter/" - - Var StrawAutoRelease1 = "false" - Var StrawAutoRelease2 = "false" - - - Var SELLONLINE = 0 - If SELLSTATUS = "SELLONLINE" Then - Var SELLONLINE = 1 - EndIf - If SELLSTATUS = "SELLNOCASH" Then - Var SELLONLINE = 1 - EndIf - - - - If SELLONLINE = 1 Then - Var ShowButtonClick2 = "Enable" - Else - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - EndIf - - If SELLONLINE = 1 Then - Var ShowNetworkProblem = "Invisible" - Var ShowNetworkProblemText = "" - - ;GenHashWithTimeStamp QRCODE99x - WEB "ENABLE" - - Else - Var ShowNetworkProblem = "Enable" - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - ;Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด" - - Var QRCODE99 = "" - WEB "DISABLE" - - EndIf - - If RoadShow = "true" Then - Var ShowNetworkProblem = "Invisible" - Var ShowNetworkProblemText = "" - EndIf - - ; 1035 is Coke. - STRCONTAIN "1035" MaterialAvailable CokeUI - - Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" - Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" - - - Var countClick = 0 - - - DEBUGVAR CART_COUNT - - - Var QRCODE99_Y = 1718 - - Var showCart = "Invisible" - If MultiPayEnable = "true" Then - - If CART_COUNT = 1 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart1.png" - Var cart_image_bp = DirImageCart + "/bp_cart1.png" - - Var QRCODE99_Y = 1580 - - EndIf - - If CART_COUNT = 2 Then - Var showCart = "Enable" - Var cart_image_bn = DirImageCart + "/bn_cart2.png" - Var cart_image_bp = DirImageCart + "/bp_cart2.png" - - Var QRCODE99_Y = 1580 - - EndIf - - - - If CART_COUNT = 3 Then - Open "ROOT/taobin_project/xml/page_payment_multi.xml" - EndIf - - EndIf - - If Seeker = "next" Then - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - EndIf - - - If XMLProfile = "taobin_notopup" Then - Var ButtontoTopupMenu = "Disable" - - EndIf - - - Var menu_name_eng_hot = "" - Var menu_desc_eng_hot = "" - Var menu_name_thai_hot = "" - Var menu_desc_thai_hot = "" - - Var menu_name_eng_cold = "" - Var menu_desc_eng_cold = "" - Var menu_name_thai_cold = "" - Var menu_desc_thai_cold = "" - - - Var menu_name_eng_blender = "" - Var menu_desc_eng_blender = "" - Var menu_name_thai_blender = "" - Var menu_desc_thai_blender = "" - - - - - If BoxID = 0 Then - RebootWithCause "BoxID was zero" - EndIf - - - - DEBUGVAR ShowButtonClick2 - - DEBUGVAR MenuKidButtonState - - If EnableMultiInstance = "true" Then - OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/page_catalog.lxml" - EndIf - - - DEBUGVAR $51-03-01-0035.Price - Var PromotionIDCurrentOrder = 0 - RootLayoutVisible 3 "show" - - 1000 - - - ;SAVELOG SoundPlaying - - If countDownRetrun > 0 Then - Var countDownRetrun = countDownRetrun - 1 - EndIf - - If countDownRetrun = 0 Then - If Seeker = "next" Then - RootLayoutVisible 3 "hide" - 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 - - If CheckCupStateDoorCupClose = "" Then - Var buttonRemoveCup = "Enable" - EndIf - - If CheckCupStateDoorCupClose = "done" Then - Var buttonRemoveCup = "Enable" - EndIf - Else - If buttonRemoveCup = "Enable" Then - Var buttonRemoveCup = "Invisible" - EndIf - EndIf - - - Refresh - TimerReset - - - - ;If ChangeStatus = "payout-end" Then - ; Var ChangeOK = 1 - ;EndIf - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99 Then - 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 - - - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - DEBUGVAR LanguageShow - - If LanguageShow = "ENG" Then - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" - EndIf - - 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 - - If LanguageShow = "MYANMAR" Then - Var show_eng = "true" - DEBUGVAR show_eng - EndIf - - Play PlaySoundLag - Var countDownRetrun = 300 - - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 438 - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - - RefreshAll - - - -; back - - - - - 70 - 591 - 940 - 85 - - 000001 - - - - - 70 - 679 - 940 - 85 - - 000002 - - - - - -; menu row 1 - - - - -; menu row 2 - - - - - - - - - - - - -;############################################################### - - - - - - - - - - - - -;############################################################### - - - - - - - - - - - 5 - 1880 - 24 - Center - 1080 - RobotoRegular - 0xFFFFFF - ShowNetworkProblemText - - -; Cart - - - - - DEBUGVAR web_ready - If web_ready = "true" Then - If web_ref = QRCODE99x Then - - 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" - - EndIf - Else - EndIf - - - - - - - - - - - - - - - 0 - 1820 - 100 - 100 - "/mnt/sdcard/coffeevending/wav/click.wav" - SoundVolume - - Var ClickCountMainTe = ClickCountMainTe + 1 - - DEBUGVAR ClickCountMainTe - - If ClickCountMainTe = 2 Then - Var OpenRouteManTest = 1 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - Var ClickCountMainTe = 0 - EndIf - - - - - Var StrawGetMoreState = "Invisible" - Var bg_lidProblem_ST = "Invisible" - Var GetLidButtonState2 = "Enable" - Var bg_lidProblem_ST2 ="Invisible" - - Var EnableGetMoreStrawFileName2 = "Enable" - Var bg_strawProblem_ST2 ="Invisible" - - - - Var StrawGetMoreState = "Invisible" - Var bg_lidProblem_ST = "Enable" - Var GetLidButtonState2 = "Invisible" - Var bg_lidProblem_ST2 ="Enable" - - Var XStraw = 376 - Var EnableGetMoreStrawFileName2 = "Invisible" - Var bg_strawProblem_ST2 ="Enable" - - - - Var MachineState_Result = 0 - Var waitAckPay = 1 - Var BREW_COUNT_DOWN_FROM_APP = "on" - Var CountDownBrewing = 122 - Var MachineStage = "testing" - Var BREW_CNT = 122 - - Var InternationalEnable = 1 - DEBUGVAR InternationalEnable - Var LanguageObjectShow = "Enable" - Var NoLangObjectShow = "Invisible" - - - Var Top2Timeout = 19 - DEBUGVAR CountDownBrewing - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_lid_straw.xml" - -; Initial for jump to page_brewing3.xml - - - - - diff --git a/inter/tha/xml/page_topping_select6.lxml b/inter/tha/xml/page_topping_select6.lxml index a892b255..991226f0 100644 --- a/inter/tha/xml/page_topping_select6.lxml +++ b/inter/tha/xml/page_topping_select6.lxml @@ -1040,6 +1040,27 @@ BackslashNToEnter showdesc CRLFToSpace showname CRLFToSpace showdesc + + If LanguageShow = "ENG" Then + If show_name_len > 24 Then + Var showname = showname + "###size=54" + EndIf + + EndIf + If LanguageShow = "THAI" Then + If show_name_len > 0 Then + Var showname = showname + "###size=68" + EndIf + EndIf + If LanguageShow = "MYANMAR" Then + Var show_eng = "true" + DEBUGVAR show_eng + If show_name_len > 24 Then + Var showname = showname + "###size=54" + EndIf + EndIf + + Var Timeout = 0 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" @@ -7851,6 +7872,24 @@ DEBUGVAR showname DEBUGVAR showdesc + If LanguageShow = "ENG" Then + If show_name_len > 24 Then + Var showname = showname + "###size=54" + EndIf + + EndIf + If LanguageShow = "THAI" Then + If show_name_len > 0 Then + Var showname = showname + "###size=68" + EndIf + EndIf + If LanguageShow = "MYANMAR" Then + Var show_eng = "true" + DEBUGVAR show_eng + If show_name_len > 24 Then + Var showname = showname + "###size=54" + EndIf + EndIf Var Timeout = 0 diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index fe232eff..b4ab6c71 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -1,4 +1,4 @@ - โ ลำดับ Name Name Description Description ร้อน เย็น ปั่น ภาพ ร้อน เย็น ปั่น OverlayTemplate ราคาร้อน ราคาเย็น ราคาปั่น + ลำดับ Name Name Description Description ร้อน เย็น ปั่น ภาพ ร้อน เย็น ปั่น OverlayTemplate ราคาร้อน ราคาเย็น ราคาปั่น Name=recommend,file=page_catalog_group_recommend.skt TAGESP @@ -412,6 +412,8 @@ IGNORE PEPSI MAX - 12-05-02-0062 12-05-03-0062 posi1 Name=Other,file=page_catalog_group_other_other.skt + เป๊ปซี่น้ำแข็ง PEPSI เป๊ปซี่ Pepsi & Ice - 12-05-02-0094 12-05-03-0094 bn_iced_pepsi.png - - - posi1 - #REF! #REF! #REF! #REF! + เซเว่นอัพ 7UP เซเว่นอัพ 7UP & Ice - 12-05-02-0095 - bn_iced_7up.png - - - posi2 - #REF! - #REF! #REF! เต่าทรงพลังโซดา TAO POWER \nDRINK SODA เครื่องดื่มเต่าทรงพลัง โซดา \n(มีคาเฟอีน) Medicine drink, Soda & Ice - 12-05-02-0035 12-05-03-0035 bn_iced_energy_drink_soda.png - - - posi1 - #REF! #REF! #REF! #REF! เมล่อนโซดา MELON SODA น้ำเชื่อมเมล่อน โซดา \nและน้ำแข็ง Melon Syrup, Soda, Ice - 12-05-02-0044 - bn_iced_melon_soda.png - - - posi1 - #REF! - #REF! #REF! ยูซุโซดา YUZU SODA น้ำเชื่อมยูซุ โซดา \nและน้ำแข็ง Yuzu Syrup, Soda, Ice - 12-05-02-0045 - bn_iced_yuzu_soda.png - - - posi1 - #REF! - #REF! #REF! diff --git a/video/script1.ev b/video/script1.ev index b66b689d..658ac796 100644 --- a/video/script1.ev +++ b/video/script1.ev @@ -62,7 +62,9 @@ If brewing_adv17_size = 10348323 Then Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page/bn_main_page_member.png" Var img_reset_topup = "ROOT/taobin_project/image/main_page/bn_main_page_topup.png" - Var EventTurnOn = 1 + + Var EventTurnOn = 1 + DEBUGVAR img_rest_main_page EndIf EndIf @@ -71,6 +73,7 @@ EndIf If EventTurnOn = 1 Then Var CountDownShowButton = 0 + Var ShowButtonClick = "Enable" Var ShowButtonClickFull = "Invisible" EndIf diff --git a/video/sync_1.file b/video/sync_1.file index e682c903..ba9577ad 100644 --- a/video/sync_1.file +++ b/video/sync_1.file @@ -1,4 +1,4 @@ -total 204896 +total 204856 -rw-rw---- 1 root sdcard_rw 9800005 2024-10-10 14:37 brewing_adv11.mp4 -rw-rw---- 1 root sdcard_rw 9415247 2024-10-08 14:40 brewing_adv12.mp4 -rw-rw---- 1 root sdcard_rw 4223917 2024-11-01 10:02 brewing_adv13.mp4 @@ -30,11 +30,11 @@ total 204896 -rw-rw---- 1 root sdcard_rw 42967 2024-07-19 18:16 brewing_txt_adv4_en.png -rw-rw---- 1 root sdcard_rw 17402219 2024-07-16 14:21 main_page.mp4 -rw-rw---- 1 root sdcard_rw 10634530 2024-10-29 11:51 main_page_event.mp4 --rw-rw---- 1 root sdcard_rw 2138 2024-11-21 18:32 script1.ev +-rw-rw---- 1 root sdcard_rw 2202 2024-11-26 09:19 script1.ev -rw-rw---- 1 root sdcard_rw 288 2024-07-24 21:21 script2.ev -rw-rw---- 1 root sdcard_rw 210 2024-11-10 09:20 script3_brew.ev -rw-rw---- 1 root sdcard_rw 9326 2024-11-21 18:13 script3_first_brewing.ev --rw-rw---- 1 root sdcard_rw 0 2024-11-25 18:42 sync_1.file +-rw-rw---- 1 root sdcard_rw 0 2024-11-21 10:01 sync_1.file -rw-rw---- 1 root sdcard_rw 4806758 2023-09-18 18:44 taobin_save_world1.mp4 -rw-rw---- 1 root sdcard_rw 6428830 2023-09-18 18:44 taobin_save_world2.mp4 -rw-rw---- 1 root sdcard_rw 4634942 2023-09-18 18:44 taobin_save_world3.mp4 diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml index 723491f3..7cd5fff9 100644 --- a/xml/menu_catalog_default_init.xml +++ b/xml/menu_catalog_default_init.xml @@ -109,3 +109,14 @@ ; + + + RootLayoutVisible 3 "hide" + RootLayoutVisible 13 "hide" + + + + + + + diff --git a/xml/menu_catalog_new.xml b/xml/menu_catalog_new.xml index 1f58e05b..1196956d 100644 --- a/xml/menu_catalog_new.xml +++ b/xml/menu_catalog_new.xml @@ -195,8 +195,7 @@ SAVELOG "Click rec" Var NextPage = "-" - - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" @@ -210,8 +209,18 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" + + + If EnableMultiInstance = "true" Then + + TabMenuVisibleInst 2 + Var OpenFileXML = CountryRootPath + "/xml/multi/page_instance2.xml" + + OpenInst 2 OpenFileXML + Else + Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" + EndIf @@ -224,10 +233,14 @@ SoundVolume Var NextPage = "-" - If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" + If EnableMultiInstance = "true" Then + + TabMenuVisibleInst 3 + Var OpenFileXML = CountryRootPath + "/xml/multi/page_instance2.xml" + + OpenInst 2 OpenFileXML Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" EndIf @@ -242,11 +255,14 @@ SoundVolume Var NextPage = "-" - If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" + + If EnableMultiInstance = "true" Then + TabMenuVisibleInst 4 + Var OpenFileXML = CountryRootPath + "/xml/multi/page_instance2.xml" + + OpenInst 2 OpenFileXML Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" - + Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" EndIf @@ -261,10 +277,13 @@ SoundVolume Var NextPage = "-" - If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" + If EnableMultiInstance = "true" Then + TabMenuVisibleInst 5 + Var OpenFileXML = CountryRootPath + "/xml/multi/page_instance2.xml" + + OpenInst 2 OpenFileXML Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_whey.xml" EndIf @@ -278,11 +297,14 @@ SoundVolume Var NextPage = "-" - If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" + If EnableMultiInstance = "true" Then + TabMenuVisibleInst 5 + Var OpenFileXML = CountryRootPath + "/xml/multi/page_instance2.xml" + + OpenInst 2 OpenFileXML Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" + EndIf @@ -297,7 +319,14 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" + If EnableMultiInstance = "true" Then + TabMenuVisibleInst 5 + Var OpenFileXML = CountryRootPath + "/xml/multi/page_instance2.xml" + + OpenInst 2 OpenFileXML + Else + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.xml" + EndIf @@ -311,7 +340,14 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" + If EnableMultiInstance = "true" Then + TabMenuVisibleInst 5 + Var OpenFileXML = CountryRootPath + "/xml/multi/page_instance2.xml" + + OpenInst 2 OpenFileXML + Else + Open "ROOT/taobin_project/xml/page_catalog_group_health.xml" + EndIf @@ -324,54 +360,58 @@ SoundVolume Var NextPage = "-" - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.xml" + If EnableMultiInstance = "true" Then + TabMenuVisibleInst 5 + Var OpenFileXML = CountryRootPath + "/xml/multi/page_instance2.xml" + + OpenInst 2 OpenFileXML + Else + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.xml" + EndIf + + - - - - + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เป๊ปซี่น้ำแข็ง" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เป๊ปซี่ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "PEPSI" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "Pepsi & Ice" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0094.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0094.Button + StringFmt( $12-05-02-0094.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + $12-05-03-0094.Button + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-03-0094.Button + StringFmt( $12-05-03-0094.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum12050200941205030094 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0094.TAG tag2_is_disable + STRCONTAIN "ERR" $12-05-03-0094.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum12050200941205030094 + text_unavailable + center-vertical-horizontal + + + ; - - - + ; ==================> Len = 17 + ; - 12-05-02-0095 - + + 33 + 22 + 225 + 296 + Flag( 12-05-02-0095.Button,$Sum1205020095) + + + 16 + 164 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + "เซเว่นอัพ" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + "เซเว่นอัพ " + + + 16 + 164 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + "7UP" + + + 16 + 220 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + "7UP & Ice" + + + 16 + 264 + Var( DirImage2 + "option_deactive.png" ) + + + 16 + 264 + "Invisible" + Var( DirImage2 + "hot.png" ) + Var( DirImage2 + "hot_db.png" ) + + + 50 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + Var( DirImage2 + "cold.png" ) + Var( DirImage2 + "cold_db.png" ) + $12-05-02-0095.Button + + + 115 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitMediumTTF + 0x6F5F51 + 0xEAE6E1 + $12-05-02-0095.Button + StringFmt( $12-05-02-0095.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 146 + 264 + Var( DirImage2 + "blend.png" ) + Var( DirImage2 + "blend_db.png" ) + "Invisible" + + + 180 + TextPriceMenuY + TextPriceMenuSize + 220 + KanitRegularTTF + 0x6F5F51 + 0xEAE6E1 + "Invisible" + StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + + + 81 + 264 + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" + + + 49 + 117 + + eval( + If $Sum1205020095 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $12-05-02-0095.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" + + + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1205020095 + text_unavailable + center-vertical-horizontal + + + ; - - - ; ==================> Len = 17 ; - 12-05-02-0035 12-05-03-0035 diff --git a/xml/page_catalog_group_pro_15THB.xml b/xml/page_catalog_group_pro_15THB.xml index 5484aaad..bce7f5d1 100644 --- a/xml/page_catalog_group_pro_15THB.xml +++ b/xml/page_catalog_group_pro_15THB.xml @@ -120,6 +120,17 @@ + + RootLayoutVisible 3 "hide" + RootLayoutVisible 13 "hide" + + + + + + + + Var Menu1Selected = "PressForever" diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml index 52b1d8d7..9b378edc 100644 --- a/xml/page_catalog_group_songkran.xml +++ b/xml/page_catalog_group_songkran.xml @@ -120,6 +120,17 @@ + + RootLayoutVisible 3 "hide" + RootLayoutVisible 13 "hide" + + + + + + + + diff --git a/xml_main/startup.xml b/xml_main/startup.xml index efdb9c1e..3874502e 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "9.21" - Var XMLPageVersionInt = 921 + Var XMLPageVersion = "9.22" + Var XMLPageVersionInt = 922 ;Oreo Var OreoGuarantee = 0