From c7801db5910e98c1b44c457eddfc35e8d93c246e Mon Sep 17 00:00:00 2001 From: Kenta420 Date: Tue, 10 Oct 2023 17:35:41 +0700 Subject: [PATCH] update name --- menu/new-layout.tsv | 13 +- xml/page_catalog_group_pro_pepween.xml | 1125 ++++++++++++------------ 2 files changed, 579 insertions(+), 559 deletions(-) diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv index bb928a91..17d8959a 100644 --- a/menu/new-layout.tsv +++ b/menu/new-layout.tsv @@ -395,7 +395,7 @@ Name=pepween,file=page_catalog_group_pro_pepween.skt คุณยายท้ายหมู่บ้าน The Haunting\nHag of village เป๊ปซี่ น้ำเชื่อมบ๊วย ผงชาไทย และโซดา Pepsi, Plum, Thai Tea and Soda - 12-99-05-0062 - bn_haunting_hag_of_village.png - - - อาถรรพ์คืนวันพุธ Midnight's Enigma เป๊ปซี่ น้ำเชื่อมบ๊วย ผงมะนาว และโซดา Pepsi Plum Lime and Soda - 12-99-05-0064 - bn_midnight_enigma.png - - - ล้า ท้า หลอน Unbelievers' Demise เป๊ปซี่ ชามะลิ น้ำเชื่อมเมล่อน และโซดา Pepsi Jasmine Melon and Soda - 12-99-05-0065 - bn_unbelievers_demise.png - - - - ดิน 7 ป่าช้า 7 Haunted Woods ? (เป๊ปซี่ นม และโอริโอ้ ) ? (pepsi oreo) - - 12-99-03-0066 bn_haunted_woods.png - - - + ดิน 7 ป่าช้า 7 Haunted Woods เป๊ปซี่ นม และโอริโอ้ Pepsi oreo - - 12-99-03-0066 bn_haunted_woods.png - - - @@ -410,6 +410,7 @@ Name=CockTail,file=page_catalog_group_cocktail.skt Biofuel Biofuel Strawberry syrup, Pineaple \njuice Ice, Malibu Strawberry syrup, Pineaple \njuice Ice, Malibu - 11-99-05-0008 - bn_Alcohol_Long_Night.png - - - - #N/A - #N/A #N/A Coal Story Bro Coal Story Bro Black sugar syrup, Milk, Ice, \nMount Gay Rum Black sugar syrup, Milk, Ice, \nMount Gay Rum - 11-99-05-0009 - bn_Alcohol_Good_Night_Kiss.png - - - - #N/A - #N/A #N/A Bangkok\nUnderwater Bangkok\nUnderwater Lychee juice, Pineaple juice, \nIce, Mount Gay Rum Lychee juice, Pineaple juice, \nIce, Mount Gay Rum - 11-99-05-0010 - bn_Alcohol_Forever_Love.png - - - - #N/A - #N/A #N/A + Druzhba Pipe Druzhba Pipe Blue lable, soda Blue lable, soda - 11-99-05-0012 - bn_iced_soda_blue.png - - - - #N/A - #N/A #N/A 2050 2050 Blue lable, water Blue lable, water - 11-99-05-0013 - bn_iced_blue.png - - - - #N/A - #N/A #N/A Petrol Fumes Petrol Fumes Gold lable, soda Gold lable, soda - 11-99-05-0017 - bn_iced_soda_gold.png - - - @@ -419,6 +420,16 @@ Name=CockTail,file=page_catalog_group_cocktail.skt + + + + + + + + + + Name=Obsolete,file=page_obsolete.skt นมมะม่วง MANGO MILK นม น้ำเชื่อมมะม่วง Milk, Mango Syrup, & 12-03-02-0007 - - bn_Mango_milk.png ฿40.00 - - NN NN nUll nUll nUll nUll 12-04-02-0012 - - - #N/A - - #N/A NN diff --git a/xml/page_catalog_group_pro_pepween.xml b/xml/page_catalog_group_pro_pepween.xml index 4a5ebf7e..6adf0374 100644 --- a/xml/page_catalog_group_pro_pepween.xml +++ b/xml/page_catalog_group_pro_pepween.xml @@ -1,542 +1,551 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - If show_eng = "true" Then - Var showthaiText = "Invisible" - Var showengText = "Enable" - Var DirImage = "ROOT/taobin_project/image/page3_en" - Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" - - Var ice_tab_text = "Ice will be ready at " - Var text_unavailable = "UNAVAILABLE###size=16" - - - Else - Var showengText = "Invisible" - Var showthaiText = "Enable" - - Var DirImage = "ROOT/taobin_project/image/page3" - Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" - - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var text_unavailable = "หมด###size=32" - EndIf - - 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 - - - ; SpiralOnline - - Var MenuVSelected2 = "Invisible" - - Var Menu1Selected2 = "Invisible" - Var Menu2Selected2 = "Invisible" - Var Menu3Selected2 = "Invisible" - Var Menu4Selected2 = "Invisible" - - Var Menu6Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var MenuVSelected2 = "Invisible" - Var Menu11Selected2 = "Invisible" - - Var Menu21Selected2 = "Invisible" - - Var MenuVSelected2 = "Invisible" - If SpiralOnline = "true" Then - If Seeker = "curr" Then - Var MenuVSelected2 = "Enable" - EndIf - EndIf - - ; init default - Var Menu1Selected = "Enable" - Var Menu2Selected = "Enable" - Var Menu3Selected = "Enable" - Var Menu4Selected = "Enable" - ; 5 fruit - Var Menu5Selected = "Invisible" - Var Menu6Selected = "Enable" - Var Menu7Selected = "Enable" - ; 8 cocktail - Var Menu8Selected = "Invisible" - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - Var Menu8Selected = "Enable" - EndIf - - - If AppFastEnable = "true" Then - Var Menu11Selected = "Enable" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Invisible" - Else - If MenuKidEnable = "true" Then - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Enable" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu21Selected = "Invisible" - Var Menu7Selected = "Enable" - EndIf - EndIf - - If CocktailShow = "true" Then - Var Menu7Selected = "Invisible" - EndIf - - If RecipeTag1 = "HealthTurnOn" Then - Var Menu22Selected = "Enable" - Else - Var Menu22Selected = "Invisible" - EndIf - ; - - - Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween_fixed.xml" - - - DEBUGVAR SystemTimeHourInt - If SystemTimeHourInt >= 19 Then - Var Haunted7price = 30 - Var Haunted7Image = "ROOT/taobin_project/image/page_drink_n//bn_haunted_woods_50.png" - Var Haunted7ImagePress = "ROOT/taobin_project/image/page_drink_press_n//bn_haunted_woods_50.png" - Var Haunted7ImageDisable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_haunted_woods_50.png" - Else - If SystemTimeHourInt < 5 Then - Var Haunted7price = 30 - Var Haunted7Image = "ROOT/taobin_project/image/page_drink_n//bn_haunted_woods_50.png" - Var Haunted7ImagePress = "ROOT/taobin_project/image/page_drink_press_n//bn_haunted_woods_50.png" - Var Haunted7ImageDisable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_haunted_woods_50.png" - Else - Var Haunted7price = $12-99-03-0066.Price - Var Haunted7Image = "ROOT/taobin_project/image/page_drink_n//bn_haunted_woods.png" - Var Haunted7ImagePress = "ROOT/taobin_project/image/page_drink_press_n//bn_haunted_woods.png" - Var Haunted7ImageDisable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_haunted_woods.png" - EndIf - EndIf - - - Var Timeout = 0 - - - - If show_eng = "true" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" - - Else - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - EndIf - - - - - -; notice enable heathy menu - - - 0 - 380 - 1080 - 1540 - "0xeae6e1" - - - - - 1000 - - ;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 - - - If NextPage = "-" Then - - Else - If CupOnArm = "true" Then - If Timeout > 9 Then - SAVELOG "COA9" - Open NextPage - EndIf - Else - If Timeout > 30 Then - SAVELOG "COA30" - Open NextPage - EndIf - EndIf - EndIf - - If Timeout > 60 Then - SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - SAVELOG "Back" - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - If BrewCommand = "RefreshAll" Then - Var BrewCommand = "-" - Open CurrentXMLFileName2 - EndIf - - If Seeker = "curr" Then - If DoorCupPosition = "bottom" Then - ; It normal - Var EmergencyStop = "false" - Else - Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" - - EndIf - EndIf - - If IgnoreNetCore = "true" Then - - Else - ;stop_now - - EndIf - - - ; zone cup on arm - If CupOnArm = "true" Then - - If CheckCupStateDoorCupClose = "" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - - If CheckCupStateDoorCupClose = "done" Then - If buttonRemoveCup = "Enable" Then - - Else - Refresh - EndIf - - Var buttonRemoveCup = "Enable" - - EndIf - Else - If buttonRemoveCup = "Enable" Then - Var buttonRemoveCup = "Invisible" - Refresh - EndIf - EndIf - - - Var Timeout = Timeout + 1 - TimerReset - - - -; under line - - 0 - 494 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 358 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - -; - - 1080 - "auto" - 0 - 395 - - "Enable" - 896 - 102 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - - - - - + + + + "Enable" + 1080 + 1920 +; "0xeae6e1" + SoundVolume + + ; On open + Var NextPage = "-" + + DEBUGVAR ICE_PROCESS_STATUS + DEBUGVAR ICE_PROCESS_TXT + + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png" + + Var ice_tab_text = "Ice will be ready at " + Var text_unavailable = "UNAVAILABLE###size=16" + + + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png" + + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var text_unavailable = "หมด###size=32" + EndIf + + 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 + + + ; SpiralOnline + + Var MenuVSelected2 = "Invisible" + + Var Menu1Selected2 = "Invisible" + Var Menu2Selected2 = "Invisible" + Var Menu3Selected2 = "Invisible" + Var Menu4Selected2 = "Invisible" + + Var Menu6Selected2 = "Invisible" + Var Menu7Selected2 = "Invisible" + Var MenuVSelected2 = "Invisible" + Var Menu11Selected2 = "Invisible" + + Var Menu21Selected2 = "Invisible" + + Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + If Seeker = "curr" Then + Var MenuVSelected2 = "Enable" + EndIf + EndIf + + ; init default + Var Menu1Selected = "Enable" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + ; 5 fruit + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + ; 8 cocktail + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + + If AppFastEnable = "true" Then + Var Menu11Selected = "Enable" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Invisible" + Else + If MenuKidEnable = "true" Then + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Enable" + Var Menu7Selected = "Invisible" + Else + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu7Selected = "Enable" + EndIf + EndIf + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + EndIf + + If RecipeTag1 = "HealthTurnOn" Then + Var Menu22Selected = "Enable" + Else + Var Menu22Selected = "Invisible" + EndIf + ; + + + + + Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween_fixed.xml" + + Var NightTime = 0 + + If SystemTimeHourInt >= 19 Then + Var NightTime = 1 + Else + If SystemTimeHourInt < 5 Then + Var NightTime = 1 + Else + Var NightTime = 0 + EndIf + EndIf + + + DEBUGVAR SystemTimeHourInt + If NightTime = 1 Then + Var Haunted7price = 30 + Var Haunted7PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n//bn_haunted_woods_50.png" + Var Haunted7Image = "ROOT/taobin_project/image/page_drink_n//bn_haunted_woods_50.png" + Var Haunted7ImagePress = "ROOT/taobin_project/image/page_drink_press_n//bn_haunted_woods_50.png" + Var Haunted7ImageDisable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_haunted_woods_50.png" + Else + Var Haunted7price = $12-99-03-0066.Price + Var Haunted7PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n//bn_haunted_woods.png" + Var Haunted7Image = "ROOT/taobin_project/image/page_drink_n//bn_haunted_woods.png" + Var Haunted7ImagePress = "ROOT/taobin_project/image/page_drink_press_n//bn_haunted_woods.png" + Var Haunted7ImageDisable = "ROOT/taobin_project/image/page_drink_disable_n2//bn_haunted_woods.png" + EndIf + + + Var Timeout = 0 + + + + If show_eng = "true" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" + + Else + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + EndIf + + + + + +; notice enable heathy menu + + + 0 + 380 + 1080 + 1540 + "0xeae6e1" + + + + + 1000 + + ;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 + + + If NextPage = "-" Then + + Else + If CupOnArm = "true" Then + If Timeout > 9 Then + SAVELOG "COA9" + Open NextPage + EndIf + Else + If Timeout > 30 Then + SAVELOG "COA30" + Open NextPage + EndIf + EndIf + EndIf + + If Timeout > 60 Then + SAVELOG "Timeout" + If Seeker = "next" Then + Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + Else + SAVELOG "Back" + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + If Seeker = "curr" Then + If DoorCupPosition = "bottom" Then + ; It normal + Var EmergencyStop = "false" + Else + Var EmergencyStop = "true" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + EndIf + EndIf + + If IgnoreNetCore = "true" Then + + Else + ;stop_now + + EndIf + + + ; zone cup on arm + If CupOnArm = "true" Then + + If CheckCupStateDoorCupClose = "" Then + If buttonRemoveCup = "Enable" Then + + Else + Refresh + EndIf + + Var buttonRemoveCup = "Enable" + + EndIf + + If CheckCupStateDoorCupClose = "done" Then + If buttonRemoveCup = "Enable" Then + + Else + Refresh + EndIf + + Var buttonRemoveCup = "Enable" + + EndIf + Else + If buttonRemoveCup = "Enable" Then + Var buttonRemoveCup = "Invisible" + Refresh + EndIf + EndIf + + + Var Timeout = Timeout + 1 + TimerReset + + + +; under line + + 0 + 494 + "ROOT/taobin_project/image/page3/tab_line_bottom.png" + + + +; under line + + 0 + 358 + "ROOT/taobin_project/image/page3/bg1.png" + + + +; back + + + + +; + + 1080 + "auto" + 0 + 395 + + "Enable" + 896 + 102 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + + + + + 10 497 @@ -1154,7 +1163,7 @@ KanitMediumTTF 0xFFFFFF showengText - "Mysterious + "Mysterious music box" @@ -1382,7 +1391,7 @@ music box" KanitMediumTTF 0xFFFFFF showthaiText - "หมอกควัน + "หมอกควัน แห่งความมืด" @@ -1652,7 +1661,7 @@ music box" KanitMediumTTF 0xFFFFFF showengText - "The Haunting of + "The Haunting of the Past" @@ -2128,7 +2137,7 @@ the Past" KanitMediumTTF 0xFFFFFF showthaiText - "ห้องเชือด + "ห้องเชือด หมายเลข 13" @@ -2894,7 +2903,7 @@ the Past" KanitMediumTTF 0xFFFFFF showengText - "The Haunting + "The Haunting Hag of village" @@ -3540,21 +3549,21 @@ Hag of village" Flag( 12-99-03-0066.Button,$Sum1299030066) - - - - - + + + + +