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 bf94f568..00000000 Binary files a/image/main_page/bp_remove_cup-1.png and /dev/null differ diff --git a/inter/tha/xml/multi/menu_catalog_new.lxml b/inter/tha/xml/multi/menu_catalog_new.lxml index 15b92c88..837d74d9 100644 --- a/inter/tha/xml/multi/menu_catalog_new.lxml +++ b/inter/tha/xml/multi/menu_catalog_new.lxml @@ -55,11 +55,13 @@ 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