diff --git a/inter/mys/image/page3_2/bn_recommend4.png b/inter/mys/image/page3_2/bn_recommend4.png new file mode 100644 index 00000000..be73c3d3 Binary files /dev/null and b/inter/mys/image/page3_2/bn_recommend4.png differ diff --git a/inter/mys/image/page3_2/bp_recommend4.png b/inter/mys/image/page3_2/bp_recommend4.png new file mode 100644 index 00000000..f0fb5291 Binary files /dev/null and b/inter/mys/image/page3_2/bp_recommend4.png differ diff --git a/inter/mys/xml/menu_catalog_new.lxml b/inter/mys/xml/menu_catalog_new.lxml index 470cf89d..e63b4b5e 100644 --- a/inter/mys/xml/menu_catalog_new.lxml +++ b/inter/mys/xml/menu_catalog_new.lxml @@ -12,9 +12,9 @@ 1000 - + ;DEBUGVAR ICE_PROCESS_STATUS - + If ICE_PROCESS_STATUS = 2 Then Var ice_tab_process_show = "Enable" Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT @@ -27,8 +27,8 @@ If Timeout > 60 Then SAVELOG "Timeout" - If Seeker = "next" Then - Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" + 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" @@ -42,12 +42,12 @@ If Seeker = "curr" Then If DoorCupPosition = "bottom" Then - ; It normal + ; It normal Var EmergencyStop = "false" Else Var EmergencyStop = "true" - - ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" + + ;Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf @@ -60,23 +60,23 @@ Var stop_now = "true" Var MachineErrorDetailAll = "???" SAVELOG "NETCORE_LOST_CNT" - + Open "ROOT/taobin_project/xml/page_back_to_error.xml" EndIf EndIf Var Timeout = Timeout + 1 TimerReset - + DEBUGVAR LanguageShow - If LanguageShow = "ENG" Then + If LanguageShow = "ENG" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/" EndIf - If LanguageShow = "THAI" Then + If LanguageShow = "THAI" Then Var DirImage2 = "ROOT/taobin_project/image/drink_option/" Var DirImageAlter = "ROOT/taobin_project/image/page3_2/" EndIf @@ -93,8 +93,8 @@ Var LanguageButtonEnable = "Enable" Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentYPosition = 400 - - Var ButtonLanguageListXPosition = 970 + + Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListYPosition = 430 - 38 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" @@ -126,15 +126,15 @@ "ROOT/taobin_project/image/page2/bn_back_arrow_2.png" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + If SpiralOnline = "true" Then If Seeker = "curr" Then - Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" + Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml" Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" - EndIf + Open "ROOT/taobin_project/xml/page_catalog.lxml" + EndIf Else - Open "ROOT/taobin_project/xml/page_catalog.lxml" + Open "ROOT/taobin_project/xml/page_catalog.lxml" EndIf @@ -147,36 +147,36 @@ 1080 - "auto" + "auto" 0 395 "Enable" 896 - 102 + 102 @@ -189,18 +189,18 @@ Var( DirImageAlter + "/bp_coffee2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - - ;Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml" - + + ;Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_coffee.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_coffee.lxml" Else Open OpenFileXML EndIf @@ -215,18 +215,18 @@ Var( DirImageAlter + "/bp_tea2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - - ;Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" - + + ;Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_tea.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_tea.lxml" Else Open OpenFileXML EndIf @@ -241,21 +241,21 @@ Var( DirImageAlter + "/bp_cho_ca2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_milk.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_milk.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -267,20 +267,20 @@ Var( DirImageAlter + "/bp_protein2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_whey.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_whey.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -291,20 +291,20 @@ Var( DirImageAlter + "/bp_appfast2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_appfast.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_appfast.lxml" Else Open OpenFileXML - EndIf + EndIf @@ -317,17 +317,17 @@ Var( DirImageAlter + "/bp_forkid2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" - + ;Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_forkid.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_forkid.lxml" Else Open OpenFileXML EndIf @@ -343,17 +343,17 @@ Var( DirImageAlter + "/bp_health.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_health.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_health.lxml" Else Open OpenFileXML EndIf @@ -367,16 +367,16 @@ Var( DirImageAlter + "/bp_cocktail.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_cocktail.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.lxml" Else Open OpenFileXML EndIf @@ -390,20 +390,20 @@ Var( DirImageAlter + "/bp_sodada2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + ;Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_other.lxml" - + DEBUGVAR CountryRootPath DEBUGVAR OpenFileXML - If CountryName = "Thailand" Then - Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" + If CountryName = "Thailand" Then + Open "ROOT/taobin_project/xml/page_catalog_group_other.lxml" Else Open OpenFileXML EndIf - + @@ -414,9 +414,9 @@ Var( DirImageAlter + "/bp_vending2.png") "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - + Var NextPage = "-" - Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" + Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -442,13 +442,12 @@ 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 - - +