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

fix camera image

Browse source
This commit is contained in:
miggaze 2022-08-29 12:05:42 +07:00
commit 87a0be6b97
26 changed files with 353 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_board.xml
View file

@ -52,6 +52,10 @@
Var Seeker.CurrCreditTelNum = ""
Var Seeker.CurrCreditPinNum = ""
DEBUGVAR PaySuccessWithDaemonTask
Var PaidPaymentFromNextStage = 0
Var DrinkPaid = "-"
; On open

6
xml/page_brewing3.xml
View file

@ -5,6 +5,7 @@
<Background> "0xeae6e1" </Background>
<Volume> SoundVolume </Volume>
<EventOpen>
Var SendNotiPaySuccess = 2
DEBUGVAR TxRef1
@ -678,6 +679,8 @@
EndIf
If MachineState_Result = 1 Then
DEBUGVAR PaySuccessWithDaemonTask
If waitAckPay = 0 Then
Var waitAckPay = 0
@ -790,6 +793,9 @@
EndIf
__CMD "clear-stock-data" 0 "-" "-"
Var ServiceSuccess = "yes"
If waitAckPay = 0 Then
SAVELOG "waitAckPay=0"

4
xml/page_brewing3Conti.xml
View file

@ -538,6 +538,8 @@
EndIf
If MachineState_Result = 1 Then
DEBUGVAR PaySuccessWithDaemonTask
If waitAckPay = 0 Then
Var waitAckPay = 0
@ -651,6 +653,8 @@
EndIf
__CMD "clear-stock-data" 0 "-" "-"
Var ServiceSuccess = "yes"
If waitAckPay = 0 Then

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

63
xml/page_main_blank.xml
View file

@ -1,4 +1,67 @@
<Page>
<Width> 1080 </Width>
<Height> 1312 </Height>
<EventOpen>
DEBUGVAR PaySuccessWithDaemonTask
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
If PaySuccessWithDaemonTask = 1 Then
DEBUGVAR PaidPaymentFromNextStage
DEBUGVAR LastMakeDrinkResult
; from
If LastMakeDrinkResult = "success" Then
If PaidPaymentFromNextStage = 1 Then
Var DelayForMakeDrink = 0
Var PaidPaymentFromNextStage = 2
EndIf
EndIf
If PaidPaymentFromNextStage = 2 Then
DEBUGVAR HaveCup
DEBUGVAR MaybeHaveCup
DEBUGVAR DoorCupPosition
If HaveCup = "false" Then
If MaybeHaveCup = "false" Then
If DoorCupPosition = "bottom" Then
Topping "Select" NextUserSelectDrinkFromPaid
; Set option toppinng and pack
Topping "Select1-ID" NextUserSelecttopping1Paid
Topping "Select2-ID" NextUserSelecttopping2Paid
Topping "Select3-ID" NextUserSelecttopping3Paid
; Pack
Topping "Pack" ExtendDataCurr
Var DelayForMakeDrink = 2
Var PaidPaymentFromNextStage = 3
DEBUGVAR NextUserSelectDrinkFromPaid
EndIf
EndIf
EndIf
EndIf
DEBUGVAR DelayForMakeDrink
EndIf
If DelayForMakeDrink > 0 Then
DEBUGVAR DelayForMakeDrink
Var DelayForMakeDrink = DelayForMakeDrink - 1
If DelayForMakeDrink = 0 Then
Var MakeContinue = 1
MakeDrinkV1 NextUserSelectDrinkFromPaid SelectSugarID
EndIf
EndIf
; hurr
TimerReset
</EventTimeout>
</Page>

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 = ""

3
xml/page_payment_camera.xml
View file

@ -235,6 +235,7 @@
<Image>
<X> 689 </X>
<Y> 875 </Y>
<State> "Enable" </State>
<Filename> Var( DirImage + "/img_popup6.png" )</Filename>
</Image>
@ -268,7 +269,7 @@
<CameraX>
<X> 735 </X>
<Y> 1374 </Y>
<Y> 1189 </Y>
<Name>"usbfront"</Name>
<Width> 326 </Width>
<Height> 235 </Height>

9
xml/page_payment_cash.xml
View file

@ -246,12 +246,17 @@
Var Seeker.FreeVendingCampaign = 1
CoinVending OFF
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
@ -857,12 +862,16 @@
If PayOK = 1 Then
If Seeker = "curr" Then
MakeDrinkV1 SelectDrink SelectSugarID
Var TxRef1 = ""
CreateTxRef1 TxRef1
Else
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"

3
xml/page_payment_code.xml
View file

@ -232,6 +232,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeDtac.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeGLX.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeLotus.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeSCG.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeThe1.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_codeTrue.xml
View file

@ -147,6 +147,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_credit2.xml
View file

@ -195,6 +195,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_credit3.xml
View file

@ -170,6 +170,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"
EndIf

3
xml/page_payment_storeCredit3.xml
View file

@ -73,6 +73,9 @@
DEBUGVAR Seeker
Var TxRef1 = ""
CreateTxRef1 TxRef1
Var DrinkPaid = SelectDrink
Var PaidPaymentFromNextStage = 1
EndIf
Open "ROOT/taobin_project/xml/page_thankyou.xml"

98
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
@ -246,7 +271,12 @@
Var ShowCountDownBrewing = CountDownBrewing
Var MachineState_Result = 0
If MachineStage = "show-menu" Then
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
If PaySuccessWithDaemonTask = 1 Then
Else
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
EndIf
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf

7
xml/page_topping_select4.xml
View file

@ -2327,6 +2327,13 @@
; Pack
Topping "__pack" ExtendDataNext
Var NextUserSelectDrinkFromPaid = UserSelectProductCode
Var NextUserSelecttopping1Paid = topping1
Var NextUserSelecttopping2Paid = topping2
Var NextUserSelecttopping3Paid = topping3
EndIf
DEBUGVAR Seeker
DEBUGVAR Seeker.ExtendData

6
xml/vending_info.xml
View file

@ -123,6 +123,12 @@
Var Text1_9 = Text1_9 + " "
Var Text1_9 = Text1_9 + SystemDate
Var skr = "curr"
DEBUGVAR skr.NOBONUS
Var skr = "next"
DEBUGVAR skr.NOBONUS
Refresh
TimerReset