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-17 18:33:37 +07:00
commit 6bf00e2e26
5 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
xml/page_collect_point_1.xml
View file

@ -4,7 +4,7 @@
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
;<Refresh> "Partial" </Refresh>
<EventOpen>
; On open
@ -77,6 +77,7 @@
Var ShowTextNumber = "Invisible"
EndIf
DEBUGVAR Timeout
Var Timeout = Timeout + 1
If Timeout > 20 Then
@ -93,8 +94,12 @@
SCREEN_CAP date_time_str
EndIf
TimerReset
If Timeout = 9 Then
;RefreshAll
EndIf
Refresh
TimerReset
</EventTimeout>

22
xml/page_drinkfail2Multi.xml
View file

@ -4,10 +4,10 @@
<Height> 1920 </Height>
<Background> "0xEFEDEA" </Background>
<Volume> SoundVolume </Volume>
<Refresh> "Partial" </Refresh>
<EventOpen>
; On open
Var buttonRemoveCup = "Enable"
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/complete_en/"
@ -284,7 +284,13 @@
EndIf
DEBUGVAR MachineStage
If MachineStage = "remove-cup" Then
Var buttonRemoveCup = "Enable"
;DEBUGVAR buttonRemoveCup
;Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
Var Timeout2 = Timeout2 + 1
@ -294,6 +300,7 @@
Var Timeout2 = 0
EndIf
Else
;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
@ -382,6 +389,19 @@
<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>

5
xml/page_drinkok.xml
View file

@ -183,7 +183,8 @@
EndIf
EndIf
; Do not change
;
If MachineStage = "show-menu" Then
If CART_INDEX < CART_COUNT Then
@ -225,6 +226,8 @@
EndIf
EndIf
;
If MachineStage = "remove-cup" Then
If CART_COUNT = 0 Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"

8
xml/page_payment_code.xml
View file

@ -50,9 +50,9 @@
Var CodeChannel = 0
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
Else
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
EndIf
Refresh
EndIf
@ -288,9 +288,9 @@
If CART_COUNT >= 1 Then
Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
Else
Else
Open "ROOT/taobin_project/xml/page_payment_cash.xml"
EndIf
EndIf
EndIf

6
xml/page_show_consent.xml
View file

@ -35,6 +35,7 @@
Var Timeout = Timeout + 1
If Timeout > 20 Then
; goto lid straw
SAVELOG "Timeout"
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
EndIf
@ -78,7 +79,9 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
If UnitTestType = "1" Then
SAVELOG "Press Accept"
If UnitTestType = "1" Then
Var CoffeePoint = 10
Open "ROOT/taobin_project/xml/page_collect_point_3.xml"
EndIf
@ -102,6 +105,7 @@
<Volume> SoundVolume </Volume>
<EventClick>
; goto lid straw
SAVELOG "Press Decline"
Open "ROOT/taobin_project/xml/page_lid_straw.xml"
</EventClick>
</Button>