From d41cf02a3485faad1929c747129db5190a642726 Mon Sep 17 00:00:00 2001 From: worawut Date: Tue, 1 Oct 2024 18:56:06 +0700 Subject: [PATCH] spiralNow --- spiral/xml/page_catalog_group_candies.xml | 25 ++++++++++++++++++--- spiral/xml/page_catalog_group_cookies.xml | 24 ++++++++++++++++++-- spiral/xml/page_catalog_group_drinks.xml | 25 ++++++++++++++++++--- spiral/xml/page_catalog_group_health.xml | 24 ++++++++++++++++++-- spiral/xml/page_catalog_group_noodies.xml | 24 ++++++++++++++++++-- spiral/xml/page_catalog_group_nuts.xml | 25 ++++++++++++++++++--- spiral/xml/page_catalog_group_snacks.xml | 25 ++++++++++++++++++--- spiral/xml/page_catalog_vending_machine.xml | 1 + xml/page_board.xml | 2 ++ xml/page_show_error_spiral.xml | 10 ++++----- 10 files changed, 161 insertions(+), 24 deletions(-) diff --git a/spiral/xml/page_catalog_group_candies.xml b/spiral/xml/page_catalog_group_candies.xml index 1e2c813d..da5861d7 100644 --- a/spiral/xml/page_catalog_group_candies.xml +++ b/spiral/xml/page_catalog_group_candies.xml @@ -126,6 +126,21 @@ Var MenuVSelected2 = "PressForever" Var Timeout = 0 + + If SetSpiralOnline = 1 Then + Var Menu1Selected = "Invisible" + Var Menu2Selected = "Invisible" + Var Menu3Selected = "Invisible" + Var Menu4Selected = "Invisible" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Invisible" + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu22Selected = "Invisible" + Var MenuVSelected2 = "Invisible" + EndIf @@ -206,16 +221,20 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - If SpiralOnline = "true" Then + + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + If SetSpiralOnline = 1 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf - diff --git a/spiral/xml/page_catalog_group_cookies.xml b/spiral/xml/page_catalog_group_cookies.xml index 8526c28b..f1ffbc8b 100644 --- a/spiral/xml/page_catalog_group_cookies.xml +++ b/spiral/xml/page_catalog_group_cookies.xml @@ -126,6 +126,21 @@ Var MenuVSelected2 = "PressForever" Var Timeout = 0 + + If SetSpiralOnline = 1 Then + Var Menu1Selected = "Invisible" + Var Menu2Selected = "Invisible" + Var Menu3Selected = "Invisible" + Var Menu4Selected = "Invisible" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Invisible" + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu22Selected = "Invisible" + Var MenuVSelected2 = "Invisible" + EndIf @@ -206,9 +221,14 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - If SpiralOnline = "true" Then + + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + If SetSpiralOnline = 1 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf diff --git a/spiral/xml/page_catalog_group_drinks.xml b/spiral/xml/page_catalog_group_drinks.xml index 37a173a5..19f1f66c 100644 --- a/spiral/xml/page_catalog_group_drinks.xml +++ b/spiral/xml/page_catalog_group_drinks.xml @@ -126,6 +126,21 @@ Var MenuVSelected2 = "PressForever" Var Timeout = 0 + + If SetSpiralOnline = 1 Then + Var Menu1Selected = "Invisible" + Var Menu2Selected = "Invisible" + Var Menu3Selected = "Invisible" + Var Menu4Selected = "Invisible" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Invisible" + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu22Selected = "Invisible" + Var MenuVSelected2 = "Invisible" + EndIf @@ -206,16 +221,20 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - If SpiralOnline = "true" Then + + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + If SetSpiralOnline = 1 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf - diff --git a/spiral/xml/page_catalog_group_health.xml b/spiral/xml/page_catalog_group_health.xml index 7bfc272a..6f365fa1 100644 --- a/spiral/xml/page_catalog_group_health.xml +++ b/spiral/xml/page_catalog_group_health.xml @@ -126,6 +126,21 @@ Var MenuVSelected2 = "PressForever" Var Timeout = 0 + + If SetSpiralOnline = 1 Then + Var Menu1Selected = "Invisible" + Var Menu2Selected = "Invisible" + Var Menu3Selected = "Invisible" + Var Menu4Selected = "Invisible" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Invisible" + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu22Selected = "Invisible" + Var MenuVSelected2 = "Invisible" + EndIf @@ -206,9 +221,14 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - If SpiralOnline = "true" Then + + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + If SetSpiralOnline = 1 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf diff --git a/spiral/xml/page_catalog_group_noodies.xml b/spiral/xml/page_catalog_group_noodies.xml index baf3504c..bc161adb 100644 --- a/spiral/xml/page_catalog_group_noodies.xml +++ b/spiral/xml/page_catalog_group_noodies.xml @@ -126,6 +126,21 @@ Var MenuVSelected2 = "PressForever" Var Timeout = 0 + + If SetSpiralOnline = 1 Then + Var Menu1Selected = "Invisible" + Var Menu2Selected = "Invisible" + Var Menu3Selected = "Invisible" + Var Menu4Selected = "Invisible" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Invisible" + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu22Selected = "Invisible" + Var MenuVSelected2 = "Invisible" + EndIf @@ -206,9 +221,14 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - If SpiralOnline = "true" Then + + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + If SetSpiralOnline = 1 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf diff --git a/spiral/xml/page_catalog_group_nuts.xml b/spiral/xml/page_catalog_group_nuts.xml index 15f4ccdf..e4ea2619 100644 --- a/spiral/xml/page_catalog_group_nuts.xml +++ b/spiral/xml/page_catalog_group_nuts.xml @@ -126,6 +126,21 @@ Var MenuVSelected2 = "PressForever" Var Timeout = 0 + + If SetSpiralOnline = 1 Then + Var Menu1Selected = "Invisible" + Var Menu2Selected = "Invisible" + Var Menu3Selected = "Invisible" + Var Menu4Selected = "Invisible" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Invisible" + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu22Selected = "Invisible" + Var MenuVSelected2 = "Invisible" + EndIf @@ -206,16 +221,20 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - If SpiralOnline = "true" Then + + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + If SetSpiralOnline = 1 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf - diff --git a/spiral/xml/page_catalog_group_snacks.xml b/spiral/xml/page_catalog_group_snacks.xml index 031a14c7..96319211 100644 --- a/spiral/xml/page_catalog_group_snacks.xml +++ b/spiral/xml/page_catalog_group_snacks.xml @@ -127,6 +127,21 @@ Var Timeout = 0 + + If SetSpiralOnline = 1 Then + Var Menu1Selected = "Invisible" + Var Menu2Selected = "Invisible" + Var Menu3Selected = "Invisible" + Var Menu4Selected = "Invisible" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Invisible" + Var Menu11Selected = "Invisible" + Var Menu21Selected = "Invisible" + Var Menu22Selected = "Invisible" + Var MenuVSelected2 = "Invisible" + EndIf @@ -207,16 +222,20 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - If SpiralOnline = "true" Then + + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + If SetSpiralOnline = 1 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Else + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf Else Open "ROOT/taobin_project/xml/page_catalog.xml" EndIf - diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml index 57e48af0..7b918758 100644 --- a/spiral/xml/page_catalog_vending_machine.xml +++ b/spiral/xml/page_catalog_vending_machine.xml @@ -141,6 +141,7 @@ Var Menu11Selected = "Invisible" Var Menu21Selected = "Invisible" Var Menu22Selected = "Invisible" + Var MenuVSelected2 = "Invisible" EndIf diff --git a/xml/page_board.xml b/xml/page_board.xml index 9df2cfb6..c60d24e3 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -12,6 +12,8 @@ Var ToggleAfterEventProfileOff = 0 + Var SetSpiralOnline = 0 + ;TopView "hide" ;OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_blank_main.xml" Var FileNumber = 1 diff --git a/xml/page_show_error_spiral.xml b/xml/page_show_error_spiral.xml index b0573d91..158b1fb5 100644 --- a/xml/page_show_error_spiral.xml +++ b/xml/page_show_error_spiral.xml @@ -157,9 +157,7 @@ DEBUGVAR MachineStage DEBUGVAR NETCORE_EVENT_CNT_TMP - If SpiralOnline = "true" Then - Open "ROOT/taobin_project/xml/page_show_error_spiral.xml" - EndIf + Var EmergencyStop = "-" @@ -333,8 +331,8 @@ show_error_sp1 - 0 - 694 + 160 + 724 Var(DirImage + "/textspiral.png") @@ -402,7 +400,7 @@ If SpiralOnline = "true" Then Var SetSpiralOnline = 1 - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/spiral/xml/page_catalog_vending_machine.xml" EndIf TopView "show"