merge smoothie_tbp
This commit is contained in:
commit
e45c4dea1e
1 changed files with 21 additions and 20 deletions
|
|
@ -60,7 +60,7 @@
|
|||
Var FromSmoothieProcess = "Enable"
|
||||
Var FromPaymentCash = "Invisible"
|
||||
Var FromBrewingProcess = "Invisible"
|
||||
|
||||
|
||||
Var TimeOutHandPoint = 0
|
||||
Var ShowHandPoint = "Invisible"
|
||||
Var MotionHandPoint = 0
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
Var Second_x = 600
|
||||
Var CountDown_x = 460
|
||||
EndIf
|
||||
|
||||
|
||||
Var TextDoorButtonID = 001202
|
||||
|
||||
Var SmoothieProcessState = "idle"
|
||||
|
|
@ -154,7 +154,7 @@
|
|||
DEBUGVAR CH9992_Status
|
||||
DEBUGVAR CH9993_Status
|
||||
DEBUGVAR CH9994_Status
|
||||
|
||||
|
||||
DEBUGVAR HaveCup
|
||||
DEBUGVAR CupOnArm
|
||||
DEBUGVAR DoorCupPosition
|
||||
|
|
@ -164,9 +164,10 @@
|
|||
DEBUGVAR SmoothieProcessState
|
||||
DEBUGVAR AnyArmConfuse
|
||||
DEBUGVAR SensorDoorCupStatus
|
||||
|
||||
|
||||
If CH9992_Status = "READY" Then
|
||||
Var ChannelArmForProccessStatus = CH9992_Status
|
||||
|
||||
If ChannelArmForProccessStatus = "READY" Then
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If SmoothieProcessState = "idle" Then
|
||||
|
|
@ -176,7 +177,7 @@
|
|||
Var TextDoorButtonID = 001203
|
||||
|
||||
Else
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
|
|
@ -187,14 +188,14 @@
|
|||
EndIf
|
||||
Else
|
||||
If SmoothieProcessState = "idle" Then
|
||||
|
||||
|
||||
Else
|
||||
If SmoothieProcessState = "press" Then
|
||||
|
||||
Else
|
||||
Var TextDoorButtonID = 001205
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -205,27 +206,27 @@
|
|||
Var CountDownCertainConfuse = CountDownCertainConfuse - 1
|
||||
|
||||
If CountDownCertainConfuse = 0 Then
|
||||
Machine DoorClose
|
||||
Machine DoorClose
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If CH9992_Status = "RUNNING" Then
|
||||
If ChannelArmForProccessStatus = "RUNNING" Then
|
||||
Var SmoothieProcessState = "blendnow"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SmoothieProcessState = "blendnow" Then
|
||||
Var TextDoorButtonID = 001206
|
||||
|
||||
Var TextDoorButtonID = 001206
|
||||
|
||||
Var SelectDrink = Seeker.selected_a_drink
|
||||
Var SelectSugarID = ""
|
||||
|
||||
|
||||
Topping "Select" SelectDrink
|
||||
|
||||
Var SmoothieProcessState = "blending"
|
||||
|
||||
Var SmoothieProcessState = "blending"
|
||||
|
||||
EndIf
|
||||
|
||||
If SmoothieProcessState = "blending" Then
|
||||
|
|
@ -238,7 +239,7 @@
|
|||
Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
DEBUGVAR TextDoorButtonID
|
||||
|
||||
|
|
@ -246,7 +247,7 @@
|
|||
TimerReset
|
||||
</EventTimeout>
|
||||
|
||||
;DEBUGVAR Var [CH9992_Status] = RUNNING
|
||||
;DEBUGVAR Var [ChannelArmForProccessStatus] = RUNNING
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
|
|
@ -288,7 +289,7 @@
|
|||
;
|
||||
;
|
||||
;
|
||||
; zone
|
||||
; zone
|
||||
;
|
||||
;
|
||||
;
|
||||
|
|
@ -303,7 +304,7 @@
|
|||
<Filename> VideoSmoothieProcess </Filename>
|
||||
</Video>
|
||||
|
||||
; helper
|
||||
; helper
|
||||
;<Image>
|
||||
;<X> 420 </X>
|
||||
;<Y> 652 </Y>
|
||||
|
|
@ -337,7 +338,7 @@
|
|||
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
|
||||
OpenInst 15 "ROOT/taobin_project/inter/tha/xml/page_help_center.lxml"
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue