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

Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2023-09-18 15:59:08 +07:00
commit 9931cb7c1e
29 changed files with 7256 additions and 7237 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>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/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/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
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

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

@ -263,8 +263,8 @@
Refresh
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438 - 38
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 400
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430 - 38
@ -12222,8 +12222,8 @@
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/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/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen

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

@ -263,8 +263,8 @@
Refresh
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438 - 38
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 400
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430 - 38
@ -12222,8 +12222,8 @@
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/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/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen

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

@ -263,8 +263,8 @@
Refresh
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438 - 38
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 400
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430 - 38
@ -12222,8 +12222,8 @@
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/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/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen

4
inter/mys/xml/menu_catalog_new.lxml
View file

@ -106,8 +106,8 @@
Refresh
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438 - 38
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 400
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430 - 38

1234
inter/mys/xml/page_catalog_group_appfast.lxml
View file

File diff suppressed because it is too large Load diff

996
inter/mys/xml/page_catalog_group_cocktail.lxml
View file

File diff suppressed because it is too large Load diff

1218
inter/mys/xml/page_catalog_group_coffee.lxml
View file

File diff suppressed because it is too large Load diff

1234
inter/mys/xml/page_catalog_group_forkid.lxml
View file

File diff suppressed because it is too large Load diff

1208
inter/mys/xml/page_catalog_group_health.lxml
View file

File diff suppressed because it is too large Load diff

1222
inter/mys/xml/page_catalog_group_milk.lxml
View file

File diff suppressed because it is too large Load diff

1212
inter/mys/xml/page_catalog_group_other.lxml
View file

File diff suppressed because it is too large Load diff

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>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/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/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen

1218
inter/mys/xml/page_catalog_group_tea.lxml
View file

File diff suppressed because it is too large Load diff

1224
inter/mys/xml/page_catalog_group_whey.lxml
View file

File diff suppressed because it is too large Load diff

9
xml/page_board.xml
View file

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

5
xml/page_catalog.lxml
View file

@ -347,7 +347,6 @@
Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438
Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
@ -786,8 +785,8 @@
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/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/bn_remove_cup.png") </Filename>
<Filename> Var(RootPath + "image/main_page/bp_remove_cup.png") </Filename>
<EventClick>
Machine RemoveCup
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"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
@ -184,16 +184,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
@ -206,16 +206,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
Else
Var show_error_normal = "Enable"
@ -227,16 +227,16 @@
Var DirImage = "ROOT/taobin_project/image/close_th"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/close_en"
Var DirImage = CountryRootPath + "image/close_en"
EndIf
If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/close_en"
Var DirImage = CountryRootPath + "image/close_en"
EndIf
If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/close_en"
Var DirImage = CountryRootPath + "image/close_en"
EndIf
If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/close_en"
Var DirImage = CountryRootPath + "image/close_en"
EndIf
EndIf
EndIf
@ -250,16 +250,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
Else
Var show_error_normal = "Enable"
@ -268,16 +268,16 @@
Var DirImage = "ROOT/taobin_project/image/close_th"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/close_en"
Var DirImage = CountryRootPath + "image/close_en"
EndIf
If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/close_en"
Var DirImage = CountryRootPath + "image/close_en"
EndIf
If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/close_en"
Var DirImage = CountryRootPath + "image/close_en"
EndIf
If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/close_en"
Var DirImage = CountryRootPath + "image/close_en"
EndIf
EndIf
EndIf
@ -287,16 +287,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
@ -306,16 +306,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
If LanguageShow = "ENG" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "JAPAN" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "CHINA" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
If LanguageShow = "MALAY" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en"
Var DirImage = CountryRootPath + "image/vending_error_en"
EndIf
EndIf
@ -346,6 +346,13 @@
<Filename> RandomImage </Filename>
</Image>
<Image>
<State> show_error_normal </State>
<X> 127 </X>
<Y> 1750 </Y>
<Filename> Var(DirImage + "/text2.png") </Filename>
</Image>
<Image>
<State> show_error_sp1 </State>
<X> 0 </X>
@ -362,7 +369,7 @@
<Image>
<State> show_error_sp1 </State>
<X> 0 </X>
<X> 127 </X>
<Y> 1685 </Y>
<Filename> Var(DirImage + "/text2.png") </Filename>
</Image>

12
xml/page_topping_select8.xml
View file

@ -1090,24 +1090,24 @@
EndIf
If toppingID9index1price > 0 Then
Var priceFormated !assigned StringFmt( toppingID9index1price , PriceCustomCoffeeFormat, PreScaleConvertShow)
If toppingID9price1 > 0 Then
Var priceFormated !assigned StringFmt( toppingID9price1 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeLevelAdditionalPrice[0] = "(+" + priceFormated
Var CustomCoffeeLevelAdditionalPrice[0] = CustomCoffeeLevelAdditionalPrice[0] + ")"
Else
Var CustomCoffeeLevelAdditionalPrice[0] = ""
EndIf
If toppingID9index2price > 0 Then
Var priceFormated !assigned StringFmt( toppingID9index2price , PriceCustomCoffeeFormat, PreScaleConvertShow)
If toppingID9price2 > 0 Then
Var priceFormated !assigned StringFmt( toppingID9price2 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeLevelAdditionalPrice[1] = "(+" + priceFormated
Var CustomCoffeeLevelAdditionalPrice[1] = CustomCoffeeLevelAdditionalPrice[1] + ")"
Else
Var CustomCoffeeLevelAdditionalPrice[1] = ""
EndIf
If toppingID9index3price > 0 Then
Var priceFormated !assigned StringFmt( toppingID9index3price , PriceCustomCoffeeFormat, PreScaleConvertShow)
If toppingID9price3 > 0 Then
Var priceFormated !assigned StringFmt( toppingID9price3 , PriceCustomCoffeeFormat, PreScaleConvertShow)
Var CustomCoffeeLevelAdditionalPrice[2] = "(+" + priceFormated
Var CustomCoffeeLevelAdditionalPrice[2] = CustomCoffeeLevelAdditionalPrice[2] + ")"
Else

10
xml/topview2.xml
View file

@ -16,8 +16,18 @@
Var LanguageButtonListEnable = "Invisible"
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
; DEBUGVAR ButtonLanguageCurrentXPosition
; DEBUGVAR ButtonLanguageCurrentYPosition
;EndIf
Var ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27
Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14