Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

This commit is contained in:
Pakin 2023-11-16 13:06:09 +07:00
commit 6262c6163e
13 changed files with 21 additions and 21 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

View file

@ -7,7 +7,7 @@ TextID Note English Thai
Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30 Font=Kanit,Type=Medium,Size=32,Color=0x513C2F,Align=Center,LineHeight=30
000003 Page catalog body Our Specialty เมนูแนะนำ 000003 Page catalog body Best Sellers เมนูแนะนำ
000004 Vending\nMachine ตู้สินค้า 000004 Vending\nMachine ตู้สินค้า
000005 Coffee กาแฟ 000005 Coffee กาแฟ
000006 Tea ชา 000006 Tea ชา

1 TextID Note English Thai
7 000003 Page catalog body Our Specialty Best Sellers เมนูแนะนำ
8 000004 Vending\nMachine ตู้สินค้า
9 000005 Coffee กาแฟ
10 000006 Tea ชา
11 000007 Milk, Caramel\n& Cocoa นม, โกโก้ และ \nคาราเมล
12 000008 Protein\nShake โปรตีนเชค
13 000009 Soda & others โซดา และ อื่นๆ

View file

@ -172,8 +172,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

View file

@ -331,8 +331,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

View file

@ -323,8 +323,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

View file

@ -332,8 +332,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

View file

@ -323,8 +323,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

View file

@ -321,8 +321,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

View file

@ -322,8 +322,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

View file

@ -329,8 +329,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

View file

@ -323,8 +323,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>

View file

@ -328,8 +328,8 @@
<Button> <Button>
<Layout> "linear" </Layout> <Layout> "linear" </Layout>
<State> Menu1Selected </State> <State> Menu1Selected </State>
<Filename> Var( DirImageAlter + "/bn_recommend2.png" )</Filename> <Filename> Var( DirImageAlter + "/bn_recommend3.png" )</Filename>
<FilenamePress> Var( DirImageAlter + "/bp_recommend2.png") </FilenamePress> <FilenamePress> Var( DirImageAlter + "/bp_recommend3.png") </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>