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

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

Browse source
This commit is contained in:
miggaze 2021-11-15 18:11:02 +07:00
commit 2d873f12e9
14 changed files with 176 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sheet/best_seller.tsv
View file

@ -25,4 +25,3 @@
12-03-02-0006 12-03-02-0006
12-02-02-0004 12-02-02-0004
12-05-02-0007 12-05-02-0007
12-04-02-0002

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

17
xml/menu_gen.py
View file

@ -130,3 +130,20 @@
out_xml('</FrameScroll>\r\n') out_xml('</FrameScroll>\r\n')
out_xml('; Cart\r\n')
out_xml('<Button>\r\n')
out_xml('<X> 915 </X>\r\n')
out_xml('<Y> 1769 </Y>\r\n')
out_xml('<State> showCart </State>\r\n')
out_xml('<Filename> cart_image_bn </Filename>\r\n')
out_xml('<FilenamePress> cart_image_bp </FilenamePress>\r\n')
out_xml('<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>\r\n')
out_xml('<Volume> SoundVolume </Volume>\r\n')
out_xml('<EventClick> \r\n')
out_xml('\tOpen "ROOT/taobin_project/xml/page_payment_multi.xml"\r\n')
out_xml('</EventClick>\r\n')
out_xml('</Button>\r\n')

11
xml/page_brewing3Multi.xml
View file

@ -296,9 +296,14 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
If CountDownBrewing > 0 Then If BREW_COUNT_DOWN_FROM_APP = "on" Then
Var CountDownBrewing = CountDownBrewing - 1 Var CountDownBrewing = BREW_CNT
EndIf Else
If CountDownBrewing > 0 Then
Var CountDownBrewing = CountDownBrewing - 1
EndIf
Endif
If Simulation = "true" Then If Simulation = "true" Then
If CountDownBrewing = 0 Then If CountDownBrewing = 0 Then

13
xml/page_catalog_choose_drink.xml
View file

@ -1964,6 +1964,19 @@
</Image> </Image>
</Block> </Block>
</FrameScroll> </FrameScroll>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>

13
xml/page_catalog_choose_drink1.xml
View file

@ -1964,6 +1964,19 @@
</Image> </Image>
</Block> </Block>
</FrameScroll> </FrameScroll>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>

13
xml/page_catalog_choose_drink2.xml
View file

@ -4088,6 +4088,19 @@
</Image> </Image>
</Block> </Block>
</FrameScroll> </FrameScroll>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>

13
xml/page_catalog_choose_drink3.xml
View file

@ -3660,6 +3660,19 @@
</Image> </Image>
</Block> </Block>
</FrameScroll> </FrameScroll>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>

13
xml/page_catalog_choose_drink4.xml
View file

@ -1647,6 +1647,19 @@
</Image> </Image>
</Block> </Block>
</FrameScroll> </FrameScroll>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>

13
xml/page_catalog_choose_drink5.xml
View file

@ -1117,6 +1117,19 @@
</Image> </Image>
</Block> </Block>
</FrameScroll> </FrameScroll>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>

13
xml/page_catalog_choose_drink6.xml
View file

@ -4298,6 +4298,19 @@
</Image> </Image>
</Block> </Block>
</FrameScroll> </FrameScroll>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>

13
xml/page_catalog_choose_drink7.xml
View file

@ -1541,6 +1541,19 @@
</Image> </Image>
</Block> </Block>
</FrameScroll> </FrameScroll>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>

13
xml/page_catalog_choose_drink8.xml
View file

@ -1330,6 +1330,19 @@
</Image> </Image>
</Block> </Block>
</FrameScroll> </FrameScroll>
; Cart
<Button>
<X> 915 </X>
<Y> 1769 </Y>
<State> showCart </State>
<Filename> cart_image_bn </Filename>
<FilenamePress> cart_image_bp </FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
</EventClick>
</Button>

5
xml/page_drinkfail2Multi.xml
View file

@ -36,6 +36,11 @@
Var next_ready = "true" Var next_ready = "true"
Var cart_next = 0 Var cart_next = 0
DEBUGVAR CART1_READY
DEBUGVAR CART2_READY
DEBUGVAR CART3_READY
If show_eng = "true" Then If show_eng = "true" Then
If CART_COUNT > 0 Then If CART_COUNT > 0 Then
If CART_INDEX < CART_COUNT Then If CART_INDEX < CART_COUNT Then

32
xml/page_drinkok.xml
View file

@ -158,7 +158,10 @@
<Timeout> 500 </Timeout> <Timeout> 500 </Timeout>
<EventTimeout> <EventTimeout>
SAVELOG MachineStage DEBUGVAR MachineStage
DEBUGVAR CupOnArm
DEBUGVAR buttonRemoveCup
DEBUGVAR CART_COUNT
If HaveCup = "false" Then If HaveCup = "false" Then
@ -183,7 +186,12 @@
EndIf EndIf
EndIf EndIf
Else
If CupOnArm = "true" Then
Var buttonRemoveCup = "Enable"
Else
Var buttonRemoveCup = "Invisible"
EndIf
EndIf EndIf
@ -192,6 +200,9 @@
If CART_COUNT = 0 Then If CART_COUNT = 0 Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
Else Else
Var buttonRemoveCup = "Enable"
Var Timeout2 = Timeout2 + 1 Var Timeout2 = Timeout2 + 1
@ -215,6 +226,7 @@
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
Refresh
</EventTimeout> </EventTimeout>
@ -253,7 +265,6 @@
;</Image> ;</Image>
<Button> <Button>
<X> 870 </X> <X> 870 </X>
<Y> 1860 </Y> <Y> 1860 </Y>
@ -324,5 +335,20 @@
<Filename> next_pic </Filename> <Filename> next_pic </Filename>
</Image> </Image>
<Button>
<X> 757 </X>
<Y> 424 </Y>
<State> buttonRemoveCup </State>
;<Color> "0x00BDFF" </Color>
<Interval> 500 </Interval>
<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
<EventClick>
Machine RemoveCup
Machine DoorLidOpen
</EventClick>
</Button>
</Popup> </Popup>