From 04d81d5eff78619bea923a223a1d6cb49e995b30 Mon Sep 17 00:00:00 2001 From: wanlop run Date: Sat, 9 Dec 2023 23:14:58 +0700 Subject: [PATCH] Do Redirect OpenFile --- .gitignore | 1 + .../script_common_for_open_promotion_xml.ev | 8 --- xml/menutab/coffee.ev | 3 + xml/menutab/menu_catalog_default_init.xml | 18 +++++- xml/menutab/menu_catalog_new.xml | 40 +++++++++++-- xml/menutab/page_catalog.xml | 2 + xml/menutab/page_catalog_group_appfast.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_cocktail.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_coffee.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_forkid.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_health.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_milk.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_oreo.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_other.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_pepsi_pro.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_pro_15THB.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_pro_melon.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_pro_mymint.xml | 58 +++++++++++++++++-- .../page_catalog_group_pro_pepween.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_recommend.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_soft_serve.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_songkran.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_tea.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_group_whey.xml | 58 +++++++++++++++++-- xml/menutab/page_catalog_momday.xml | 58 +++++++++++++++++-- xml/menutab/start_up_inst_2.xml | 1 - xml/menutab/start_up_inst_3.xml | 1 - xml/menutab/start_up_inst_4.xml | 1 - xml/topview2.xml | 17 ++++++ 29 files changed, 1063 insertions(+), 131 deletions(-) create mode 100644 xml/menutab/coffee.ev diff --git a/.gitignore b/.gitignore index dbb2edc8..a33be141 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +cip video/_main_page.mp4 .DS_Store diff --git a/xml/event/script_common_for_open_promotion_xml.ev b/xml/event/script_common_for_open_promotion_xml.ev index fd8ea85d..c7ab7757 100644 --- a/xml/event/script_common_for_open_promotion_xml.ev +++ b/xml/event/script_common_for_open_promotion_xml.ev @@ -17,9 +17,6 @@ Else Var BigButtonEnable = "Enable" OpenInst 2 "ROOT/taobin_project/xml/event/promotion_15THB.xml" Var OpenFromPageBoard = 0 - - Var InstanceTabOpenFile1 = "ROOT/taobin_project/xml/event/promotion_15THB.xml" - Else If MyMintEnable = 1 Then @@ -53,9 +50,4 @@ Else EndIf EndIf - -If EnableMultiInstance = "true" Then - TabMenuVisibleInst 1 -EndIf - Var OpenFromPageBoard = 0 diff --git a/xml/menutab/coffee.ev b/xml/menutab/coffee.ev new file mode 100644 index 00000000..b375c13c --- /dev/null +++ b/xml/menutab/coffee.ev @@ -0,0 +1,3 @@ +SAVELOG "Call coffee.ev" +TabMenuVisibleInst 2 +Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" diff --git a/xml/menutab/menu_catalog_default_init.xml b/xml/menutab/menu_catalog_default_init.xml index 053ba93e..1ed295e3 100644 --- a/xml/menutab/menu_catalog_default_init.xml +++ b/xml/menutab/menu_catalog_default_init.xml @@ -14,7 +14,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -25,6 +25,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -104,3 +106,17 @@ ; + + + + + + + + + + + + + + diff --git a/xml/menutab/menu_catalog_new.xml b/xml/menutab/menu_catalog_new.xml index 583f6c61..2bc97e34 100644 --- a/xml/menutab/menu_catalog_new.xml +++ b/xml/menutab/menu_catalog_new.xml @@ -74,16 +74,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -104,10 +136,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog.xml b/xml/menutab/page_catalog.xml index 900dd9df..ab996161 100644 --- a/xml/menutab/page_catalog.xml +++ b/xml/menutab/page_catalog.xml @@ -235,6 +235,8 @@ DEBUGVAR EnableMultiInstance If EnableMultiInstance = "true" Then + OpenRedirect "/taobin_project/xml/page_catalog_group_coffee.xml" "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/coffee.ev" + Var InstanceTabOpenFile2 = "ROOT/taobin_project/xml/menutab/page_catalog_group_coffee.xml" Var InstanceTabOpenFile3 = "ROOT/taobin_project/xml/menutab/page_catalog_group_tea.xml" Var InstanceTabOpenFile4 = "ROOT/taobin_project/xml/menutab/page_catalog_group_milk.xml" diff --git a/xml/menutab/page_catalog_group_appfast.xml b/xml/menutab/page_catalog_group_appfast.xml index 5d19313e..23e8a88a 100644 --- a/xml/menutab/page_catalog_group_appfast.xml +++ b/xml/menutab/page_catalog_group_appfast.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + If AppFastEnable = "true" Then @@ -222,16 +238,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -252,10 +300,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_cocktail.xml b/xml/menutab/page_catalog_group_cocktail.xml index 1d57022b..58d30263 100644 --- a/xml/menutab/page_catalog_group_cocktail.xml +++ b/xml/menutab/page_catalog_group_cocktail.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + Var Menu8Selected = "PressForever" @@ -214,16 +230,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -244,10 +292,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_coffee.xml b/xml/menutab/page_catalog_group_coffee.xml index 3889b630..09a8b636 100644 --- a/xml/menutab/page_catalog_group_coffee.xml +++ b/xml/menutab/page_catalog_group_coffee.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + Var Menu2Selected = "PressForever" @@ -214,16 +230,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -244,10 +292,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_forkid.xml b/xml/menutab/page_catalog_group_forkid.xml index 69ae35e4..9a4f22c4 100644 --- a/xml/menutab/page_catalog_group_forkid.xml +++ b/xml/menutab/page_catalog_group_forkid.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + ; protein If AppFastEnable = "true" Then @@ -223,16 +239,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -253,10 +301,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_health.xml b/xml/menutab/page_catalog_group_health.xml index a0af60fa..7f003017 100644 --- a/xml/menutab/page_catalog_group_health.xml +++ b/xml/menutab/page_catalog_group_health.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + Var Menu22Selected = "PressForever" @@ -214,16 +230,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -244,10 +292,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_milk.xml b/xml/menutab/page_catalog_group_milk.xml index 3aba1653..b978c151 100644 --- a/xml/menutab/page_catalog_group_milk.xml +++ b/xml/menutab/page_catalog_group_milk.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + Var Menu4Selected = "PressForever" @@ -212,16 +228,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -242,10 +290,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_oreo.xml b/xml/menutab/page_catalog_group_oreo.xml index 704a79b2..1cd47da5 100644 --- a/xml/menutab/page_catalog_group_oreo.xml +++ b/xml/menutab/page_catalog_group_oreo.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + @@ -210,16 +226,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -240,10 +288,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_other.xml b/xml/menutab/page_catalog_group_other.xml index 90841cff..3907a7fb 100644 --- a/xml/menutab/page_catalog_group_other.xml +++ b/xml/menutab/page_catalog_group_other.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + ; soda and other Var Menu6Selected = "PressForever" @@ -213,16 +229,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -243,10 +291,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_pepsi_pro.xml b/xml/menutab/page_catalog_group_pepsi_pro.xml index c51cfe80..b3834570 100644 --- a/xml/menutab/page_catalog_group_pepsi_pro.xml +++ b/xml/menutab/page_catalog_group_pepsi_pro.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + @@ -210,16 +226,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -240,10 +288,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_pro_15THB.xml b/xml/menutab/page_catalog_group_pro_15THB.xml index 1fe1ec99..80baeafe 100644 --- a/xml/menutab/page_catalog_group_pro_15THB.xml +++ b/xml/menutab/page_catalog_group_pro_15THB.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + Var Menu1Selected = "PressForever" @@ -232,16 +248,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -262,10 +310,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_pro_melon.xml b/xml/menutab/page_catalog_group_pro_melon.xml index b6745c14..74056d8c 100644 --- a/xml/menutab/page_catalog_group_pro_melon.xml +++ b/xml/menutab/page_catalog_group_pro_melon.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + Var Timeout = 0 @@ -208,16 +224,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -238,10 +286,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_pro_mymint.xml b/xml/menutab/page_catalog_group_pro_mymint.xml index a32bdb39..7285bd78 100644 --- a/xml/menutab/page_catalog_group_pro_mymint.xml +++ b/xml/menutab/page_catalog_group_pro_mymint.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + Var FromMyMintPro = 0 @@ -211,16 +227,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -241,10 +289,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_pro_pepween.xml b/xml/menutab/page_catalog_group_pro_pepween.xml index c4f2308d..7cd4422b 100644 --- a/xml/menutab/page_catalog_group_pro_pepween.xml +++ b/xml/menutab/page_catalog_group_pro_pepween.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -116,6 +118,20 @@ + + + + + + + + + + + + + + Open "ROOT/taobin_project/xml/page_catalog_group_pro_pepween_fixed.xml" Var NightTime = 0 @@ -239,16 +255,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -269,10 +317,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_recommend.xml b/xml/menutab/page_catalog_group_recommend.xml index 633e87c1..6d53cdf2 100644 --- a/xml/menutab/page_catalog_group_recommend.xml +++ b/xml/menutab/page_catalog_group_recommend.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + Var Menu1Selected = "PressForever" @@ -231,16 +247,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -261,10 +309,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_soft_serve.xml b/xml/menutab/page_catalog_group_soft_serve.xml index b2cba781..d081cca2 100644 --- a/xml/menutab/page_catalog_group_soft_serve.xml +++ b/xml/menutab/page_catalog_group_soft_serve.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + @@ -210,16 +226,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -240,10 +288,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_songkran.xml b/xml/menutab/page_catalog_group_songkran.xml index 19c1feab..5faa181c 100644 --- a/xml/menutab/page_catalog_group_songkran.xml +++ b/xml/menutab/page_catalog_group_songkran.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + @@ -210,16 +226,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -240,10 +288,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_tea.xml b/xml/menutab/page_catalog_group_tea.xml index a8a65ff3..88d7af74 100644 --- a/xml/menutab/page_catalog_group_tea.xml +++ b/xml/menutab/page_catalog_group_tea.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + Var Menu3Selected = "PressForever" @@ -214,16 +230,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -244,10 +292,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_group_whey.xml b/xml/menutab/page_catalog_group_whey.xml index e648962e..bd5397b5 100644 --- a/xml/menutab/page_catalog_group_whey.xml +++ b/xml/menutab/page_catalog_group_whey.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + If AppFastEnable = "true" Then Var Menu11Selected = "PressForever" @@ -219,16 +235,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -249,10 +297,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/page_catalog_momday.xml b/xml/menutab/page_catalog_momday.xml index 8629cbb4..b5d890ed 100644 --- a/xml/menutab/page_catalog_momday.xml +++ b/xml/menutab/page_catalog_momday.xml @@ -24,7 +24,7 @@ Var ice_tab_text = "Ice will be ready at " Var text_unavailable = "UNAVAILABLE###size=16" - + InstanceSetString "ShowEng" Else Var showengText = "Invisible" Var showthaiText = "Enable" @@ -35,6 +35,8 @@ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา " Var text_unavailable = "หมด###size=32" + + InstanceSetString "ShowThai" EndIf If ICE_PROCESS_STATUS = 2 Then @@ -115,6 +117,20 @@ + + + + + + + + + + + + + + @@ -210,16 +226,48 @@ If show_eng = "true" Then Var show_eng = "false" Var text_unavailable = "หมด###size=32" + InstanceSetString "ShowThai" Else Var show_eng = "true" Var text_unavailable = "UNAVAILABLE###size=16" + InstanceSetString "ShowEng" EndIf + Var RequestChangeLang = 1 - Open CurrentXMLFileName2 + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + + InstanceGetString SaveStringInst + DEBUGVAR show_eng + DEBUGVAR SaveStringInst + + If SaveStringInst = "RefreshNow" Then + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + + If show_eng = "true" Then + If SaveStringInst = "ShowThai" Then + + InstanceSetString "ShowEng" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + Else + If SaveStringInst = "ShowEng" Then + + InstanceSetString "ShowThai" + GetXMLFileNameCurrentRunning CurrentOpenFile + Open CurrentOpenFile + EndIf + EndIf + + + ; 1080 @@ -240,10 +288,8 @@ SAVELOG "Click rec" Var NextPage = "-" - - TabMenuVisibleInst 1 - OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_instance2.xml" - + TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev" + diff --git a/xml/menutab/start_up_inst_2.xml b/xml/menutab/start_up_inst_2.xml index 8a5a19f9..bef0b089 100644 --- a/xml/menutab/start_up_inst_2.xml +++ b/xml/menutab/start_up_inst_2.xml @@ -8,7 +8,6 @@ 1000 - DEBUGVAR InstanceTabOpenFile2 If InstanceTabOpenFile2 = "" Then Else diff --git a/xml/menutab/start_up_inst_3.xml b/xml/menutab/start_up_inst_3.xml index a9373afd..0c51b39a 100644 --- a/xml/menutab/start_up_inst_3.xml +++ b/xml/menutab/start_up_inst_3.xml @@ -8,7 +8,6 @@ 1000 - DEBUGVAR InstanceTabOpenFile3 If InstanceTabOpenFile3 = "" Then Else diff --git a/xml/menutab/start_up_inst_4.xml b/xml/menutab/start_up_inst_4.xml index 5f108525..24e2aa78 100644 --- a/xml/menutab/start_up_inst_4.xml +++ b/xml/menutab/start_up_inst_4.xml @@ -8,7 +8,6 @@ 1000 - DEBUGVAR InstanceTabOpenFile4 If InstanceTabOpenFile4 = "" Then Else diff --git a/xml/topview2.xml b/xml/topview2.xml index 0c5de2c0..1f63dfea 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -56,6 +56,23 @@ ;DEBUGVAR langfn + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + If EnableMultiInstance = "true" Then + InstanceOverSetString "RefreshNow" 5 + InstanceOverSetString "RefreshNow" 6 + InstanceOverSetString "RefreshNow" 7 + InstanceOverSetString "RefreshNow" 8 + InstanceOverSetString "RefreshNow" 9 + InstanceOverSetString "RefreshNow" 10 + InstanceOverSetString "RefreshNow" 11 + ; TODO + + + EndIf + EndIf + TimerReset