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

update remove cup inter

Browse source
This commit is contained in:
Kenta420 2023-10-17 10:19:27 +07:00
parent 8fc18a38e4
commit 0edd2c0827
7 changed files with 177 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
inter/aus/menu/lang.tsv
View file

@ -157,8 +157,12 @@ TextID Note English Thai China Japan Malaysia
000407 Order next drink สั่งแก้วถัดไป Order next drink
Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center
000408 Next customer can order while waiting ลูกค้าท่านถัดไปสั่งเครื่องดื่มรอได้เลย Next customer can order while waiting
Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90
000409 The Previous Drink\nHas Not Been Collected มีเครื่องดื่มค้างอยู่\nในช่องรับเครื่องดื่ม The Previous Drink\nHas Not Been Collected
Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50 Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40 Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50
000410 Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink. กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink.
Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
000411 Press Here กดที่นี่ Press Here
img_active="ROOT/taobin_project/mage,img_press=,img_deactive= img_active="ROOT/taobin_project/mage,img_press=,img_deactive=

Can't render this file because it has a wrong number of fields in line 21.

156
inter/aus/xml/page_remove_cup.lxml Normal file
View file

@ -0,0 +1,156 @@
<Page>
<X> 0 </X>
<Y> 608 </Y>
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1312 </Height>
<Background> "0xEFEDEA" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var countClick = 0
Var countClick2 = 0
Var CountryName = "Australia"
DEBUGVAR "AUS Remove Cup"
Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
LED LedDoorDoor 5 255 255 255 255
</EventOpen>
<Timeout> 2000 </Timeout>
<EventTimeout>
;SAVELOG MachineErrorDetail
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
If MachineStage = "show-menu" Then
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
If MachineStage = "close-maintenance" Then
Open "ROOT/taobin_project/xml/page_show_error.lxml"
EndIf
; Logic have differrent drinkfail3.xml
; protect lock
;
If CheckCupStateDoorCupCloseCnt > 0 Then
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
EndIf
If CheckCupStateDoorCupCloseCnt = 0 Then
Var CheckCupStateDoorCupClose = ""
EndIf
If HaveCup = "true" Then
If CheckCupStateDoorCupClose = "" Then
Var buttonRemoveCup = "Enable"
EndIf
If CheckCupStateDoorCupClose = "done" Then
Var buttonRemoveCup = "Enable"
EndIf
Else
If buttonRemoveCup = "Enable" Then
Var buttonRemoveCup = "Invisible"
EndIf
EndIf
Refresh
TimerReset
</EventTimeout>
<Text>
<X> 50 </X>
<Y> 852 </Y>
<Width> 1000 </Width>
<Height> 300 </Height>
<Language>
<ID> 000409 </ID>
</Language>
</Text>
<Text>
<X> 50 </X>
<Y> 1200 </Y>
<Width> 1000 </Width>
<Height> 200 </Height>
<Language>
<ID> 000410 </ID>
</Language>
</Text>
<Button>
<X> 212 </X>
<Y> 1661 </Y>
<Filename> Var( DirImage + "/bn_door_open.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<State> buttonRemoveCup </State>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
Var buttonRemoveCup = "Invisible"
Var CheckCupStateDoorCupClose = "reset"
Var CheckCupStateDoorCupCloseCnt = 30
</EventClick>
<Language>
<ID> 000411 </ID>
<X> 80 </X>
<Y> 40 </Y>
<Width> 500 </Width>
<Height> 50 <Height>
</Language>
</Button>
<Button>
<X> 990 </X>
<Y> 400 </Y>
<State> show_eng_button_stage </State>
<Filename> show_btn </Filename>
<FilenamePress> show_btp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
; eng
If show_eng = "true" Then
Var show_eng = "false"
Else
Var show_eng = "true"
EndIf
Open CurrentXMLFileName2
</EventClick>
</Button>
<Text>
<X> 5 </X>
<Y> 1868 </Y>
<Size> 24 </Size>
<Align> Center </Align>
<Width> 1080 </Width>
<Font> RobotoRegular </Font>
<Color> 0xDE794E </Color>
<Value> MachineErrorDetailAll </Value>
</Text>
</Page>

0
inter/mys/image/user_take_cup_en/bn_door_open.png → inter/common/image/user_take_cup_en/bn_door_open.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Before After
Before After

0
inter/mys/image/user_take_cup_en/bp_door_open.png → inter/common/image/user_take_cup_en/bp_door_open.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Before After
Before After

17
inter/mys/menu/lang.tsv
View file

@ -52,11 +52,11 @@ TextID Note English Thai China Japan Malaysia
Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xEEEEEE,Align=Center
Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center Font=Kanit,Type=Regular,Size=14,Color=0xCFCFCF,Align=Center
000046 0% 0% 0%
000047 30% 30% 20%
000048 60% 60% 40%
000049 100% 100% 60%
000050 120% 120% 80%
000051 140% 140% 100%
000047 20% 20% 20%
000048 40% 40% 40%
000049 60% 60% 60%
000050 80% 80% 80%
000051 100% 100% 100%
Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Regular,Size=24,Color=0x513C2F,Align=Center
Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center Font=Kanit,Type=Bold,Size=24,Color=0x513C2F,Align=Center
000052 No added sugar ไม่ใส่น้ำตาล No added sugar
@ -157,7 +157,12 @@ TextID Note English Thai China Japan Malaysia
000407 Order next drink สั่งแก้วถัดไป Order next drink
Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center Font=Kanit,Type=Regular,Size=56,Color=0xDE794E,Align=Center
000408 Next customer can order while waiting ลูกค้าท่านถัดไปสั่งเครื่องดื่มรอได้เลย Next customer can order while waiting
Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90 Font=Roboto,Type=Bold,Size=80,Color=0x513C2F,Align=Center,LineHeight=90
000409 The Previous Drink\nHas Not Been Collected มีเครื่องดื่มค้างอยู่\nในช่องรับเครื่องดื่ม The Previous Drink\nHas Not Been Collected
Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50 Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40 Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50
000410 Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink. กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ Please press the button below to open the door.\nTake the drink out.\nAnd start odering your drink.
Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50 Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
000411 Press Here กดที่นี่ Press Here

Can't render this file because it has a wrong number of fields in line 21.

19
inter/mys/xml/page_remove_cup.lxml
View file

@ -7,15 +7,14 @@
<Background> "0xEFEDEA" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var Timeout = 0
Var countClick = 0
Var countClick2 = 0
Var CountryName = "Malaysia"
Var DirImage = "ROOT/taobin_project/inter/mys/image/user_take_cup_en/"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
DEBUGVAR "MALAY Remove Cup"
Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
LED LedDoorDoor 5 255 255 255 255
@ -36,18 +35,6 @@
Open "ROOT/taobin_project/xml/page_show_error.lxml"
EndIf
If Timeout = 0 Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
EndIf
Var Timeout = Timeout + 1
If Timeout > 15 Then
Var Timeout = 0
EndIf
; Logic have differrent drinkfail3.xml
; protect lock
;

3
xml/page_remove_cup.xml
View file

@ -18,8 +18,7 @@
EndIf
If StrCountryShort = "AUS" Then
Var CountryName = "Australia"
Var show_eng = "true"
Open "ROOT/taobin_project/inter/aus/xml/page_remove_cup.lxml"
EndIf