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

FIx abug

Browse source
This commit is contained in:
kong 2020-11-17 13:32:56 +07:00
parent 2d14cc375a
commit a65fd72796
41 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
image/bn_brew2.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

BIN
image/bp_brew1.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2 KiB

BIN
image/topping/bn_brew1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before After
Before After

BIN
image/topping/bn_brew2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before After
Before After

BIN
image/topping/bn_sugar1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before After
Before After

BIN
image/topping/bn_sugar2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

BIN
image/topping/bn_sugar3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

BIN
image/topping/bn_sugar4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

Before After
Before After

BIN
image/topping/bn_sugar5.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Before After
Before After

BIN
image/topping/bp_brew1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Before After
Before After

BIN
image/topping/bp_brew2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Before After
Before After

BIN
image/topping/bp_sugar1.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Before After
Before After

BIN
image/topping/bp_sugar2.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

Before After
Before After

BIN
image/topping/bp_sugar3.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Before After
Before After

BIN
image/topping/bp_sugar4.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

BIN
image/topping/bp_sugar5.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before After
Before After

BIN
image/topping/img_sugar.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8 KiB

After

Width:  |  Height:  |  Size: 7.8 KiB

Before After
Before After

BIN
image/topping_en/bn_brew1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
image/topping_en/bn_brew2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
image/topping_en/bn_cancel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
image/topping_en/bn_next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
image/topping_en/bn_sugar1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
image/topping_en/bn_sugar2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/topping_en/bn_sugar3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/topping_en/bn_sugar4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
image/topping_en/bn_sugar5.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/topping_en/bp_brew1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
image/topping_en/bp_brew2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
image/topping_en/bp_cancel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
image/topping_en/bp_next.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
image/topping_en/bp_sugar1.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
image/topping_en/bp_sugar2.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
image/topping_en/bp_sugar3.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
image/topping_en/bp_sugar4.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
image/topping_en/bp_sugar5.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
image/topping_en/img_sugar.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.9 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB

Before After
Before After

5
xml/page_back_to_main.xml
View file

@ -7,8 +7,11 @@
OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
TopView "hide"
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
</EventOpen>
<Timeout> 60000 </Timeout>
<EventTimeout>

2
xml/page_drinkok.xml
View file

@ -18,7 +18,7 @@
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<Timeout> 800 </Timeout>
<EventTimeout>
If HaveCup = "false" Then

6
xml/page_lid_straw.xml
View file

@ -9,7 +9,7 @@
; On open
Var LidState = Lid1Status
Var StarwState = "Enable"
Var LidStrawCountDown = 15
Var LidStrawCountDown = 10
If show_eng = "true" Then
@ -20,7 +20,7 @@
EndIf
</EventOpen>
<Timeout> 1000 </Timeout>
<Timeout> 800 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
@ -33,7 +33,7 @@
Var LidStrawCountDown = LidStrawCountDown - 1
; count down
If LidStrawCountDown = 1 Then
Var LidStrawCountDown = 15
Var LidStrawCountDown = 10
Open "ROOT/taobin_project/xml/page_brewing2.xml"
EndIf

1
xml/page_payment_code.xml
View file

@ -591,6 +591,7 @@
<X> 244 </X>
<Y> 817 </Y>
<State> ShowTextNumber </State>
<Refresh> "Enable" </Refresh>
<Filename> Var( DirImage + "/text_12.png" )</Filename>
</Image>

48
xml/page_topping_alter.xml
View file

@ -37,14 +37,15 @@
Var BugFlag = 0
If show_eng = "true" Then
;Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
Var DirImage = "ROOT/taobin_project/image/topping_en"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var showname = NameDrink
Var showdesc = DrinkDescription
Else
;Var DirImage = "ROOT/taobin_project/image/page2"
Var DirImage = "ROOT/taobin_project/image/topping"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var showname = NameDrinkTH
@ -77,14 +78,15 @@
EndIf
If show_eng = "true" Then
;Var DirImage = "ROOT/taobin_project/image/page2_en/page2"
Var DirImage = "ROOT/taobin_project/image/topping_en/"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var showname = NameDrink
Var showdesc = DrinkDescription
Else
;Var DirImage = "ROOT/taobin_project/image/page2"
Var DirImage = "ROOT/taobin_project/image/topping/"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var showname = NameDrinkTH
@ -199,8 +201,8 @@
<Button>
<X> 44 </X>
<Y> 1785 </Y>
<Filename> "ROOT/taobin_project/image/topping/bn_cancel.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping/bp_cancel.png" </FilenamePress>
<Filename> Var( DirImage + "/bn_cancel.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -213,8 +215,8 @@
<Button>
<X> 447 </X>
<Y> 1785 </Y>
<Filename> "ROOT/taobin_project/image/topping/bn_next.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping/bp_next.png" </FilenamePress>
<Filename> Var( DirImage + "/bn_next.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_next.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -254,7 +256,7 @@
<X> 44 </X>
<Y> y_topping_bg </Y>
<State> BGSugar </State>
<Filename> "ROOT/taobin_project/image/topping/img1.png" </Filename>
<Filename> Var( DirImage + "/img_sugar.png" )</Filename>
</Image>
; sugar1
@ -262,8 +264,8 @@
<X> 181 </X>
<Y> y_topping </Y>
<State> SugarState1 </Stage>
<Filename> "ROOT/taobin_project/image/topping/bn_sugar1.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping/bp_sugar1.png" </FilenamePress>
<Filename> Var( DirImage + "/bn_sugar1.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_sugar1.png" ) </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -279,11 +281,11 @@
; sugar2
<Button>
<X> 327 </X>
<X> 344 </X>
<Y> y_topping </Y>
<State> SugarState2 </Stage>
<Filename> "ROOT/taobin_project/image/topping/bn_sugar2.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping/bp_sugar2.png" </FilenamePress>
<Filename> Var( DirImage + "/bn_sugar2.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bp_sugar2.png" ) </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -300,11 +302,11 @@
; sugar3
<Button>
<X> 503 </X>
<X> 507 </X>
<Y> y_topping </Y>
<State> SugarState3 </Stage>
<Filename> "ROOT/taobin_project/image/topping/bn_sugar3.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping/bp_sugar3.png" </FilenamePress>
<Filename> Var( DirImage + "/bn_sugar3.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_sugar3.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -320,11 +322,11 @@
; sugar4
<Button>
<X> 664 </X>
<X> 670 </X>
<Y> y_topping </Y>
<State> SugarState4 </Stage>
<Filename> "ROOT/taobin_project/image/topping/bn_sugar4.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping/bp_sugar4.png" </FilenamePress>
<Filename> Var( DirImage + "/bn_sugar4.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_sugar4.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
@ -340,11 +342,11 @@
; sugar5
<Button>
<X> 836 </X>
<X> 833 </X>
<Y> y_topping </Y>
<State> SugarState5 </Stage>
<Filename> "ROOT/taobin_project/image/topping/bn_sugar5.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping/bp_sugar5.png" </FilenamePress>
<Filename> Var( DirImage + "/bn_sugar5.png" )</Filename>
<FilenamePress> Var( DirImage + "/bp_sugar5.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>