diff --git a/inter/hkg/configure.ev b/inter/hkg/configure.ev index 6b4d76c4..e3b5ec8d 100644 --- a/inter/hkg/configure.ev +++ b/inter/hkg/configure.ev @@ -1,7 +1,5 @@ - If BoxID = 210699 Then - Var EnableMultiInstanceFromBoxID = 1 - EndIf + Var EnableMultiInstanceFromBoxID = 1 READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig If EnableMultiInstanceFromConfig = "true" Then diff --git a/xml/page_board.xml b/xml/page_board.xml index 9838599f..309d21ba 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -1131,158 +1131,79 @@ EndIf If CountryName = "HongKong" Then - Var EnableMultiInstance = "true" - If EnableMultiInstance = "true" Then + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev" - ; Change lang icon for hkg - Var show_eng_button_stage = "Invisible" - Var LanguageButtonEnable = "Invisible" - Var BtnLangToggleIndex = "Enable" + ; Change lang icon for hkg + Var show_eng_button_stage = "Invisible" + Var LanguageButtonEnable = "Invisible" + Var BtnLangToggleIndex = "Enable" - Var InternationalEnable = 1 - Var CurrentPageShowError = 0 - TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev" + EnableLanguage "MTC" + EnableLanguage "MSC" + EnableLanguage "ENG" - EnableLanguage "MTC" - EnableLanguage "MSC" - EnableLanguage "ENG" + Var LanguageShow = "MTC" + SetLanguage "MTC" + LanguageControl "UpdateList" "-" + + Var InternationalEnable = 1 + Var show_eng = "true" + Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" - Var LanguageShow = "MTC" - SetLanguage "MTC" - LanguageControl "UpdateList" "-" + Var ShowNetworkProblemText = "Network error. Payment Cash only." - If BoxID = 210699 Then - Var CatalogLayoutV3 = 1 - EndIf - - Var show_eng = "true" - Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" - - Var ShowNetworkProblemText = "Network error." - - Var CountryRootPath = "ROOT/taobin_project/inter/hkg/" - Var CountryShortName = "hkg" + Var CountryRootPath = "ROOT/taobin_project/inter/hkg/" + Var CountryShortName = "hkg" - Var TextPriceMenuSize = 12 - Var TextPriceMenuY = 266 - Var TextPriceMenuColdx = 113 - Var TextPriceMenuBlendX = 180 - Var TextPriceMenuHotX = 48 + Var TextPriceMenuSize = 12 + Var TextPriceMenuY = 266 + Var TextPriceMenuBlendX = 180 + Var TextPriceMenuHotX = 48 + Var ShowButtonClick2 = "Invisible" + Var ButtontoTopupMenu = "Invisible" - Var TextHotMenuX = 19 - Var TextColdMenuX = 84 - Var TextBlendMenuX = 148 + Var PriceUnitText = "HK$" - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" + Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png" + Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png" + Var show_eng_button_stage = "Invisible" - Var PriceUnitText = "HK$" + Var CountDownShowButton = 35 - Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png" - Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png" + Var XButtonMember = 384 + Var YButtonMember = 1695 - Var CountDownShowButton = 35 - - Var XButtonMember = 384 - Var YButtonMember = 1695 - - If Not#LanguageLoaded = "" Then - LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/menu/lang.tsv" - EndIf - - Var cups_sold_text = "Cups Sold Worldwide" - - STRCONTAIN "541215" MaterialAvailable SugarZeroCalEnable - - Var SettingDisableTaobinCredit = "true" - ;Var SettingDisableTaobinCode = "false" - - Var SettingIgnoreCollectPoint = 1 - - READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev - STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg - - If enable_pt_mode_by_cfg = "true" Then - DEBUGVAR enable_pt_mode_by_cfg - Var SettingIgnoreCollectPoint = 0 - EndIf - - Var SettingVideoBrewingUseCommon = 1 - - Var MinPhoneNumber = 8 - Var MaxPhoneNumber = 8 - - Var ShowCountDownAsPercent = 0 - - DEBUGVAR ShowButtonClick2 - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" - Else - TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev" - - EnableLanguage "ENG" - SetLanguage "ENG" - LanguageControl "UpdateList" "-" - - Var InternationalEnable = 1 - Var show_eng = "true" - Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" - - Var ShowNetworkProblemText = "Network error. Payment Cash only." - - Var CountryRootPath = "ROOT/taobin_project/inter/hkg/" - Var CountryShortName = "hkg" - - - Var TextPriceMenuSize = 12 - Var TextPriceMenuY = 266 - Var TextPriceMenuBlendX = 180 - Var TextPriceMenuHotX = 48 - Var ShowButtonClick2 = "Invisible" - Var ButtontoTopupMenu = "Invisible" - - Var PriceUnitText = "HKG$" - - Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png" - Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png" - Var show_eng_button_stage = "Invisible" - - Var CountDownShowButton = 35 - - Var XButtonMember = 384 - Var YButtonMember = 1695 - - If Not#LanguageLoaded = "" Then - LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/menu/lang.tsv" - EndIf - - Var cups_sold_text = "Cups Sold Worldwide" - - STRCONTAIN "541215" MaterialAvailable SugarZeroCalEnable - - Var SettingDisableTaobinCredit = "true" - ;Var SettingDisableTaobinCode = "false" - - Var SettingIgnoreCollectPoint = 1 - - READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev - STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg - - If enable_pt_mode_by_cfg = "true" Then - DEBUGVAR enable_pt_mode_by_cfg - Var SettingIgnoreCollectPoint = 0 - EndIf - - Var SettingVideoBrewingUseCommon = 1 - - Var MinPhoneNumber = 8 - Var MaxPhoneNumber = 8 - - Var ShowCountDownAsPercent = 0 - - DEBUGVAR ShowButtonClick2 - OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" + If Not#LanguageLoaded = "" Then + LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/menu/lang.tsv" EndIf + + Var cups_sold_text = "Cups Sold Worldwide" + + STRCONTAIN "541215" MaterialAvailable SugarZeroCalEnable + + Var SettingDisableTaobinCredit = "true" + ;Var SettingDisableTaobinCode = "false" + + Var SettingIgnoreCollectPoint = 1 + + READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev + STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg + + If enable_pt_mode_by_cfg = "true" Then + DEBUGVAR enable_pt_mode_by_cfg + Var SettingIgnoreCollectPoint = 0 + EndIf + + Var SettingVideoBrewingUseCommon = 1 + + Var MinPhoneNumber = 8 + Var MaxPhoneNumber = 8 + + Var ShowCountDownAsPercent = 0 + + DEBUGVAR ShowButtonClick2 + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" EndIf ;inter-page-board @@ -1570,6 +1491,93 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" EndIf + + If CountryName = "HongKong" Then + ; Change lang icon for hkg + Var show_eng_button_stage = "Invisible" + Var LanguageButtonEnable = "Invisible" + Var BtnLangToggleIndex = "Enable" + + Var EnableMultiInstance = "true" + + Var InternationalEnable = 1 + Var CurrentPageShowError = 0 + TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev" + + EnableLanguage "MTC" + EnableLanguage "MSC" + EnableLanguage "ENG" + + Var LanguageShow = "MTC" + SetLanguage "MTC" + LanguageControl "UpdateList" "-" + + Var CatalogLayoutV3 = 1 + + Var show_eng = "true" + Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png" + + Var ShowNetworkProblemText = "Network error." + + Var CountryRootPath = "ROOT/taobin_project/inter/hkg/" + Var CountryShortName = "hkg" + + + Var TextPriceMenuSize = 12 + Var TextPriceMenuY = 266 + Var TextPriceMenuColdx = 113 + Var TextPriceMenuBlendX = 180 + Var TextPriceMenuHotX = 48 + + Var TextHotMenuX = 19 + Var TextColdMenuX = 84 + Var TextBlendMenuX = 148 + + Var ShowButtonClick2 = "Invisible" + Var ButtontoTopupMenu = "Invisible" + + Var PriceUnitText = "HK$" + + Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png" + Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png" + + Var CountDownShowButton = 35 + + Var XButtonMember = 384 + Var YButtonMember = 1695 + + If Not#LanguageLoaded = "" Then + LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/menu/lang.tsv" + EndIf + + Var cups_sold_text = "Cups Sold Worldwide" + + STRCONTAIN "541215" MaterialAvailable SugarZeroCalEnable + + Var SettingDisableTaobinCredit = "true" + ;Var SettingDisableTaobinCode = "false" + + Var SettingIgnoreCollectPoint = 1 + + READ_FILE "/mnt/sdcard/coffeevending/use_pt_dev" use_pt_dev + STRCONTAIN "1" use_pt_dev enable_pt_mode_by_cfg + + If enable_pt_mode_by_cfg = "true" Then + DEBUGVAR enable_pt_mode_by_cfg + Var SettingIgnoreCollectPoint = 0 + EndIf + + Var SettingVideoBrewingUseCommon = 1 + + Var MinPhoneNumber = 8 + Var MaxPhoneNumber = 8 + + Var ShowCountDownAsPercent = 0 + + DEBUGVAR ShowButtonClick2 + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml" + EndIf + Else Var EnableMultiInstance = "false" EndIf diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml index e40837db..2cd9986c 100644 --- a/xml/page_topping_select8.xml +++ b/xml/page_topping_select8.xml @@ -3061,7 +3061,14 @@ Var LidDeactiveButton = "Enable" EndIf EndIf - + + ;straw-lid-state-show + If ShowLidStraw = "Invisible" Then + Var StrawState = "Invisible" + Var LidState = "Invisible" + Var LidDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" + EndIf If UserSeletedSugar = 0 Then @@ -4194,6 +4201,7 @@ 460 350 195 + ShowLidStraw Var( DirImageInter + "/bg_strawlid.png" ) @@ -4202,6 +4210,17 @@ 575 500 72 + eval( + If ShowLidStraw = "Enable" Then + If StrawDeactiveButton = "Enable" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf +) 002090 @@ -4212,6 +4231,17 @@ 495 500 72 + eval( + If ShowLidStraw = "Enable" Then + If LidDeactiveButton = "Enable" Then + Var return = "Invisible" + Else + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf +) 002091 @@ -4326,20 +4356,27 @@ - - LidDeactiveButton - 665 - 480 - Var( DirImage + "/text21.png" ) - - - - StrawDeactiveButton - 665 + + 740 563 - Var( DirImage + "/text20.png" ) - + 200 + 72 + StrawDeactiveButton + + 000090 + + + + 740 + 480 + 200 + 72 + LidDeactiveButton + + 000091 + +