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

Sard

Browse source
This commit is contained in:
kong 2022-03-06 23:56:08 +07:00
parent 5008b73c4c
commit 922ae67bd3
21 changed files with 90 additions and 1591 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/menu_catalog.xml
View file

@ -35,7 +35,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

5
xml/menu_head.py
View file

@ -6,6 +6,11 @@
default_dir_press = 'ROOT/taobin_project/image/page_drink_press/'
default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable/'
new_default_dir = 'ROOT/taobin_project/image/page_drink_n/'
new_default_dir2 = 'ROOT/taobin_project/image/page_drink_select_n/'
new_default_dir_press = 'ROOT/taobin_project/image/page_drink_press_n/'
new_default_dir_disable = 'ROOT/taobin_project/image/page_drink_disable_n/'
menu_count = 0
x1 = 44

4
xml/page_board.xml
View file

@ -558,7 +558,7 @@
EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
@ -567,7 +567,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml"
;Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf

10
xml/page_catalog.xml
View file

@ -140,6 +140,10 @@
Var ButtontoTopupMenu = "Disable"
EndIf
READ_FILE "/mnt/sdcard/new_layout" new_layout
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
@ -271,7 +275,11 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
If new_layout = "true" Then
Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml"
Else
Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
EndIf
</EventClick>
</Button>

2
xml/page_catalog_choose_drink.xml
View file

@ -107,7 +107,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

2
xml/page_catalog_choose_drink1.xml
View file

@ -174,7 +174,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

2
xml/page_catalog_choose_drink11.xml
View file

@ -162,7 +162,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

2
xml/page_catalog_choose_drink2.xml
View file

@ -150,7 +150,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

2
xml/page_catalog_choose_drink3.xml
View file

@ -149,7 +149,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

2
xml/page_catalog_choose_drink4.xml
View file

@ -147,7 +147,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

2
xml/page_catalog_choose_drink5.xml
View file

@ -140,7 +140,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

2
xml/page_catalog_choose_drink6.xml
View file

@ -146,7 +146,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

2
xml/page_catalog_choose_drink7.xml
View file

@ -162,7 +162,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

2
xml/page_catalog_choose_drink8.xml
View file

@ -142,7 +142,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

4
xml/page_collect_point_1.xml
View file

@ -84,8 +84,8 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
Var CountDownBrewing = BREW_CNT
; run test;
;If CountDownBrewing = 40 Then
; Open "ROOT/taobin_project/xml/page_drinkok.xml"

4
xml/page_collect_point_2.xml
View file

@ -32,8 +32,8 @@
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing

4
xml/page_collect_point_3.xml
View file

@ -619,9 +619,7 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
Var CountDownBrewing = BREW_CNT
Var ShowCountDownBrewing = CountDownBrewing

11
xml/page_drinkok.xml
View file

@ -214,11 +214,14 @@
If CART_INDEX < CART_COUNT Then
If HaveCup = "false" Then
If CupChecking = "false" Then
Var CART_INDEX = CART_INDEX + 1
Cart "PreparID" CART_INDEX
Cart "MakeID" CART_INDEX
Open "ROOT/taobin_project/xml/page_thankyouMore.xml"
Var CART_INDEX = CART_INDEX + 1
Cart "PreparID" CART_INDEX
Cart "MakeID" CART_INDEX
Open "ROOT/taobin_project/xml/page_thankyouMore.xml"
EndIf
Else
If CupOnArm = "true" Then

1555
xml/page_topping_select.xml
View file

File diff suppressed because it is too large Load diff

2
xml/page_topping_select4.xml
View file

@ -197,7 +197,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf

60
xml/page_topping_select5.xml
View file

@ -197,7 +197,7 @@
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
@ -1252,14 +1252,37 @@
;-BEGIN shot layout
<Block>
<Width> 986 </Width>
<Height> 157 </Height>
<Height> 280 </Height>
<MarginTop> 20 </MarginTop>
<State> ShotCoffeeBG </State>
<State> "Enable" </State>
<Image>
<Filename> backGroundAddExtra </Filename>
<X> 0 </X>
<Y> 10 </Y>
<Filename> Var( DirImage + "/block_top.png" ) </Filename>
</Image>
<Image>
<X> 0 </X>
<Y> 184 </Y>
<Filename> Var( DirImage + "/block_bottom.png" ) </Filename>
</Image>
;
<Image>
<X> 0 </X>
<Y> 68 </Y>
<Filename> Var( DirImage + "/block_middle.png" ) </Filename>
</Image>
<Image>
<X> 40 </X>
<Y> 70 </Y>
<Filename> Var( DirImage + "/img_shot_esp.png" ) </Filename>
</Image>
<Button>
<X> 40 </X>
<Y> 72 </Y>
@ -1290,19 +1313,28 @@
</Animation>
</Button>
;
<Image>
<X> 0 </X>
<Y> 140 </Y>
<Filename> Var( DirImage + "/block_middle.png" ) </Filename>
</Image>
<Image>
<X> 40 </X>
<Y> 142 </Y>
<Filename> Var( DirImage + "/img_shot_esp.png" ) </Filename>
</Image>
<Button>
<X> 896 </X>
<Y> 79 </Y>
<X> 40 </X>
<Y> 142 </Y>
<State> showShotEnable </Stage>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/cb_checkdis.png" ) </FilenameDisable>
<Filename> "ROOT/taobin_project/image/topping2/bn_add_shot.png" </Filename>
<FilenamePress> "ROOT/taobin_project/image/topping2/bp_add_shot.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/image/topping2/bd_add_shot.png" ) </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG "Press add normal shot"
If showShotEnable = "Press" Then
@ -1322,12 +1354,6 @@
</Animation>
</Button>
<Image>
<State> showText4 </Stage>
<X> 602 </X>
<Y> 64 </Y>
<Filename> Var( DirImage + "/text4.png" ) </Filename>
</Image>
</Block>
;-END
;