9.01
This commit is contained in:
parent
89b8dbad3a
commit
3284dff5e7
27 changed files with 272 additions and 181 deletions
|
|
@ -216,6 +216,8 @@
|
|||
AddData 50 dummyPhone param1 param2 param3
|
||||
EndIf
|
||||
|
||||
SAVELOG "drinkok.xml version 1"
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 500 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -244,7 +246,8 @@
|
|||
|
||||
EndIf
|
||||
|
||||
; 420 sec
|
||||
; 420 sec
|
||||
; to be obsolete
|
||||
If Timeout > 840 Then
|
||||
Var CountForRetryStuck = 1
|
||||
Open "ROOT/taobin_project/xml/page_drink_stuck.xml"
|
||||
|
|
@ -273,26 +276,10 @@
|
|||
;
|
||||
If MachineStage = "show-menu" Then
|
||||
|
||||
|
||||
Var Seeker.TNumberTaobinMember = ""
|
||||
|
||||
If NextOrder = "true" Then
|
||||
|
||||
; Fast-forward to page_cannotConti
|
||||
If RejectOrder = "true" Then
|
||||
; BEGIN
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
|
||||
SAVELOG "Make next order by RejectOrder"
|
||||
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
|
||||
; END
|
||||
EndIf
|
||||
|
||||
; next order set. Havecup and checkup value must false. Certain cup not on any arm.
|
||||
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; BEGIN
|
||||
|
|
@ -315,44 +302,25 @@
|
|||
;
|
||||
; this stage for remove cup
|
||||
If MachineStage = "remove-cup" Then
|
||||
If CART_COUNT = 0 Then
|
||||
If NextOrder = "false" Then
|
||||
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
|
||||
Else
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var txtDrinkOKState = "Enable"
|
||||
|
||||
Var Timeout2 = Timeout2 + 1
|
||||
|
||||
If Timeout2 > 15 Then
|
||||
If InternationalEnable = 1 Then
|
||||
|
||||
Else
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
|
||||
EndIf
|
||||
Var Timeout2 = 0
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
If NextOrder = "false" Then
|
||||
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
|
||||
Else
|
||||
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var txtDrinkOKState = "Enable"
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; BEGIN
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
SAVELOG "Make next order by take-cup"
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
; END
|
||||
|
||||
Var Timeout2 = Timeout2 + 1
|
||||
|
||||
If Timeout2 > 15 Then
|
||||
If InternationalEnable = 1 Then
|
||||
|
||||
Else
|
||||
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
|
||||
EndIf
|
||||
Var Timeout2 = 0
|
||||
Else
|
||||
Machine DoorClose
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If Timeout = 5 Then
|
||||
|
|
@ -530,21 +498,21 @@
|
|||
</Image>
|
||||
|
||||
|
||||
<Button>
|
||||
<X> 160 </X>
|
||||
<Y> 1673 </Y>
|
||||
<State> buttonRemoveCup </State>
|
||||
;<Color> "0x00BDFF" </Color>
|
||||
<Interval> 500 </Interval>
|
||||
<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
|
||||
<EventClick>
|
||||
;Var buttonRemoveCup = "Invisible"
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
;<Button>
|
||||
;<X> 160 </X>
|
||||
;<Y> 1673 </Y>
|
||||
;<State> buttonRemoveCup </State>
|
||||
;;<Color> "0x00BDFF" </Color>
|
||||
;<Interval> 500 </Interval>
|
||||
;<Filename> Var( DirImage + "/bn_open_door.png" ) </Filename>
|
||||
;<FilenamePress> Var( DirImage + "/bp_open_door.png" ) </FilenamePress>
|
||||
;<EventClick>
|
||||
; ;Var buttonRemoveCup = "Invisible"
|
||||
; Machine RemoveCup
|
||||
; Machine DoorLidOpen
|
||||
; Refresh
|
||||
;</EventClick>
|
||||
;</Button>
|
||||
|
||||
;500
|
||||
;1180
|
||||
|
|
@ -710,9 +678,15 @@
|
|||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
<EventUnitTest1>
|
||||
Var MachineStage = "show-menu"
|
||||
Var Timeout2 = 0
|
||||
__CMD "UpdateCupOnArm" UserSelectProductCode "-" "-"
|
||||
</EventUnitTest1>
|
||||
|
||||
<EventUnitTest2>
|
||||
Open "ROOT/xml/page_drinkok.xml"
|
||||
</EventUnitTest2>
|
||||
|
||||
</Popup>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue