diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index f0e17729..505827e8 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -38,6 +38,8 @@ SAVELOG "======================================= RefreshAll Languages ================================" EndIf + Var BaseOnPageBoard = 0 + Var NextPage = "-" Var Seeker.thankLidFlag = 0 diff --git a/inter/tha/xml/page_help_center.lxml b/inter/tha/xml/page_help_center.lxml index 43c25d88..538f31fa 100644 --- a/inter/tha/xml/page_help_center.lxml +++ b/inter/tha/xml/page_help_center.lxml @@ -48,7 +48,18 @@ If Timeout > 120 Then SAVELOG "Timeout" - OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + If BaseOnPageBoard = 1 Then + Var BaseOnPageBoard = 0 + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + Else + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + EndIf EndIf Var Timeout = Timeout + 1 @@ -108,13 +119,17 @@ RootLayoutVisible 3 "hide" Open "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else - If BoxID = 210699 Then - ;DEBUGVAR OpenFromXML - ;Open "ROOT/taobin_project/xml/page_payment.xml" - ;Open OpenFromXML + If BaseOnPageBoard = 1 Then + Var BaseOnPageBoard = 0 + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" - Else - Open "ROOT/taobin_project/xml/page_back_to_main.xml" + Else + OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" EndIf EndIf diff --git a/inter/tha/xml/page_instance_empty.lxml b/inter/tha/xml/page_instance_empty.lxml index ce901da8..cc89a786 100644 --- a/inter/tha/xml/page_instance_empty.lxml +++ b/inter/tha/xml/page_instance_empty.lxml @@ -3,11 +3,7 @@ 1920 - If EnableBtnLangWithHelper = 1 Then - RootLayoutVisible 3 "show" - Else - RootLayoutVisible 3 "hide" - EndIf + RootLayoutVisible 13 "hide" ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" @@ -36,27 +32,4 @@ TimerReset - - - If OpenFromPageBoard = 1 Then - Var OpenFromPageBoard = 0 - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 608 - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 590 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - Else - Var ButtonLanguageCurrentXPosition = 1015 - Var ButtonLanguageCurrentYPosition = 458 - 38 - - Var ButtonLanguageListXPosition = 990 - Var ButtonLanguageListYPosition = 450 - 38 - Var LanguageButtonEnable = "Enable" - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - EndIf - - RefreshAll - - diff --git a/xml/page_board.xml b/xml/page_board.xml index d603dfd1..e045883a 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -32,6 +32,7 @@ Var credit_card_enable = "" READ_FILE "/mnt/sdcard/credit_card_enable" credit_card_enable + Var BaseOnPageBoard = 1 Var eng_enable = "true" Var thai_enable = "true" @@ -1317,21 +1318,22 @@ If EnableMultiInstanceFromBoxID = 1 Then If CountryName = "Thailand" Then - ; enable btn_change_langs - Var EnableBtnLangWithHelper = 1 - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 608 - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 590 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - RootLayoutVisible 3 "show" ; enable helper - Var EnableHelperShow = 1 + Var EnableHelperShow = 0 ;Var FromDrinkOk = 1 Var CurrHelpCenter = 0 If EnableHelperShow = 1 Then + ; enable btn_change_langs + Var EnableBtnLangWithHelper = 1 + Var LanguageButtonEnable = "Enable" + Var ButtonLanguageCurrentXPosition = 990 + Var ButtonLanguageCurrentYPosition = 608 + Var ButtonLanguageListXPosition = 970 + Var ButtonLanguageListYPosition = 590 + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" + RootLayoutVisible 3 "show" + If FromDrinkOk = 1 Then Var TimeOutShowHelpCenter = 15 @@ -1344,6 +1346,8 @@ Else RootLayoutVisible 15 "hide" EndIf + Else + RootLayoutVisible 3 "hide" EndIf Var EnableMultiInstance = "true" @@ -1502,7 +1506,11 @@ If EnableMultiInstanceFromBoxID = 1 Then If CountryName = "Thailand" Then - RootLayoutVisible 3 "show" + If EnableHelperShow = 1 Then + RootLayoutVisible 3 "show" + Else + RootLayoutVisible 3 "hide" + EndIf Else RootLayoutVisible 3 "hide" EndIf @@ -2111,6 +2119,9 @@ PRICE "Reset" "-" DEBUGVAR InternationalEnable DEBUGVAR CountryName + + Var BaseOnPageBoard = 0 + If InternationalEnable = 1 Then If CountryName = "Thailand" Then SAVELOG " Thailand Thailand Thailand Thailand Pooon Pooon Pooon Pooon Pooon" @@ -2390,6 +2401,8 @@ PRICE "Reset" "-" SoundVolume + Var BaseOnPageBoard = 0 + ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If CocktailShow = "true" Then OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_cocktail.xml" @@ -2437,6 +2450,7 @@ PRICE "Reset" "-" Var NextPage = "-" + Var BaseOnPageBoard = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" @@ -2496,6 +2510,7 @@ PRICE "Reset" "-" SAVELOG "click ShowButtonClickFull" Var NextPage = "-" + Var BaseOnPageBoard = 0 OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" If SpiralOnline = "true" Then If InternationalEnable = 1 Then