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

DO

Browse source
This commit is contained in:
kong 2022-08-28 21:53:24 +07:00
parent bf4833b558
commit 3d48c0f364
11 changed files with 244 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

45
xml/page_drinkok.xml
View file

@ -188,6 +188,7 @@
DEBUGVAR NextOrder
DEBUGVAR DoorCupPosition
Var Timeout = Timeout + 1
; Timeout 10*60*2
@ -381,29 +382,34 @@
; next order set. Havecup and checkup value must false. Certain cup not on any arm.
If HaveCup = "false" Then
If MaybeHaveCup = "true" Then
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 CupChecking = "true" Then
If DoorCupPosition = "bottom" Then
; BEGIN
Var NextOrder = "false"
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
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
Else
Machine DoorClose
EndIf
EndIf
EndIf
EndIf
EndIf
@ -461,8 +467,7 @@
EndIf
EndIf
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then
If NextOrder = "true" Then

36
xml/page_main_blank.xml
View file

@ -22,34 +22,42 @@
If PaidPaymentFromNextStage = 2 Then
DEBUGVAR HaveCup
DEBUGVAR MachineStage
DEBUGVAR MaybeHaveCup
DEBUGVAR DoorCupPosition
If HaveCup = "false" Then
If DoorCupPosition = "bottom" Then
If MaybeHaveCup = "false" Then
If DoorCupPosition = "bottom" Then
Topping "Select" next.UserSelectDrinkFromPaid
Topping "Select" NextUserSelectDrinkFromPaid
; Set option toppinng and pack
Topping "Select1-ID" next.UserSelecttopping1Paid
Topping "Select2-ID" next.UserSelecttopping2Paid
Topping "Select3-ID" next.UserSelecttopping3Paid
; Set option toppinng and pack
Topping "Select1-ID" NextUserSelecttopping1Paid
Topping "Select2-ID" NextUserSelecttopping2Paid
Topping "Select3-ID" NextUserSelecttopping3Paid
; Pack
Topping "Pack" ExtendDataCurr
; Pack
Topping "Pack" ExtendDataCurr
Var DelayForMakeDrink = 2
Var PaidPaymentFromNextStage = 3
Var DelayForMakeDrink = 2
Var PaidPaymentFromNextStage = 3
DEBUGVAR NextUserSelectDrinkFromPaid
EndIf
EndIf
EndIf
EndIf
DEBUGVAR DelayForMakeDrink
EndIf
DEBUGVAR DelayForMakeDrink
If DelayForMakeDrink > 3 Then
If DelayForMakeDrink > 0 Then
DEBUGVAR DelayForMakeDrink
Var DelayForMakeDrink = DelayForMakeDrink - 1
If DelayForMakeDrink = 0 Then
MakeDrinkV1 SelectDrink SelectSugarID
Var MakeContinue = 1
MakeDrinkV1 NextUserSelectDrinkFromPaid SelectSugarID
EndIf
EndIf

2
xml/page_payment.xml
View file

@ -131,7 +131,7 @@
If AdultFlag = 1 Then
If CameraCount = 1 Then
CameraSetting "usbfront" "default" "Rotate=270,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0"
EndIf
Var PlaySoundLag = ""

4
xml/page_payment_camera.xml
View file

@ -234,7 +234,7 @@
<Button>
<X> 689 </X>
<Y> 1050 </Y>
<Y> 885 </Y>
<State> "Enable" </State>
<Filename> Var( DirImage + "/img_popup6.png" )</Filename>
<EventClick>
@ -249,7 +249,7 @@
<CameraX>
<X> 735 </X>
<Y> 1374 </Y>
<Y> 1189 </Y>
<Name>"usbfront"</Name>
<Width> 326 </Width>
<Height> 235 </Height>

91
xml/page_thankyouConti.xml
View file

@ -49,18 +49,18 @@
Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf
DEBUGVAR StarwState
DEBUGVAR LidState
;DEBUGVAR StarwState
;DEBUGVAR LidState
DEBUGVAR BottomText
If StarwState = "Press" Then
Machine StrawWithDelay
LED LedDoorLid Blink 255 255 255 255
EndIf
If LidState = "Press" Then
Machine LidWithDelay
LED LedDoorLid Blink 255 255 255 255
EndIf
;If StarwState = "Press" Then
; Machine StrawWithDelay
; LED LedDoorLid Blink 255 255 255 255
;EndIf
;If LidState = "Press" Then
; Machine LidWithDelay
; LED LedDoorLid Blink 255 255 255 255
;EndIf
DEBUGVAR Seeker.TNumberTaobinCredit
@ -74,30 +74,34 @@
SAVELOG "Call from thankyou Conti"
If Seeker.get_a_straw = "Press" Then
Machine StrawOrder
Var LedLidBlink = "true"
Var SaveTheWorldCount = SaveTheWorldCount + 1
If PaySuccessWithDaemonTask = 1 Then
Else
If Seeker.get_a_straw = "Press" Then
Machine StrawOrder
Var LedLidBlink = "true"
Var SaveTheWorldCount = SaveTheWorldCount + 1
EndIf
If Seeker.get_a_lid = "Press" Then
Machine LidOrder
Var LedLidBlink = "true"
Var SaveTheWorldCount = SaveTheWorldCount + 1
EndIf
Topping "Select" Seeker.selected_a_drink
; Set option toppinng and pack
Topping "Select1-ID" Seeker.topping1
Topping "Select2-ID" Seeker.topping2
Topping "Select3-ID" Seeker.topping3
; Pack
Topping "Pack" ExtendDataCurr
Topping "ClearNextOrder" "-"
EndIf
If Seeker.get_a_lid = "Press" Then
Machine LidOrder
Var LedLidBlink = "true"
Var SaveTheWorldCount = SaveTheWorldCount + 1
EndIf
Topping "Select" Seeker.selected_a_drink
; Set option toppinng and pack
Topping "Select1-ID" Seeker.topping1
Topping "Select2-ID" Seeker.topping2
Topping "Select3-ID" Seeker.topping3
; Pack
Topping "Pack" ExtendDataCurr
Topping "ClearNextOrder" "-"
EndIf
@ -132,6 +136,27 @@
DEBUGVAR DoorCupPosition
DEBUGVAR CountUpDoorCupOpen
DEBUGVAR MakeContinue
If PaySuccessWithDaemonTask = 1 Then
If MakeContinue = 1 Then
Var MakeContinue = 0
Var Ignore
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
SAVELOG "go to next order by MakeContinue = 1"
Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0
SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
If HaveCup = "true" Then
Var Timeout = 0
Else

8
xml/page_topping_select4.xml
View file

@ -2327,10 +2327,10 @@
; Pack
Topping "__pack" ExtendDataNext
next.UserSelectDrinkFromPaid = UserSelectProductCode
next.UserSelecttopping1Paid = topping1
next.UserSelecttopping2Paid = topping2
next.UserSelecttopping3Paid = topping3
Var NextUserSelectDrinkFromPaid = UserSelectProductCode
Var NextUserSelecttopping1Paid = topping1
Var NextUserSelecttopping2Paid = topping2
Var NextUserSelecttopping3Paid = topping3