From ba9c746d3e246143b921d1ba641b256333e8bb95 Mon Sep 17 00:00:00 2001 From: Pakin Date: Mon, 21 Oct 2024 16:48:33 +0700 Subject: [PATCH] fix bug run.ev not run & update mys desc --- inc/video.inc | 14 +- inter/mys/xml/event/event_profile.ev | 16 +- .../script_common_for_open_promotion_xml.ev | 6 +- inter/mys/xml/event/tricker.ev | 14 +- inter/mys/xml/page_catalog_group_forkid.lxml | 4 +- .../xml/page_catalog_group_fruity_raya.lxml | 4 +- inter/mys/xml/page_catalog_group_milk.lxml | 1272 ++++++++--------- xml/page_board.xml | 6 +- 8 files changed, 676 insertions(+), 660 deletions(-) diff --git a/inc/video.inc b/inc/video.inc index db659618..973a173a 100644 --- a/inc/video.inc +++ b/inc/video.inc @@ -18,7 +18,7 @@ Var DefaultLargeBanner = PepsiLargeBanner Var DefaultNormBanner = PepsiNormBanner EndIf - + If showMultiAds = "true" Then @@ -47,7 +47,7 @@ If CountDownPauseVideo2 = -1 Then Var CountDownPauseVideo2 = 0 EndIf - + ; Default. Do not edit here. Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] @@ -103,7 +103,7 @@ If ProReducedPriceEnable = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" EndIf If UseSlideShowVideo = 1 Then @@ -198,7 +198,7 @@ If ProReducedPriceEnable = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" EndIf If UseSlideShowVideo = 1 Then @@ -238,7 +238,7 @@ DEBUGVAR a_video_menu[ads_idx] Var ads_idx = 0 EndIf - + ; Default. Do not edit here. Var AdvTaobinMenu = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_" + a_video_menu[ads_idx] Var DisplayAds = AdvTaobinMenu + ".mp4" @@ -297,7 +297,7 @@ If ProReducedPriceEnable = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" EndIf If UseSlideShowVideo = 1 Then @@ -355,7 +355,7 @@ Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_23.mp4" EndIf - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then Var DisplayAds = "/mnt/sdcard/coffeevending/taobin_project/inter/mys/adv/taobin_adv_menu_24.mp4" EndIf diff --git a/inter/mys/xml/event/event_profile.ev b/inter/mys/xml/event/event_profile.ev index 12da7f98..d3bcc8bf 100644 --- a/inter/mys/xml/event/event_profile.ev +++ b/inter/mys/xml/event/event_profile.ev @@ -7,14 +7,14 @@ STRCONTAIN "PromoReduced" XMLProfile IsProfileReduce DEBUGVAR HasProYuzu250Concat DEBUGVAR ProReducedPriceEnable -DEBUGVAR ProYuzu250Enable +DEBUGVAR IgnoreProfileFromRunEV If ProReducedPriceEnable = 1 Then Else DEBUGVAR "Case pro reduce end" ; case-pro-reduce-end - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then DEBUGVAR "Pro yuzu ongoing" ; concat-profile If HasProYuzu250Concat = "true" Then @@ -32,6 +32,12 @@ Else DEBUGVAR XMLProfilePreEvent Var XMLProfile = XMLProfilePreEvent + "-" Var XMLProfile = XMLProfile + "PromoYuzu250" + + ; case-local-profile + If XMLProfile = "Discount50-PromoYuzu250" Then + DEBUGVAR "Restore Discount50 profile, also concat Yuzu" + Var XMLProfile = "NoDis50ForProYuzu25" + EndIf EndIf Else @@ -40,6 +46,12 @@ Else Var XMLProfile = XMLProfile + "-" Var XMLProfile = XMLProfile + "PromoYuzu250" + + ; case-local-profile + If XMLProfile = "Discount50-PromoYuzu250" Then + DEBUGVAR "No pro reduce but Discount50, concat pro yuzu" + Var XMLProfile = "NoDis50ForProYuzu25" + EndIf EndIf EndIf Else diff --git a/inter/mys/xml/event/script_common_for_open_promotion_xml.ev b/inter/mys/xml/event/script_common_for_open_promotion_xml.ev index 899bc931..3bc27fe0 100644 --- a/inter/mys/xml/event/script_common_for_open_promotion_xml.ev +++ b/inter/mys/xml/event/script_common_for_open_promotion_xml.ev @@ -5,12 +5,12 @@ DEBUGVAR FruityRayaEnable DEBUGVAR ProThaiTeaEnable DEBUGVAR ProYuzuEnable -DEBUGVAR ProYuzu250Enable +DEBUGVAR IgnoreProfileFromRunEV If OpenFromPageBoard = 1 Then ; has-ongoing-pro - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml" Var OpenFromPageBoard = 0 @@ -20,7 +20,7 @@ If OpenFromPageBoard = 1 Then Else ; has-ongoing-pro - If ProYuzu250Enable = 1 Then + If IgnoreProfileFromRunEV = 1 Then OpenInst 2 "ROOT/taobin_project/inter/mys/xml/event/promotion_yuzu_250.lxml" Var OpenFromPageBoard = 0 diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev index f84d0c42..768ea340 100644 --- a/inter/mys/xml/event/tricker.ev +++ b/inter/mys/xml/event/tricker.ev @@ -21,7 +21,7 @@ Var ProYuzuEnable = 0 Var FromProYuzu = 0 ; Yuzu Promo -Var ProYuzu250Enable = 0 +Var IgnoreProfileFromRunEV = 0 Var FromProYuzu250 = 0 @@ -63,7 +63,7 @@ If SystemDateMonthInt = 10 Then Var ProReducedPriceEnable = 1 EndIf - Var ProYuzu250Enable = 1 + Var IgnoreProfileFromRunEV = 1 EndIf If SystemDateMonthInt = 11 Then @@ -71,11 +71,11 @@ If SystemDateMonthInt = 11 Then Var ProReducedPriceEnable = 1 EndIf - Var ProYuzu250Enable = 1 + Var IgnoreProfileFromRunEV = 1 EndIf If SystemDateMonthInt = 12 Then - Var ProYuzu250Enable = 1 + Var IgnoreProfileFromRunEV = 1 If SetProReduceByBO = 1 Then Var ProReducedPriceEnable = 0 @@ -85,9 +85,9 @@ EndIf If SystemDateMonthInt = 1 Then If SystemDateDayInt < 16 Then - Var ProYuzu250Enable = 1 + Var IgnoreProfileFromRunEV = 1 Else - Var ProYuzu250Enable = 0 + Var IgnoreProfileFromRunEV = 0 EndIf EndIf @@ -114,7 +114,7 @@ If BoxID = 177746 Then Var UseSlideShowVideo = 0 ;Var ProReducedPriceEnable = 0 - ;Var ProYuzu250Enable = 1 + ;Var IgnoreProfileFromRunEV = 1 EndIf If BoxID = 210037 Then diff --git a/inter/mys/xml/page_catalog_group_forkid.lxml b/inter/mys/xml/page_catalog_group_forkid.lxml index d4e5ad74..b9cff860 100644 --- a/inter/mys/xml/page_catalog_group_forkid.lxml +++ b/inter/mys/xml/page_catalog_group_forkid.lxml @@ -2353,11 +2353,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE STRAWKOKO" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Milk, Mango Syrup, and Iced" + Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup" Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Susu, Sirap Mangga, Ais" + Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" diff --git a/inter/mys/xml/page_catalog_group_fruity_raya.lxml b/inter/mys/xml/page_catalog_group_fruity_raya.lxml index 01627d8c..42d65163 100644 --- a/inter/mys/xml/page_catalog_group_fruity_raya.lxml +++ b/inter/mys/xml/page_catalog_group_fruity_raya.lxml @@ -2876,11 +2876,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE STRAWKOKO" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Milk, Mango Syrup, and Iced" + Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup" Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Susu, Sirap Mangga, Ais" + Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" diff --git a/inter/mys/xml/page_catalog_group_milk.lxml b/inter/mys/xml/page_catalog_group_milk.lxml index e19d6eff..b43a7c00 100644 --- a/inter/mys/xml/page_catalog_group_milk.lxml +++ b/inter/mys/xml/page_catalog_group_milk.lxml @@ -1,625 +1,625 @@ - - - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - ; On open - Var NextPage = "-" - - DEBUGVAR ICE_PROCESS_STATUS - DEBUGVAR ICE_PROCESS_TXT - - - DEBUGVAR LanguageShow - DEBUGVAR CountryName - - If LanguageShow = "ENG" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" - 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 - If LanguageShow = "THAI" Then - Var DirImage2 = "ROOT/taobin_project/image/drink_option/" - Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" - Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " - Var DirImage = "ROOT/taobin_project/image/page3" - 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_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 - - - 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 - ; - - - - Var Menu4Selected = "PressForever" - - SAVELOG PreviseXMLFileName2 - - 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 - If NETCORE_LOST_CNT > 120 Then - Var stop_now = "true" - Var MachineErrorDetailAll = "???" - SAVELOG "NETCORE_LOST_CNT" - - Open "ROOT/taobin_project/xml/page_back_to_error.xml" - EndIf - EndIf - - Var Timeout = Timeout + 1 - TimerReset - - - - 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 - ;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 - - SAVELOG "EventLanguageOnChange menu -list" - - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 400 - - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 430 - 38 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - - RefreshAll - - - -; 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 940 - 462 - 22 - 170 - 30 - KanitMediumTTF - 0x6F5F51 - PriceUnitText - - - - - 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 + + + DEBUGVAR LanguageShow + DEBUGVAR CountryName + + If LanguageShow = "ENG" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" + 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 + If LanguageShow = "THAI" Then + Var DirImage2 = "ROOT/taobin_project/image/drink_option/" + Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" + Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " + Var DirImage = "ROOT/taobin_project/image/page3" + 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_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 + + + 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 + ; + + + + Var Menu4Selected = "PressForever" + + SAVELOG PreviseXMLFileName2 + + 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 + If NETCORE_LOST_CNT > 120 Then + Var stop_now = "true" + Var MachineErrorDetailAll = "???" + SAVELOG "NETCORE_LOST_CNT" + + Open "ROOT/taobin_project/xml/page_back_to_error.xml" + EndIf + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + + 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 + ;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 + + SAVELOG "EventLanguageOnChange menu -list" + + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 400 + + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 430 - 38 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + + RefreshAll + + + +; 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 940 + 462 + 22 + 170 + 30 + KanitMediumTTF + 0x6F5F51 + PriceUnitText + + + + + 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 @@ -2610,11 +2610,11 @@ Var NameLang[2][3] = "-" Var NameLang[2][4] = "SMOOTHIE STRAWKOKO" Var NameLang[2][5] = "" - Var DescLang[2][0] = "Milk, Mango Syrup, and Iced" + Var DescLang[2][0] = "Milk, Cocoa, Strawberry Syrup" Var DescLang[2][1] = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" Var DescLang[2][2] = "-" Var DescLang[2][3] = "-" - Var DescLang[2][4] = "Susu, Sirap Mangga, Ais" + Var DescLang[2][4] = "Susu, Koko, Sirap Strawberi" Var DescLang[2][5] = "" ; end lang Var PD_STAGE_1 = "Disable2" @@ -7985,15 +7985,15 @@ Open "ROOT/taobin_project/xml/page_payment_multi.xml" - - - - - - - - RefreshAll - - - - + + + + + + + + RefreshAll + + + + diff --git a/xml/page_board.xml b/xml/page_board.xml index 8c417697..e20ff2e7 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1195,7 +1195,11 @@ EndIf EndIf - If ProYuzu250Enable = 0 Then + If IgnoreProfileFromRunEV = "" Then + Var IgnoreProfileFromRunEV = 0 + EndIf + + If IgnoreProfileFromRunEV = 0 Then TRY "ROOT/taobin_project/xml/profile/run.ev" EndIf