brefore merge
This commit is contained in:
wanlop run
commit
29f93340e0
3 changed files with 198 additions and 155 deletions
|
|
@ -1,7 +1,5 @@
|
||||||
|
|
||||||
If BoxID = 210699 Then
|
Var EnableMultiInstanceFromBoxID = 1
|
||||||
Var EnableMultiInstanceFromBoxID = 1
|
|
||||||
EndIf
|
|
||||||
|
|
||||||
READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig
|
READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig
|
||||||
If EnableMultiInstanceFromConfig = "true" Then
|
If EnableMultiInstanceFromConfig = "true" Then
|
||||||
|
|
|
||||||
|
|
@ -1131,158 +1131,79 @@
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
If CountryName = "HongKong" Then
|
If CountryName = "HongKong" Then
|
||||||
Var EnableMultiInstance = "true"
|
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev"
|
||||||
If EnableMultiInstance = "true" Then
|
|
||||||
|
|
||||||
; Change lang icon for hkg
|
; Change lang icon for hkg
|
||||||
Var show_eng_button_stage = "Invisible"
|
Var show_eng_button_stage = "Invisible"
|
||||||
Var LanguageButtonEnable = "Invisible"
|
Var LanguageButtonEnable = "Invisible"
|
||||||
Var BtnLangToggleIndex = "Enable"
|
Var BtnLangToggleIndex = "Enable"
|
||||||
|
|
||||||
Var InternationalEnable = 1
|
EnableLanguage "MTC"
|
||||||
Var CurrentPageShowError = 0
|
EnableLanguage "MSC"
|
||||||
TRY "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/video/script_video.ev"
|
EnableLanguage "ENG"
|
||||||
|
|
||||||
EnableLanguage "MTC"
|
Var LanguageShow = "MTC"
|
||||||
EnableLanguage "MSC"
|
SetLanguage "MTC"
|
||||||
EnableLanguage "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 LanguageShow = "MTC"
|
Var ShowNetworkProblemText = "Network error. Payment Cash only."
|
||||||
SetLanguage "MTC"
|
|
||||||
LanguageControl "UpdateList" "-"
|
|
||||||
|
|
||||||
If BoxID = 210699 Then
|
Var CountryRootPath = "ROOT/taobin_project/inter/hkg/"
|
||||||
Var CatalogLayoutV3 = 1
|
Var CountryShortName = "hkg"
|
||||||
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 TextPriceMenuSize = 12
|
Var TextPriceMenuSize = 12
|
||||||
Var TextPriceMenuY = 266
|
Var TextPriceMenuY = 266
|
||||||
Var TextPriceMenuColdx = 113
|
Var TextPriceMenuBlendX = 180
|
||||||
Var TextPriceMenuBlendX = 180
|
Var TextPriceMenuHotX = 48
|
||||||
Var TextPriceMenuHotX = 48
|
Var ShowButtonClick2 = "Invisible"
|
||||||
|
Var ButtontoTopupMenu = "Invisible"
|
||||||
|
|
||||||
Var TextHotMenuX = 19
|
Var PriceUnitText = "HK$"
|
||||||
Var TextColdMenuX = 84
|
|
||||||
Var TextBlendMenuX = 148
|
|
||||||
|
|
||||||
Var ShowButtonClick2 = "Invisible"
|
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
|
||||||
Var ButtontoTopupMenu = "Invisible"
|
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 XButtonMember = 384
|
||||||
Var MemberButtonFileNameRest = "ROOT/taobin_project/image/main_page_en/bn_main_page_member.png"
|
Var YButtonMember = 1695
|
||||||
|
|
||||||
Var CountDownShowButton = 35
|
If Not#LanguageLoaded = "" Then
|
||||||
|
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/hkg/menu/lang.tsv"
|
||||||
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"
|
|
||||||
EndIf
|
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
|
EndIf
|
||||||
|
|
||||||
;inter-page-board
|
;inter-page-board
|
||||||
|
|
@ -1570,6 +1491,93 @@
|
||||||
|
|
||||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
|
||||||
EndIf
|
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
|
Else
|
||||||
Var EnableMultiInstance = "false"
|
Var EnableMultiInstance = "false"
|
||||||
EndIf
|
EndIf
|
||||||
|
|
|
||||||
|
|
@ -3061,7 +3061,14 @@
|
||||||
Var LidDeactiveButton = "Enable"
|
Var LidDeactiveButton = "Enable"
|
||||||
EndIf
|
EndIf
|
||||||
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
|
If UserSeletedSugar = 0 Then
|
||||||
|
|
||||||
|
|
@ -4194,6 +4201,7 @@
|
||||||
<Y> 460 </Y>
|
<Y> 460 </Y>
|
||||||
<Width> 350 </Width>
|
<Width> 350 </Width>
|
||||||
<Height> 195 </Height>
|
<Height> 195 </Height>
|
||||||
|
<State> ShowLidStraw </State>
|
||||||
<Filename> Var( DirImageInter + "/bg_strawlid.png" ) </Filename>
|
<Filename> Var( DirImageInter + "/bg_strawlid.png" ) </Filename>
|
||||||
</Image>
|
</Image>
|
||||||
|
|
||||||
|
|
@ -4202,6 +4210,17 @@
|
||||||
<Y> 575 </Y>
|
<Y> 575 </Y>
|
||||||
<Width> 500 </Width>
|
<Width> 500 </Width>
|
||||||
<Height> 72 </Height>
|
<Height> 72 </Height>
|
||||||
|
<State> eval(
|
||||||
|
If ShowLidStraw = "Enable" Then
|
||||||
|
If StrawDeactiveButton = "Enable" Then
|
||||||
|
Var return = "Invisible"
|
||||||
|
Else
|
||||||
|
Var return = "Enable"
|
||||||
|
EndIf
|
||||||
|
Else
|
||||||
|
Var return = "Invisible"
|
||||||
|
EndIf
|
||||||
|
) </State>
|
||||||
<Language>
|
<Language>
|
||||||
<ID> 002090 </ID>
|
<ID> 002090 </ID>
|
||||||
</Language>
|
</Language>
|
||||||
|
|
@ -4212,6 +4231,17 @@
|
||||||
<Y> 495 </Y>
|
<Y> 495 </Y>
|
||||||
<Width> 500 </Width>
|
<Width> 500 </Width>
|
||||||
<Height> 72 </Height>
|
<Height> 72 </Height>
|
||||||
|
<State> eval(
|
||||||
|
If ShowLidStraw = "Enable" Then
|
||||||
|
If LidDeactiveButton = "Enable" Then
|
||||||
|
Var return = "Invisible"
|
||||||
|
Else
|
||||||
|
Var return = "Enable"
|
||||||
|
EndIf
|
||||||
|
Else
|
||||||
|
Var return = "Invisible"
|
||||||
|
EndIf
|
||||||
|
) </State>
|
||||||
<Language>
|
<Language>
|
||||||
<ID> 002091 </ID>
|
<ID> 002091 </ID>
|
||||||
</Language>
|
</Language>
|
||||||
|
|
@ -4326,20 +4356,27 @@
|
||||||
</EventClick>
|
</EventClick>
|
||||||
</Button>
|
</Button>
|
||||||
|
|
||||||
<Image>
|
<Text>
|
||||||
<State> LidDeactiveButton </State>
|
<X> 740 </X>
|
||||||
<X> 665 </X>
|
|
||||||
<Y> 480 </Y>
|
|
||||||
<Filename> Var( DirImage + "/text21.png" ) </Filename>
|
|
||||||
</Image>
|
|
||||||
|
|
||||||
<Image>
|
|
||||||
<State> StrawDeactiveButton </State>
|
|
||||||
<X> 665 </X>
|
|
||||||
<Y> 563 </Y>
|
<Y> 563 </Y>
|
||||||
<Filename> Var( DirImage + "/text20.png" ) </Filename>
|
<Width> 200 </Width>
|
||||||
</Image>
|
<Height> 72 </Height>
|
||||||
|
<State> StrawDeactiveButton </State>
|
||||||
|
<Language>
|
||||||
|
<ID> 000090 </ID>
|
||||||
|
</Language>
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
<Text>
|
||||||
|
<X> 740 </X>
|
||||||
|
<Y> 480 </Y>
|
||||||
|
<Width> 200 </Width>
|
||||||
|
<Height> 72 </Height>
|
||||||
|
<State> LidDeactiveButton </State>
|
||||||
|
<Language>
|
||||||
|
<ID> 000091 </ID>
|
||||||
|
</Language>
|
||||||
|
</Text>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue