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

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

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

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View file

@ -263,8 +263,8 @@
Refresh Refresh
Var LanguageButtonEnable = "Enable" Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438 - 38 Var ButtonLanguageCurrentYPosition = 400
Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430 - 38 Var ButtonLanguageListYPosition = 430 - 38
@ -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

View file

@ -263,8 +263,8 @@
Refresh Refresh
Var LanguageButtonEnable = "Enable" Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438 - 38 Var ButtonLanguageCurrentYPosition = 400
Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430 - 38 Var ButtonLanguageListYPosition = 430 - 38
@ -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

View file

@ -263,8 +263,8 @@
Refresh Refresh
Var LanguageButtonEnable = "Enable" Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438 - 38 Var ButtonLanguageCurrentYPosition = 400
Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430 - 38 Var ButtonLanguageListYPosition = 430 - 38
@ -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

View file

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

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

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

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -821,18 +821,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
@ -1388,8 +1391,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

View file

@ -347,7 +347,6 @@
Var LanguageButtonEnable = "Enable" Var LanguageButtonEnable = "Enable"
Var ButtonLanguageCurrentXPosition = 990 Var ButtonLanguageCurrentXPosition = 990
Var ButtonLanguageCurrentYPosition = 438 Var ButtonLanguageCurrentYPosition = 438
Var ButtonLanguageListXPosition = 970 Var ButtonLanguageListXPosition = 970
Var ButtonLanguageListYPosition = 430 Var ButtonLanguageListYPosition = 430
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
@ -786,8 +785,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

File diff suppressed because it is too large Load diff

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>

View file

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

View file

@ -16,8 +16,18 @@
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 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 ButtonLanguageListXPositionIcon = ButtonLanguageListXPosition + 27
Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14 Var ButtonLanguageListYPositionIcon = ButtonLanguageListYPosition + 14