diff --git a/inter/tha/.special/RoadShow.ev b/inter/tha/.special/RoadShow.ev index d0a51cfb..42403bac 100644 --- a/inter/tha/.special/RoadShow.ev +++ b/inter/tha/.special/RoadShow.ev @@ -1,5 +1,5 @@ -SAVELOG "RoadShow.ev 173950 172303 EFR02 RoadShowBoxID is 2" +SAVELOG "RoadShow.ev 200559 201876 EFR02 RoadShowBoxID is 1" SAVELOG "4 Apr" @@ -16,10 +16,10 @@ Var RoadShowBoxID = 0 If SystemDateYearInt = 2025 Then ; EFR02 - If BoxID = 173950 Then + If BoxID = 200559 Then Var RoadShowBoxID = 1 EndIf - If BoxID = 172303 Then + If BoxID = 201876 Then Var RoadShowBoxID = 1 EndIf @@ -30,10 +30,10 @@ If SystemDateYearInt = 2025 Then EndIf - If SystemDateMonthInt = 4 Then + If SystemDateMonthInt = 5 Then If RoadShowBoxID = 1 Then - If SystemDateDayInt = 4 Then + If SystemDateDayInt = 14 Then Var RoadShow = "true" Var RoadShowMarketCode = "EFR02" diff --git a/inter/tha/xml/page_help_center.lxml b/inter/tha/xml/page_help_center.lxml index 3510f756..74d4ea69 100644 --- a/inter/tha/xml/page_help_center.lxml +++ b/inter/tha/xml/page_help_center.lxml @@ -39,6 +39,8 @@ Var Problem_Process_State[0] = "Enable" Var Problem_Process_State[1] = "Enable" + Var CurrHelpCenter = 1 + Var Timeout = 0 @@ -47,9 +49,9 @@ DEBUGVAR Timeout - If Timeout > 120 Then + If Timeout > 70 Then SAVELOG "Timeout" - + Var CurrHelpCenter = 0 If BaseOnPageBoard = 1 Then Var BaseOnPageBoard = 0 Var LanguageButtonEnable = "Enable" @@ -120,6 +122,7 @@ SoundVolume + Var CurrHelpCenter = 0 If BaseOnPageBoard = 1 Then Var BaseOnPageBoard = 0 Var LanguageButtonEnable = "Enable" diff --git a/inter/tha/xml/page_help_center_sending.lxml b/inter/tha/xml/page_help_center_sending.lxml index bf9326b1..ba6897d2 100644 --- a/inter/tha/xml/page_help_center_sending.lxml +++ b/inter/tha/xml/page_help_center_sending.lxml @@ -28,7 +28,7 @@ Var Timeout = Timeout + 1 If Timeout > 300 Then - + Var CurrHelpCenter = 0 If MachineStage = "remove-cup" Then OpenInst 2 "ROOT/taobin_project/xml/page_drinkfail3.xml" Else diff --git a/inter/tha/xml/page_instance_empty.lxml b/inter/tha/xml/page_instance_empty.lxml index cc89a786..662fda07 100644 --- a/inter/tha/xml/page_instance_empty.lxml +++ b/inter/tha/xml/page_instance_empty.lxml @@ -7,29 +7,12 @@ RootLayoutVisible 13 "hide" ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" - - Var Timeout = 0 + Var CurrHelpCenter = 0 1000 - DEBUGVAR Timeout - If Timeout > 66 Then - SAVELOG "Timeout" - - TabMenuVisibleInst 99 - - 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 - Var Timeout = Timeout + 1 - - TimerReset diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index 26ad4372..043cb1bb 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml @@ -24,20 +24,6 @@ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/ticket_time_blending.ev" - DEBUGVAR OpenFromPageBoard - If OpenFromPageBoard = 1 Then - Var OpenFromPageBoard = 0 - Var langnext1 = "true" - Var langnext2 = "true" - Var langnext3 = "true" - Var langnext4 = "true" - Var langnext5 = "true" - Var langnext6 = "true" - Var langnext7 = "true" - Var langnext8 = "true" - Var langnext9 = "true" - EndIf - Var NextPage = "-" @@ -163,7 +149,11 @@ If Show_btn_process = "Disable" Then ; do not thing Else - Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 + If CurrHelpCenter = 1 Then + ; do not thing to pause countdown smoothie process + Else + Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1 + EndIf EndIf EndIf If TimeOutSmoothiesProcess = 2 Then diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_2.xml b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml index bc6dd1f6..46d44bae 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process_2.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process_2.xml @@ -94,99 +94,6 @@ Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_3.xml" EndIf - - DEBUGVAR CH9991_Status - DEBUGVAR CH9992_Status - DEBUGVAR CH9993_Status - DEBUGVAR CH9994_Status - - DEBUGVAR HaveCup - DEBUGVAR CupOnArm - DEBUGVAR DoorCupPosition - DEBUGVAR CupChecking - DEBUGVAR CupArmMove - DEBUGVAR buttonRemoveCup - DEBUGVAR SmoothieProcessState - DEBUGVAR AnyArmConfuse - DEBUGVAR SensorDoorCupStatus - - - If CH9992_Status = "READY" Then - - If DoorCupPosition = "bottom" Then - If SmoothieProcessState = "idle" Then - Var TextDoorButtonID = 001202 - Else - If SmoothieProcessState = "insert" Then - Var TextDoorButtonID = 001203 - - Else - - EndIf - EndIf - Else - If DoorCupPosition = "top" Then - Var TextDoorButtonID = 001204 - If SmoothieProcessState = "press" Then - Var SmoothieProcessState = "insert" - EndIf - Else - If SmoothieProcessState = "idle" Then - - Else - If SmoothieProcessState = "press" Then - - Else - Var TextDoorButtonID = 001205 - EndIf - - EndIf - EndIf - EndIf - - - If AnyArmConfuse = 1 Then - If CountDownCertainConfuse > 0 Then - Var CountDownCertainConfuse = CountDownCertainConfuse - 1 - - If CountDownCertainConfuse = 0 Then - Machine DoorClose - EndIf - EndIf - EndIf - Else - - If CH9992_Status = "RUNNING" Then - Var SmoothieProcessState = "blendnow" - EndIf - EndIf - - If SmoothieProcessState = "blendnow" Then - Var TextDoorButtonID = 001206 - - Var SelectDrink = Seeker.selected_a_drink - Var SelectSugarID = "" - - Topping "Select" SelectDrink - - Var SmoothieProcessState = "blending" - - EndIf - - If SmoothieProcessState = "blending" Then - - - Menu "set-name" "Smoothie " - Menu "set-image" Seeker.PictureDrink - - - Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" - - EndIf - - - DEBUGVAR TextDoorButtonID - Refresh TimerReset diff --git a/inter/tha/xml/page_smoothie_suggest_and_process_3.xml b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml index a46e8775..8e74b3dd 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process_3.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process_3.xml @@ -113,23 +113,6 @@ 1000 - - ;SAVELOG SoundPlaying - - DEBUGVAR CH9991_Status - DEBUGVAR CH9992_Status - DEBUGVAR CH9993_Status - DEBUGVAR CH9994_Status - - DEBUGVAR HaveCup - DEBUGVAR CupOnArm - DEBUGVAR DoorCupPosition - DEBUGVAR CupChecking - DEBUGVAR CupArmMove - DEBUGVAR buttonRemoveCup - DEBUGVAR SmoothieProcessState - DEBUGVAR AnyArmConfuse - DEBUGVAR SensorDoorCupStatus DEBUGVAR Timeout @@ -138,79 +121,6 @@ Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf - If CH9992_Status = "READY" Then - - If DoorCupPosition = "bottom" Then - If SmoothieProcessState = "idle" Then - Var TextDoorButtonID = 001202 - Else - If SmoothieProcessState = "insert" Then - Var TextDoorButtonID = 001203 - - Else - - EndIf - EndIf - Else - If DoorCupPosition = "top" Then - Var TextDoorButtonID = 001204 - If SmoothieProcessState = "press" Then - Var SmoothieProcessState = "insert" - EndIf - Else - If SmoothieProcessState = "idle" Then - - Else - If SmoothieProcessState = "press" Then - - Else - Var TextDoorButtonID = 001205 - EndIf - - EndIf - EndIf - EndIf - - - If AnyArmConfuse = 1 Then - If CountDownCertainConfuse > 0 Then - Var CountDownCertainConfuse = CountDownCertainConfuse - 1 - - If CountDownCertainConfuse = 0 Then - Machine DoorClose - EndIf - EndIf - EndIf - Else - - If CH9992_Status = "RUNNING" Then - Var SmoothieProcessState = "blendnow" - EndIf - EndIf - - If SmoothieProcessState = "blendnow" Then - Var TextDoorButtonID = 001206 - - Var SelectDrink = Seeker.selected_a_drink - Var SelectSugarID = "" - - Topping "Select" SelectDrink - - Var SmoothieProcessState = "blending" - - EndIf - - If SmoothieProcessState = "blending" Then - - - Menu "set-name" "Smoothie " - Menu "set-image" Seeker.PictureDrink - - - ;Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml" - - EndIf - Var Timeout = Timeout + 1 Refresh diff --git a/inter/tha/xml/topview_helper.lxml b/inter/tha/xml/topview_helper.lxml index 8093d219..f060d337 100644 --- a/inter/tha/xml/topview_helper.lxml +++ b/inter/tha/xml/topview_helper.lxml @@ -38,8 +38,6 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - - Var CurrHelpCenter = 1 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" diff --git a/xml/page_board.xml b/xml/page_board.xml index 063360f9..fc2daf27 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -2122,34 +2122,40 @@ PRICE "Reset" "-" DEBUGVAR CountryName Var BaseOnPageBoard = 0 - - If InternationalEnable = 1 Then - If CountryName = "Thailand" Then - SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" - Else - ; show language icon - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - RootLayoutVisible 3 "show" - - - Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" - TRY OpenFileXML - EndIf - + + If CurrHelpCenter = 1 Then + ; do not thing when open the helper Else - If BeerTrapEnable = "true" Then - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + Var BaseOnPageBoard = 0 + + If InternationalEnable = 1 Then + If CountryName = "Thailand" Then + SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + Else + ; show language icon + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RootLayoutVisible 3 "show" + + + + Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" + TRY OpenFileXML + EndIf + Else - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + If BeerTrapEnable = "true" Then + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + Else + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + EndIf EndIf - EndIf - Machine DoorClose - - TopView "show" - OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + Machine DoorClose + TopView "show" + OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + EndIf EndIf EndIf @@ -2596,32 +2602,37 @@ PRICE "Reset" "-" Var OpenFromPageBoard = 1 - If InternationalEnable = 1 Then - - If CountryName = "Thailand" Then - SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" - TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev" - Else ; show language icon - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - RootLayoutVisible 3 "show" - - Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" - TRY OpenFileXML - EndIf + If CurrHelpCenter = 1 Then + ; do not thing when open the helper Else + Var BaseOnPageBoard = 0 - If CocktailShow = "true" Then - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + If InternationalEnable = 1 Then + + If CountryName = "Thailand" Then + SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/event/script_common_for_open_promotion_xml.ev" + Else ; show language icon + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RootLayoutVisible 3 "show" + + Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev" + TRY OpenFileXML + EndIf Else - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + + If CocktailShow = "true" Then + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" + Else + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + EndIf EndIf + + Machine DoorClose + + TopView "show" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" EndIf - - Machine DoorClose - - TopView "show" - Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" - diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 5b4813b3..141196b3 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "9.89" - Var XMLPageVersionInt = 989 + Var XMLPageVersion = "9.90" + Var XMLPageVersionInt = 990 Var CurrentMainVideo = 2 diff --git a/xml_main/startup_dev.xml b/xml_main/startup_dev.xml index cbf68e87..5c94a870 100644 --- a/xml_main/startup_dev.xml +++ b/xml_main/startup_dev.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "10.89" - Var XMLPageVersionInt = 1089 + Var XMLPageVersion = "10.90" + Var XMLPageVersionInt = 1090 ;Oreo Var OreoGuarantee = 0