diff --git a/inter/hkg/xml/event/tricker.ev b/inter/hkg/xml/event/tricker.ev index 7b562824..055c9874 100644 --- a/inter/hkg/xml/event/tricker.ev +++ b/inter/hkg/xml/event/tricker.ev @@ -8,3 +8,4 @@ Var SeasonPassMode = 0 +Var CleanFeedbackFlag = 0 \ No newline at end of file diff --git a/inter/hkg/xml/page_topping_select6.lxml b/inter/hkg/xml/page_topping_select6.lxml index cad71946..28c1a82d 100644 --- a/inter/hkg/xml/page_topping_select6.lxml +++ b/inter/hkg/xml/page_topping_select6.lxml @@ -571,7 +571,7 @@ ;Open PreviseXMLFileName2 DEBUGVAR OpenFromXML - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/event/tricker.ev" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" @@ -3578,7 +3578,7 @@ SoundVolume - TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/xml/multi/event/tricker.ev" OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" diff --git a/inter/tha/xml/helper_show_and_refresh.lxml b/inter/tha/xml/helper_show_and_refresh.lxml index fc5ebb0d..fcbc6f8f 100644 --- a/inter/tha/xml/helper_show_and_refresh.lxml +++ b/inter/tha/xml/helper_show_and_refresh.lxml @@ -1,2 +1,2 @@ -OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" -RootLayoutVisible 15 "show" \ No newline at end of file +OpenInst 14 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" +RootLayoutVisible 14 "show" \ No newline at end of file diff --git a/inter/tha/xml/multi/control_and_lang_swith.ev b/inter/tha/xml/multi/control_and_lang_swith.ev index a701e71f..fbe56050 100644 --- a/inter/tha/xml/multi/control_and_lang_swith.ev +++ b/inter/tha/xml/multi/control_and_lang_swith.ev @@ -89,7 +89,7 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr -;Var InstanceTabOpenFile12 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" +Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" diff --git a/inter/tha/xml/multi/page_catalog.lxml b/inter/tha/xml/multi/page_catalog.lxml index bfb32604..30bfdc9e 100644 --- a/inter/tha/xml/multi/page_catalog.lxml +++ b/inter/tha/xml/multi/page_catalog.lxml @@ -13,7 +13,7 @@ ; On open ; helper - RootLayoutVisible 15 "hide" + RootLayoutVisible 14 "hide" Machine WakeUp @@ -277,7 +277,7 @@ DEBUGVAR SpiralOnline - RootLayoutVisible 13 "hide" + RootLayoutVisible 15 "hide" @@ -532,6 +532,10 @@ Play PlaySoundLag Var countDownRetrun = 120 + Var ButtonLanguageCurrentXPosition = 1015 + Var ButtonLanguageCurrentYPosition = 458 - 38 + Var ButtonLanguageListXPosition = 982 + Var ButtonLanguageListYPosition = 450 - 38 Var LanguageButtonEnable = "Enable" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" @@ -717,7 +721,7 @@ EndIf RootLayoutVisible 3 "hide" - RootLayoutVisible 13 "hide" + RootLayoutVisible 15 "hide" ; eng Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml" @@ -1043,7 +1047,7 @@ @@ -168,7 +169,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "1" Var ShowTextNumber = "Invisible" Trim TelephoneNumber MaxPhoneNumber @@ -195,7 +198,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "2" Var ShowTextNumber = "Invisible" Trim TelephoneNumber MaxPhoneNumber @@ -224,7 +229,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "3" Var ShowTextNumber = "Invisible" Trim TelephoneNumber MaxPhoneNumber @@ -252,7 +259,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "4" Var ShowTextNumber = "Invisible" Trim TelephoneNumber MaxPhoneNumber @@ -281,7 +290,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "5" Var ShowTextNumber = "Invisible" Trim TelephoneNumber MaxPhoneNumber @@ -310,7 +321,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "6" Var ShowTextNumber = "Invisible" Trim TelephoneNumber MaxPhoneNumber @@ -339,7 +352,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "7" Var ShowTextNumber = "Invisible" Trim TelephoneNumber MaxPhoneNumber @@ -368,7 +383,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "8" Var ShowTextNumber = "Invisible" Trim TelephoneNumber MaxPhoneNumber @@ -396,7 +413,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "9" Var ShowTextNumber = "Invisible" Trim TelephoneNumber MaxPhoneNumber @@ -424,7 +443,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Var TelephoneNumber = TelephoneNumber + "0" Trim TelephoneNumber MaxPhoneNumber StrLen TelephoneNumber TelNumLen @@ -455,7 +476,9 @@ "ROOT/sounds/codebuttom.wav" SoundVolume - Var Timeout = 0 + If TimeoutHelperProccess < 50 Then + Var TimeoutHelperProccess = TimeoutHelperProccess + 10 + EndIf Trim TelephoneNumber -1 StrLen TelephoneNumber TelNumLen @@ -546,7 +569,7 @@ OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml" + OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_help_center.lxml" diff --git a/inter/tha/xml/page_help_center_sending_conti.lxml b/inter/tha/xml/page_help_center_sending_conti.lxml index 9f9e1eab..0cab3763 100644 --- a/inter/tha/xml/page_help_center_sending_conti.lxml +++ b/inter/tha/xml/page_help_center_sending_conti.lxml @@ -21,14 +21,18 @@ RootLayoutVisible 3 "hide" OpenInst 2 "ROOT/taobin_project/xml/page_brewing3Conti.xml" Else - Var LanguageButtonEnable = "Enable" - Var ButtonLanguageCurrentXPosition = 990 - Var ButtonLanguageCurrentYPosition = 608 - Var ButtonLanguageListXPosition = 970 - Var ButtonLanguageListYPosition = 590 - OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - OpenInst 2 "ROOT/taobin_project/xml/page_catalog.xml" - 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 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + Else + OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + EndIf EndIf EndIf diff --git a/inter/tha/xml/page_instance_empty.lxml b/inter/tha/xml/page_instance_empty.lxml index 662fda07..73695bbc 100644 --- a/inter/tha/xml/page_instance_empty.lxml +++ b/inter/tha/xml/page_instance_empty.lxml @@ -4,7 +4,7 @@ - RootLayoutVisible 13 "hide" + RootLayoutVisible 15 "hide" ;OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" Var CurrHelpCenter = 0 diff --git a/inter/tha/xml/page_smoothie_suggest_and_process.xml b/inter/tha/xml/page_smoothie_suggest_and_process.xml index 043cb1bb..95a1a2ed 100644 --- a/inter/tha/xml/page_smoothie_suggest_and_process.xml +++ b/inter/tha/xml/page_smoothie_suggest_and_process.xml @@ -370,7 +370,7 @@ Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml" + OpenInst 14 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml" diff --git a/inter/tha/xml/topview_helper.lxml b/inter/tha/xml/topview_helper.lxml index f060d337..348f736d 100644 --- a/inter/tha/xml/topview_helper.lxml +++ b/inter/tha/xml/topview_helper.lxml @@ -14,8 +14,6 @@ ;include="ROOT/taobin_project/inter/tha/xml/helper_show_and_refresh.lxml" - Var Timeout = 0 - SetInstanceIgnoreTouch DEBUGVAR SlientRefreshIndex diff --git a/xml/page_board.xml b/xml/page_board.xml index 4caa17f1..e1e817d6 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -10,6 +10,8 @@ ; tab_menu hide ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml" + RootLayoutVisible 3 "hide" + DEBUGVAR LangProcess Var ToggleAfterEventProfileOff = 0 @@ -1320,9 +1322,8 @@ ; enable helper - Var EnableHelperShow = 0 - ;Var FromDrinkOk = 1 - Var CurrHelpCenter = 0 + Var EnableHelperShow = 1 + Var FromDrinkOk = 1 If EnableHelperShow = 1 Then ; enable btn_change_langs Var EnableBtnLangWithHelper = 1 @@ -1341,10 +1342,14 @@ Var FromPaymentCash = "Invisible" Var FromBrewingProcess = "Enable" - RootLayoutVisible 15 "show" - OpenInst 15 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" + RootLayoutVisible 14 "show" + If CurrHelpCenter = 1 Then + ;do not thing + Else + OpenInst 14 "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" + EndIf Else - RootLayoutVisible 15 "hide" + RootLayoutVisible 14 "hide" EndIf Else RootLayoutVisible 3 "hide" @@ -2120,11 +2125,9 @@ PRICE "Reset" "-" DEBUGVAR InternationalEnable DEBUGVAR CountryName - - Var BaseOnPageBoard = 0 If CurrHelpCenter = 1 Then - ; do not thing when open the helper + OpenInst 0 "ROOT/taobin_project/xml/page_board.xml" Else Var BaseOnPageBoard = 0 TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" @@ -2303,7 +2306,7 @@ PRICE "Reset" "-" If CurrHelpCenter = 1 Then ;do not thing Else - OpenInst 15 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" + OpenInst 14 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_instance_empty.lxml" EndIf EndIf EndIf @@ -2604,7 +2607,7 @@ PRICE "Reset" "-" Var OpenFromPageBoard = 1 If CurrHelpCenter = 1 Then - ; do not thing when open the helper + OpenInst 0 "ROOT/taobin_project/xml/page_board.xml" Else Var BaseOnPageBoard = 0 diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 44060558..0ebe01e2 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -2782,8 +2782,7 @@ OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" - OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml" - ;RootLayoutVisible 15 "show" + OpenInst 14 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml" diff --git a/xml/topview2.xml b/xml/topview2.xml index 54bb0d6d..4b5814a4 100644 --- a/xml/topview2.xml +++ b/xml/topview2.xml @@ -76,6 +76,8 @@ Var ButtonLanguageListWidth = 70 l 86 + Var ButtonLanguageListXPositionIconForFlag = ButtonLanguageListXPositionIcon - 10 + DEBUGVAR ENABLE_LANGUAGE_COUNT If ENABLE_LANGUAGE_COUNT = "" Then LanguageControl "UpdateList" 1 @@ -502,7 +504,7 @@ - ButtonLanguageListXPositionIcon + ButtonLanguageListXPositionIconForFlag ButtonLanguageListYPositionIcon 1080 "auto"