From 2c0f234cb75682cba85a15d66131cb993ded1e52 Mon Sep 17 00:00:00 2001 From: kong Date: Mon, 12 Sep 2022 13:44:32 +0700 Subject: [PATCH] Change layout --- xml/menu_catalog_default_init.xml | 8 +- xml/page_catalog2.xml | 567 -------------------------- xml/page_catalog_2.xml | 576 --------------------------- xml/page_catalog_group_appfast.skt | 12 - xml/page_catalog_group_appfast.xml | 20 +- xml/page_catalog_group_cocktail.skt | 22 +- xml/page_catalog_group_cocktail.xml | 30 +- xml/page_catalog_group_coffee.skt | 9 +- xml/page_catalog_group_coffee.xml | 17 +- xml/page_catalog_group_forkid.skt | 28 +- xml/page_catalog_group_forkid.xml | 36 +- xml/page_catalog_group_health.xml | 8 +- xml/page_catalog_group_milk.skt | 9 +- xml/page_catalog_group_milk.xml | 17 +- xml/page_catalog_group_other.skt | 6 +- xml/page_catalog_group_other.xml | 14 +- xml/page_catalog_group_recommend.skt | 8 +- xml/page_catalog_group_recommend.xml | 16 +- xml/page_catalog_group_tea.skt | 8 +- xml/page_catalog_group_tea.xml | 16 +- xml/page_catalog_group_whey.skt | 24 +- xml/page_catalog_group_whey.xml | 32 +- xml/page_catalog_with_vending.xml | 61 ++- 23 files changed, 131 insertions(+), 1413 deletions(-) diff --git a/xml/menu_catalog_default_init.xml b/xml/menu_catalog_default_init.xml index 5f77ccd6..98ec7e60 100644 --- a/xml/menu_catalog_default_init.xml +++ b/xml/menu_catalog_default_init.xml @@ -33,9 +33,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -51,6 +49,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index ede80b36..e69de29b 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -1,567 +0,0 @@ - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - - TopView "show" - ; On open - - Var NextPage = "-" - - - DEBUGVAR CameraStatus - - - READCARDID - - Var Seeker.thankLidFlag = 0 - Var Seeker.thankStrawFlag = 0 - - WEB "DISABLE" - - Var web_readyOK = "false" - Var web_telnumOK = "" - - 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 - - ;Machine DoorLidClose - - Var GetPayInfoFlag = 0 - Var countDownRetrun = 30 - - CoinVending OFF - - - ; Clear value - Topping "clear" "-" - - - - - 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 - - ; 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 CameraCount = 1 Then - - CameraSetting "usbfront" "default" "Rotate=270,Resolution=1280x720,scaleX=1.0,scaleY=1.0" - EndIf - - - 1000 - - - ;SAVELOG SoundPlaying - - DEBUGVAR countDownRetrun - If countDownRetrun > 0 Then - Var countDownRetrun = countDownRetrun - 1 - EndIf - - If countDownRetrun = 0 Then - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - EndIf - EndIf - - - - Refresh - TimerReset - - - - - DEBUGVAR IDFullNameEng - - - - - 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" - - - - -; - - - -; back - - - - - -;include=ROOT/taobin_project/inc/button_lang.inc - - - - DEBUGVAR show_lang - - If show_lang = "ENG" Then - Var DirImage = "ROOT/taobin_project/image/page2_en/page2" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_en" - EndIf - - If show_lang = "THAI" Then - Var DirImage = "ROOT/taobin_project/image/page2" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_th" - EndIf - - Var bnSodaAndOther = DirImage + "/bn_soda_coke.png" - Var bpSodaAndOther = DirImage + "/bp_soda_coke.png" - - RefreshAll - - - - - 70 - 583 - Var(DirImage + "/text1.png") - - - - -; menu row 1 - - - - -; menu row 2 - - - - - - - - - - - - - - - - - - - - - - 5 - 1880 - 24 - Center - 1080 - RobotoRegular - 0xFFFFFF - ShowNetworkProblemText - - - - -; -; 895 -; QRCODE99_Y -; 178 -; 178 -; "Enable" -; testservice -; - - - -; 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 - - - - - - diff --git a/xml/page_catalog_2.xml b/xml/page_catalog_2.xml index f5f4ba8e..e69de29b 100644 --- a/xml/page_catalog_2.xml +++ b/xml/page_catalog_2.xml @@ -1,576 +0,0 @@ - - "Enable" - 1080 - 1920 -; "0xeae6e1" - SoundVolume - - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" - - TopView "show" - ; On open - - READ_FILE "/mnt/sdcard/new_topping" ToppingNewShow - DEBUGVAR ToppingNewShow - - Var NextPage = "-" - - Var Seeker.thankLidFlag = 0 - Var Seeker.thankStrawFlag = 0 - - WEB "DISABLE" - - Var web_readyOK = "false" - Var web_telnumOK = "" - - 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 - - ;Machine DoorLidClose - - Var GetPayInfoFlag = 0 - Var countDownRetrun = 30 - - CoinVending OFF - - - ; Clear value - Topping "clear" "-" - - If show_eng = "true" Then - Var DirImage = "ROOT/taobin_project/image/page2_en/page2" - Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/What_would_you_like_to_drink_today.mp3" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_en" - - Var text_unavailable = "UNAVAILABLE###size=16" - - Else - Var DirImage = "ROOT/taobin_project/image/page2" - Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" - Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3" - Play PlaySoundLag - - Var DirImageCart = "ROOT/taobin_project/image/cart_th" - - Var text_unavailable = "หมด###size=32" - EndIf - - - 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 - - ; 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 - - - 1000 - - - ;SAVELOG SoundPlaying - - If countDownRetrun > 0 Then - Var countDownRetrun = countDownRetrun - 1 - EndIf - - If countDownRetrun = 0 Then - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" - Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - 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" - - - - -; - - - -; back - - - - - - - - - 70 - 583 - Var(DirImage + "/text1.png") - - - - -; menu row 1 - - - - -; menu row 2 - - - - - - - - - -;============================================================================= - - - - - -;============================================================================= - - - - - - - - - - - 5 - 1880 - 24 - Center - 1080 - RobotoRegular - 0xFFFFFF - ShowNetworkProblemText - - - - -; -; 895 -; QRCODE99_Y -; 178 -; 178 -; "Enable" -; testservice -; - - - -; 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 - - - - - - diff --git a/xml/page_catalog_group_appfast.skt b/xml/page_catalog_group_appfast.skt index 029a4063..07621bed 100644 --- a/xml/page_catalog_group_appfast.skt +++ b/xml/page_catalog_group_appfast.skt @@ -16,17 +16,6 @@ ?> - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf - Else - If AppFastEnable = "true" Then Var Menu11Selected = "PressForever" Var Menu7Selected = "Invisible" @@ -34,7 +23,6 @@ Var Menu11Selected = "Invisible" Var Menu7Selected = "PressForever" EndIf - EndIf diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 5bdbc8b6..19ff8a12 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -100,17 +102,6 @@ - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf - Else - If AppFastEnable = "true" Then Var Menu11Selected = "PressForever" Var Menu7Selected = "Invisible" @@ -118,7 +109,6 @@ Var Menu11Selected = "Invisible" Var Menu7Selected = "PressForever" EndIf - EndIf diff --git a/xml/page_catalog_group_cocktail.skt b/xml/page_catalog_group_cocktail.skt index adfc0768..eb45f1d8 100644 --- a/xml/page_catalog_group_cocktail.skt +++ b/xml/page_catalog_group_cocktail.skt @@ -16,24 +16,12 @@ ?> ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "PressForever" EndIf diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index 10887aa9..a132a420 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -100,24 +102,12 @@ ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "PressForever" EndIf diff --git a/xml/page_catalog_group_coffee.skt b/xml/page_catalog_group_coffee.skt index 57e3251e..d8d3cda9 100644 --- a/xml/page_catalog_group_coffee.skt +++ b/xml/page_catalog_group_coffee.skt @@ -14,13 +14,8 @@ #include=menu_catalog_default_init.xml ?> - If SpiralOnline = "true" Then - Var Menu2Selected2 = "PressForever" - Else - ; coffee show - Var Menu2Selected = "PressForever" - EndIf - + Var Menu2Selected = "PressForever" + SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 8ed9d765..e677fcdd 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -99,13 +101,8 @@ Var Menu22Selected = "Enable" - If SpiralOnline = "true" Then - Var Menu2Selected2 = "PressForever" - Else - ; coffee show - Var Menu2Selected = "PressForever" - EndIf - + Var Menu2Selected = "PressForever" + SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_forkid.skt b/xml/page_catalog_group_forkid.skt index 7f501c05..1b1ea351 100644 --- a/xml/page_catalog_group_forkid.skt +++ b/xml/page_catalog_group_forkid.skt @@ -16,28 +16,14 @@ ?> ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Var Menu21Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var Menu21Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "PressForever" EndIf diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index f3660432..ef0a2946 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -100,28 +102,14 @@ ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Var Menu21Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "Invisible" - Var Menu21Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "Invisible" - Var Menu21Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "Invisible" + Var Menu21Selected = "PressForever" EndIf diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index b5f2579e..e2d4f885 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" diff --git a/xml/page_catalog_group_milk.skt b/xml/page_catalog_group_milk.skt index 19646e1b..c26bca37 100644 --- a/xml/page_catalog_group_milk.skt +++ b/xml/page_catalog_group_milk.skt @@ -14,15 +14,8 @@ #include=menu_catalog_default_init.xml ?> - If SpiralOnline = "true" Then - Var Menu4Selected2 = "PressForever" - Else - ; coffee show - Var Menu4Selected = "PressForever" - EndIf - + Var Menu4Selected = "PressForever" - SAVELOG PreviseXMLFileName2 Var Timeout = 0 diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index ec7bad4d..12d3ac1c 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -99,15 +101,8 @@ Var Menu22Selected = "Enable" - If SpiralOnline = "true" Then - Var Menu4Selected2 = "PressForever" - Else - ; coffee show - Var Menu4Selected = "PressForever" - EndIf - + Var Menu4Selected = "PressForever" - SAVELOG PreviseXMLFileName2 Var Timeout = 0 diff --git a/xml/page_catalog_group_other.skt b/xml/page_catalog_group_other.skt index 794841f3..13183c24 100644 --- a/xml/page_catalog_group_other.skt +++ b/xml/page_catalog_group_other.skt @@ -16,11 +16,7 @@ ?> ; soda and other - If SpiralOnline = "true" Then - Var Menu6Selected2 = "PressForever" - Else - Var Menu6Selected = "PressForever" - EndIf + Var Menu6Selected = "PressForever" SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index b07d52e2..a687dfaf 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -100,11 +102,7 @@ ; soda and other - If SpiralOnline = "true" Then - Var Menu6Selected2 = "PressForever" - Else - Var Menu6Selected = "PressForever" - EndIf + Var Menu6Selected = "PressForever" SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_recommend.skt b/xml/page_catalog_group_recommend.skt index 2239c74e..7e91af5a 100644 --- a/xml/page_catalog_group_recommend.skt +++ b/xml/page_catalog_group_recommend.skt @@ -14,13 +14,7 @@ #include=menu_catalog_default_init.xml ?> - If SpiralOnline = "true" Then - Var Menu1Selected2 = "PressForever" - Else - ; coffee show - Var Menu1Selected = "PressForever" - EndIf - + Var Menu1Selected = "PressForever" SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index 19e618c4..37ca13ae 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -99,13 +101,7 @@ Var Menu22Selected = "Enable" - If SpiralOnline = "true" Then - Var Menu1Selected2 = "PressForever" - Else - ; coffee show - Var Menu1Selected = "PressForever" - EndIf - + Var Menu1Selected = "PressForever" SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_tea.skt b/xml/page_catalog_group_tea.skt index c18ae731..7733e3f3 100644 --- a/xml/page_catalog_group_tea.skt +++ b/xml/page_catalog_group_tea.skt @@ -15,13 +15,7 @@ #include=menu_catalog_default_init.xml ?> - If SpiralOnline = "true" Then - Var Menu3Selected2 = "PressForever" - Else - ; coffee show - Var Menu3Selected = "PressForever" - EndIf - + Var Menu3Selected = "PressForever" SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index d7cd1a3d..83291516 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -99,13 +101,7 @@ Var Menu22Selected = "Enable" - If SpiralOnline = "true" Then - Var Menu3Selected2 = "PressForever" - Else - ; coffee show - Var Menu3Selected = "PressForever" - EndIf - + Var Menu3Selected = "PressForever" SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_whey.skt b/xml/page_catalog_group_whey.skt index cf28deb4..6d4d091b 100644 --- a/xml/page_catalog_group_whey.skt +++ b/xml/page_catalog_group_whey.skt @@ -15,27 +15,13 @@ #include=menu_catalog_default_init.xml ?> - ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "PressForever" EndIf - SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 2167abdc..0fab5d22 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -43,9 +43,7 @@ ; SpiralOnline - If SpiralOnline = "true" Then - Var MenuVSelected2 = "Enable" - EndIf + Var MenuVSelected2 = "Invisible" Var Menu1Selected2 = "Invisible" @@ -61,6 +59,10 @@ Var Menu21Selected2 = "Invisible" Var MenuVSelected2 = "Invisible" + If SpiralOnline = "true" Then + Var MenuVSelected2 = "Enable" + EndIf + ; init default Var Menu1Selected = "Enable" Var Menu2Selected = "Enable" @@ -99,27 +101,13 @@ Var Menu22Selected = "Enable" - ; protein - If SpiralOnline = "true" Then - - If AppFastEnable = "true" Then - Var Menu11Selected2 = "PressForever" - Var Menu7Selected2 = "Invisible" - Else - Var Menu11Selected2 = "Invisible" - Var Menu7Selected2 = "PressForever" - EndIf + If AppFastEnable = "true" Then + Var Menu11Selected = "PressForever" + Var Menu7Selected = "Invisible" Else - - If AppFastEnable = "true" Then - Var Menu11Selected = "PressForever" - Var Menu7Selected = "Invisible" - Else - Var Menu11Selected = "Invisible" - Var Menu7Selected = "PressForever" - EndIf + Var Menu11Selected = "Invisible" + Var Menu7Selected = "PressForever" EndIf - SAVELOG PreviseXMLFileName2 diff --git a/xml/page_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml index 26a6b908..f519f3f3 100644 --- a/xml/page_catalog_with_vending.xml +++ b/xml/page_catalog_with_vending.xml @@ -270,11 +270,7 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" ; eng - If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" @@ -302,11 +298,7 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" @@ -320,11 +312,7 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" @@ -337,18 +325,28 @@ SoundVolume OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" - If new_layout = "true" Then - Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" - Else - Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" + Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" + + - EndIf + ; row 3 +;------------------------------------------------------------- + +;------------------------------------------------------------- + ; top menu