Renew make drink / next order
This commit is contained in:
wanlop run
parent
fbbabcfb06
commit
a54978e5c6
4 changed files with 176 additions and 184 deletions
|
|
@ -692,13 +692,6 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
; run test;
|
||||
;I f CountDownBrewing = 40 Then
|
||||
; Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
;EndIf
|
||||
;I f CountDownBrewing = 0 Then
|
||||
; ;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
;EndIf
|
||||
|
||||
Var ShowCountDownBrewing = CountDownBrewing
|
||||
|
||||
|
|
|
|||
|
|
@ -265,23 +265,11 @@
|
|||
EndIf
|
||||
Endif
|
||||
|
||||
If Simulation = "true" Then
|
||||
If CountDownBrewing = 0 Then
|
||||
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If Timeout = 4 Then
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3"
|
||||
EndIf
|
||||
|
||||
; run test;
|
||||
;If CountDownBrewing = 40 Then
|
||||
; Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
;EndIf
|
||||
If CountDownBrewing = 0 Then
|
||||
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
|
||||
EndIf
|
||||
|
||||
Var ShowCountDownBrewing = CountDownBrewing
|
||||
|
||||
|
|
|
|||
|
|
@ -250,33 +250,6 @@
|
|||
Open "ROOT/taobin_project/xml/page_drink_stuck.xml"
|
||||
EndIf
|
||||
|
||||
; obsolete
|
||||
If Timeout > TimeDelayDefault Then
|
||||
SAVELOG "Longer Time out"
|
||||
DEBUGVAR TimeDelayDefault
|
||||
|
||||
If NextOrder = "true" Then
|
||||
|
||||
Var NextOrder = "false"
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
SAVELOG "Make next order by take-cup with close-maintenance"
|
||||
|
||||
Var error_code_stop_now = 1221
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
|
||||
Else
|
||||
Var error_code_stop_now = 1296
|
||||
__CMD "error-code-1296" 0 "-" "-"
|
||||
EndIf
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
|
||||
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
If Timeout = 2 Then
|
||||
RefreshAll
|
||||
EndIf
|
||||
|
|
@ -293,161 +266,54 @@
|
|||
Var next_pic_bg = DirImage + "/Preparing.png"
|
||||
Var BlinkImg = 1
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
; Do not change
|
||||
;
|
||||
If MachineStage = "show-menu" Then
|
||||
|
||||
If CART_INDEX < CART_COUNT Then
|
||||
|
||||
If HaveCup = "false" Then
|
||||
If CupChecking = "false" Then
|
||||
Var Seeker.TNumberTaobinMember = ""
|
||||
|
||||
Var CART_INDEX = CART_INDEX + 1
|
||||
Cart "PreparID" CART_INDEX
|
||||
Cart "MakeID" CART_INDEX
|
||||
Open "ROOT/taobin_project/xml/page_thankyouMore.xml"
|
||||
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
|
||||
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
|
||||
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If HaveCup = "true" Then
|
||||
If MaybeHaveCup = "true" Then
|
||||
|
||||
Else
|
||||
If CupChecking = "true" Then
|
||||
|
||||
Else
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var txtDrinkOKState = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
If MaybeHaveCup = "true" Then
|
||||
|
||||
Else
|
||||
If CupChecking = "true" Then
|
||||
|
||||
Else
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var txtDrinkOKState = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
|
||||
Machine DoorClose
|
||||
EndIf
|
||||
|
||||
Else
|
||||
If sendPayMultiFlag = 1 Then
|
||||
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If HaveCup = "true" Then
|
||||
If MaybeHaveCup = "true" Then
|
||||
|
||||
Else
|
||||
If CupChecking = "true" Then
|
||||
|
||||
Else
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var txtDrinkOKState = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
If MaybeHaveCup = "true" Then
|
||||
|
||||
Else
|
||||
If CupChecking = "true" Then
|
||||
|
||||
Else
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var txtDrinkOKState = "Enable"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
|
||||
Var Seeker.TNumberTaobinMember = ""
|
||||
|
||||
If FailedCount > 0 Then
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
|
||||
Else
|
||||
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 PaySuccessWithDaemonTask = 1 Then
|
||||
Var NextOrder = "false"
|
||||
SAVELOG "Make next order by pass"
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
Else
|
||||
If HaveCup = "false" Then
|
||||
If MaybeHaveCup = "true" Then
|
||||
|
||||
Else
|
||||
If CupChecking = "true" Then
|
||||
|
||||
Else
|
||||
If CupOnArm = "false" Then
|
||||
|
||||
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
|
||||
|
||||
Else
|
||||
Machine DoorClose
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
;
|
||||
|
||||
; this stage for remove cup
|
||||
If MachineStage = "remove-cup" Then
|
||||
If CART_COUNT = 0 Then
|
||||
If NextOrder = "false" Then
|
||||
|
|
|
|||
145
xml/page_make_drink_again.xml
Normal file
145
xml/page_make_drink_again.xml
Normal file
|
|
@ -0,0 +1,145 @@
|
|||
<Popup>
|
||||
<Cache> "Enable" </Cache>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 1920 </Height>
|
||||
<Background> "0xeae6e1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
Var Timeout2 = 0
|
||||
SAVELOG "page_make_drink_again.xml"
|
||||
|
||||
DEBUGVAR EnableDoubleCupNoError
|
||||
DEBUGVAR HURR_FOREVER
|
||||
|
||||
|
||||
DEBUGVAR Seeker.showname
|
||||
DEBUGVAR UserSelectProductCode
|
||||
DEBUGVAR topping1
|
||||
DEBUGVAR topping2
|
||||
DEBUGVAR topping3
|
||||
DEBUGVAR topping4
|
||||
DEBUGVAR topping5
|
||||
DEBUGVAR topping6
|
||||
DEBUGVAR topping7
|
||||
DEBUGVAR topping8
|
||||
DEBUGVAR topping9
|
||||
DEBUGVAR topping10
|
||||
|
||||
Var PayCredit = 1
|
||||
; MACHINE_BREW_THAI_CUP_ERROR_OVER_WEIGHT_SCALE_ARM_3 1030
|
||||
; MACHINE_BREW_THAI_CUP_ERROR_NO_WEIGHT_SCALE_ARM_3 1026
|
||||
; Clear eror 0xA6
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
|
||||
DEBUGVAR MachineStage
|
||||
|
||||
DEBUGVAR HaveCup
|
||||
DEBUGVAR CHECKCUP
|
||||
DEBUGVAR DoorCupPosition
|
||||
|
||||
|
||||
DEBUGVAR Timeout
|
||||
DEBUGVAR Timeout2
|
||||
|
||||
If Timeout > 240 Then
|
||||
SAVELOG "Timeout 240 from can not close door"
|
||||
Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
; Do not change
|
||||
;
|
||||
If MachineStage = "show-menu" Then
|
||||
If HaveCup = "false" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Var Timeout2 = Timeout2 + 1
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Else
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Var buttonRemoveCup = "Disable"
|
||||
EndIf
|
||||
|
||||
If Timeout2 = 1 Then
|
||||
;include="ROOT/taobin_project/inc/select_drink_current.inc"
|
||||
|
||||
EndIf
|
||||
|
||||
If Timeout2 = 5 Then
|
||||
|
||||
MakeDrinkV1 UserSelectProductCode SelectSugarID
|
||||
Var HURR_FOREVER = "F:1115"
|
||||
Var MachineState_Result = 0
|
||||
Var LastMakeDrinkResult = "-"
|
||||
Open "ROOT/taobin_project/xml/page_Newbrewing3Conti.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
</EventTimeout>
|
||||
|
||||
<EventChangeStatus>
|
||||
If ChangeStatus = "payout-end" Then
|
||||
Var MultiGo = 1
|
||||
EndIf
|
||||
</EventChangeStatus>
|
||||
|
||||
|
||||
;include="ROOT/taobin_project/inc/video.inc"
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 335 </X>
|
||||
<Y> 1090 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/user_take_cup_th/img_take_cup.png" </Filename>
|
||||
</Image>
|
||||
|
||||
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 609 </Y>
|
||||
<Filename> Var(DirImage + "/img_take_cup_for_next_brew.png") </Filename>
|
||||
</Image>
|
||||
|
||||
<Button>
|
||||
<X> 212 </X>
|
||||
<Y> 1673 </Y>
|
||||
<State> buttonRemoveCup </State>
|
||||
<Filename> Var( DirImage + "/bn_door_open_take_double_cup.png" ) </Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_door_open_take_double_cup.png" ) </FilenamePress>
|
||||
<FilenameDisable> Var( DirImage + "/bd_door_open_take_double_cup.png" ) </FilenameDisable>
|
||||
<EventClick>
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Refresh
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
||||
<EventUnitTest1>
|
||||
Var MachineStage = "show-menu"
|
||||
</EventUnitTest1>
|
||||
|
||||
</Popup>
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue