pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

update malaysia language btn, page_show_error, and remove cup

Browse source
This commit is contained in:
kenta-work 2023-09-15 13:45:44 +07:00
parent 48a611e0c7
commit c74d0c2ed7
18 changed files with 1860 additions and 1840 deletions
Download patch file Download diff file Expand all files Collapse all files

4
inter/aus/xml/event/promotion_pepsi_099.lxml
View file

@ -12222,8 +12222,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

1260
inter/aus/xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

BIN
inter/mys/image/close_en/img1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

BIN
inter/mys/image/lang/bn_eng_lang.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
inter/mys/image/lang/bn_malay_lang.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
inter/mys/image/vending_error_en/img1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 54 KiB

BIN
inter/mys/image/vending_error_en/text1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
inter/mys/image/vending_error_en/text2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 13 KiB

4
inter/mys/xml/event/promotion_2.xml
View file

@ -12222,8 +12222,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/event/promotion_3.xml
View file

@ -12222,8 +12222,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
inter/mys/xml/event/promotion_pepsi_099.lxml
View file

@ -12222,8 +12222,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

1260
inter/mys/xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

4
inter/mys/xml/page_catalog_group_recommend.skt
View file

@ -65,8 +65,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

9
xml/page_board.xml
View file

@ -820,18 +820,21 @@
If Not#LanguageResult = "false" Then If Not#LanguageResult = "false" Then
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/ui/lang.tsv" LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/ui/lang.tsv"
EndIf EndIf
Var RootPath = "ROOT/taobin_project/inter/common/"
Var OpenFileXML = CountryRootPath + "xml/event/tricker.ev" Var OpenFileXML = CountryRootPath + "xml/event/tricker.ev"
DEBUGVAR OpenFileXML DEBUGVAR OpenFileXML
TRY OpenFileXML TRY OpenFileXML
Else Else
Var LanguageObjectShow = "Invisible" Var LanguageObjectShow = "Invisible"
Var NoLangObjectShow = "Enable" Var NoLangObjectShow = "Enable"
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev" TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
Var RootPath = "ROOT/taobin_project/"
EndIf EndIf
@ -1387,8 +1390,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

4
xml/page_catalog.lxml
View file

@ -786,8 +786,8 @@
<State> buttonRemoveCup </State> <State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color> ;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval> <Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bn_remove_cup.png") </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename> <Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick> <EventClick>
Machine RemoveCup Machine RemoveCup
Machine DoorLidOpen Machine DoorLidOpen

1062
xml/page_catalog_group_recommend.lxml
View file

File diff suppressed because it is too large Load diff

73
xml/page_show_error.lxml
View file

@ -166,16 +166,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error" Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf EndIf
If LanguageShow = "ENG" Then If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "JAPAN" Then If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "CHINA" Then If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "MALAY" Then If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
EndIf EndIf
@ -184,16 +184,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error" Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf EndIf
If LanguageShow = "ENG" Then If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "JAPAN" Then If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "CHINA" Then If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "MALAY" Then If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
EndIf EndIf
@ -206,16 +206,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error" Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf EndIf
If LanguageShow = "ENG" Then If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "JAPAN" Then If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "CHINA" Then If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "MALAY" Then If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
Else Else
Var show_error_normal = "Enable" Var show_error_normal = "Enable"
@ -227,16 +227,16 @@
Var DirImage = "ROOT/taobin_project/image/close_th" Var DirImage = "ROOT/taobin_project/image/close_th"
EndIf EndIf
If LanguageShow = "ENG" Then If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/close_en" Var DirImage = CountryRootPath + "image/close_en"
EndIf EndIf
If LanguageShow = "JAPAN" Then If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/close_en" Var DirImage = CountryRootPath + "image/close_en"
EndIf EndIf
If LanguageShow = "CHINA" Then If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/close_en" Var DirImage = CountryRootPath + "image/close_en"
EndIf EndIf
If LanguageShow = "MALAY" Then If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/close_en" Var DirImage = CountryRootPath + "image/close_en"
EndIf EndIf
EndIf EndIf
EndIf EndIf
@ -250,16 +250,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error" Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf EndIf
If LanguageShow = "ENG" Then If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "JAPAN" Then If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "CHINA" Then If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "MALAY" Then If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
Else Else
Var show_error_normal = "Enable" Var show_error_normal = "Enable"
@ -268,16 +268,16 @@
Var DirImage = "ROOT/taobin_project/image/close_th" Var DirImage = "ROOT/taobin_project/image/close_th"
EndIf EndIf
If LanguageShow = "ENG" Then If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/close_en" Var DirImage = CountryRootPath + "image/close_en"
EndIf EndIf
If LanguageShow = "JAPAN" Then If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/close_en" Var DirImage = CountryRootPath + "image/close_en"
EndIf EndIf
If LanguageShow = "CHINA" Then If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/close_en" Var DirImage = CountryRootPath + "image/close_en"
EndIf EndIf
If LanguageShow = "MALAY" Then If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/close_en" Var DirImage = CountryRootPath + "image/close_en"
EndIf EndIf
EndIf EndIf
EndIf EndIf
@ -287,16 +287,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error" Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf EndIf
If LanguageShow = "ENG" Then If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "JAPAN" Then If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "CHINA" Then If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "MALAY" Then If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
EndIf EndIf
@ -306,16 +306,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error" Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf EndIf
If LanguageShow = "ENG" Then If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "JAPAN" Then If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "CHINA" Then If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
If LanguageShow = "MALAY" Then If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en" Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf EndIf
EndIf EndIf
@ -346,6 +346,13 @@
<Filename> RandomImage </Filename> <Filename> RandomImage </Filename>
</Image> </Image>
<Image>
<State> show_error_normal </State>
<X> 127 </X>
<Y> 1750 </Y>
<Filename> Var(DirImage + "/text2.png") </Filename>
</Image>
<Image> <Image>
<State> show_error_sp1 </State> <State> show_error_sp1 </State>
<X> 0 </X> <X> 0 </X>
@ -362,7 +369,7 @@
<Image> <Image>
<State> show_error_sp1 </State> <State> show_error_sp1 </State>
<X> 0 </X> <X> 127 </X>
<Y> 1685 </Y> <Y> 1685 </Y>
<Filename> Var(DirImage + "/text2.png") </Filename> <Filename> Var(DirImage + "/text2.png") </Filename>
</Image> </Image>

12
xml/topview2.xml
View file

@ -16,7 +16,17 @@
Var LanguageButtonListEnable = "Invisible" Var LanguageButtonListEnable = "Invisible"
Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex] Var langFileNameIcon = lang_icon_file_name[LanguageShowByIndex]
Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
If CountryName = "Malaysia" Then
Var dirImageLang = CountryRootPath + "image/lang/"
Var langfn = dirImageLang + langFileNameIcon
DEBUGVAR langfn
Var ButtonLanguageCurrentXPosition = ButtonLanguageCurrentXPosition - 40
Var ButtonLanguageCurrentYPosition = ButtonLanguageCurrentYPosition + 20
Else
Var langfn = "ROOT/taobin_project/image/lang/" + langFileNameIcon
EndIf
Var ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27 Var ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27
Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14 Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14