SGP: update page drink fail & import block order from topping select 7
This commit is contained in:
Pakin
parent
96d2143ca2
commit
8ab45927a4
2 changed files with 170 additions and 59 deletions
|
|
@ -54,84 +54,28 @@
|
|||
DEBUGVAR NextOrder
|
||||
DEBUGVAR HaveCup
|
||||
|
||||
If Door_Open_flagBlink = 0 Then
|
||||
Var Door_Open_flagBlink = 1
|
||||
Var Door_Open_State="Enable"
|
||||
Else
|
||||
Var Door_Open_flagBlink = 0
|
||||
Var Door_Open_State="Invisible"
|
||||
EndIf
|
||||
|
||||
If HaveCup = "true" Then
|
||||
DEBUGVAR CheckCupStateDoorCupClose
|
||||
|
||||
If CheckCupStateDoorCupClose = "" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
|
||||
If CheckCupStateDoorCupClose = "done" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
|
||||
If CheckCupStateDoorCupClose = "reset" Then
|
||||
|
||||
If CheckCupStateDoorCupCloseCnt = 0 Then
|
||||
Var CheckCupStateDoorCupClose = ""
|
||||
Else
|
||||
Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If buttonRemoveCup = "Invisible" Then
|
||||
Var Door_Open_State = "Invisible"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR buttonRemoveCup
|
||||
DEBUGVAR Door_Open_State
|
||||
|
||||
If MachineStage = "remove-cup" Then
|
||||
|
||||
Else
|
||||
If NextOrder = "true" Then
|
||||
If NextOrder = "true" Then
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
|
||||
SAVELOG "Remove cup"
|
||||
SAVELOG "Have Cup 2"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
; must remove cup.
|
||||
If HaveCup = "true" Then
|
||||
|
||||
Else
|
||||
If NextOrder = "true" Then
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
|
||||
SAVELOG "Have Cup"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If Timeout > 240 Then
|
||||
If Timeout > 120 Then
|
||||
If NextOrder = "true" Then
|
||||
SAVELOG "TIME OUT 240"
|
||||
Var NextOrder = "false"
|
||||
|
|
|
|||
|
|
@ -7,10 +7,18 @@
|
|||
<EventOpen>
|
||||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
|
||||
Var TextSelfTestCntColor = WTCSemiMediumBlueColor
|
||||
Var UserSeletedSugar = 0
|
||||
|
||||
SAVELOG "Event Open Select 6 SGP"
|
||||
|
||||
If NoWaitMachineEnable = 1 Then
|
||||
Var ConfirmDrinkButtonState = "Enable"
|
||||
Else
|
||||
|
||||
Var ConfirmDrinkButtonState = "Invisible"
|
||||
EndIf
|
||||
|
||||
Var y_topping_bg = 912
|
||||
|
||||
Var CHECK_EventOpen_Double = CHECK_EventOpen_Double + 1
|
||||
|
|
@ -304,12 +312,16 @@
|
|||
Var showname = aliasName[LanguageShowByIndex]
|
||||
Var showdesc = aliasName[LanguageShowByIndex]
|
||||
|
||||
Var MenuReason = ""
|
||||
|
||||
BackslashNToEnter showname
|
||||
BackslashNToEnter showdesc
|
||||
|
||||
CRLFToSpace showname
|
||||
CRLFToSpace showdesc
|
||||
|
||||
Var MenuReasonStage = "Invisible"
|
||||
|
||||
Var text_milk_choice_price_x = 265
|
||||
|
||||
Var SugarSoundFlag = 0
|
||||
|
|
@ -338,6 +350,40 @@
|
|||
<EventTimeout>
|
||||
DEBUGVAR Timeout
|
||||
|
||||
DEBUGVAR MenuReady
|
||||
DEBUGVAR CupRemain
|
||||
|
||||
|
||||
If CLOSE_ORDER_NOW = "true" Then
|
||||
;include="ROOT/taobin_project/inc/return_condition.ev"
|
||||
EndIf
|
||||
|
||||
|
||||
If NoWaitMachineEnable = 1 Then
|
||||
DEBUGVAR MachineStage
|
||||
DEBUGVAR ConfirmDrinkButtonState
|
||||
If MachineStage = "close-maintenance" Then
|
||||
Var ConfirmDrinkButtonState = "Enable"
|
||||
|
||||
If stop_now = "true" Then
|
||||
SAVELOG "stop_now is true page_topping_select6_blue.xml"
|
||||
;include="ROOT/taobin_project/inc/return_condition.ev"
|
||||
EndIf
|
||||
Else
|
||||
Var ConfirmDrinkButtonState = "Invisible"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If CLOSE_ORDER_NOW = "true" Then
|
||||
SAVELOG "DEACTIVE in page_topping_select6_blue.xml"
|
||||
;include="ROOT/taobin_project/inc/return_condition.ev"
|
||||
EndIf
|
||||
|
||||
If SELLSTATUS = "DEACTIVE" Then
|
||||
SAVELOG "DEACTIVE in page_topping_select6_blue.xml"
|
||||
;include="ROOT/taobin_project/inc/return_condition.ev"
|
||||
EndIf
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
|
||||
|
|
@ -372,6 +418,70 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR MenuReason
|
||||
; arm-not-ready
|
||||
; brew-stg
|
||||
; door-cup-alert
|
||||
; stop-now-set
|
||||
|
||||
If show_eng = "true" Then
|
||||
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
|
||||
Var ShowTextSelfTestCountDown = "Please wait a moment (" + MACHINE_SELF_TEST_COUNT_DOWN
|
||||
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
|
||||
Else
|
||||
Var ShowTextSelfTestCountDown = "Please wait a moment"
|
||||
EndIf
|
||||
|
||||
Else
|
||||
If MACHINE_SELF_TEST_COUNT_DOWN > 0 Then
|
||||
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่ (" + MACHINE_SELF_TEST_COUNT_DOWN
|
||||
Var ShowTextSelfTestCountDown = ShowTextSelfTestCountDown + ")"
|
||||
Else
|
||||
Var ShowTextSelfTestCountDown ="กรุณารอสักครู่"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If MenuReason = "arm-not-ready" Then
|
||||
|
||||
SAVELOG "goto mode arm-not-ready"
|
||||
DEBUGVAR DoorCupPosition
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
Else
|
||||
Var TextSelfTestCntColor = HeadlineColor
|
||||
Var ConfirmDrinkButtonState = "Enable"
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var ShowTextSelfTestCountDown = "Please take out the glass."
|
||||
Else
|
||||
Var ShowTextSelfTestCountDown = "กรุณานําแก้วออก"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If MenuReason = "brew-stg" Then
|
||||
Var ConfirmDrinkButtonState = "Enable"
|
||||
If Timeout > 15 Then
|
||||
Var MenuReason = "-"
|
||||
Var Timeout = 0
|
||||
Var ConfirmDrinkButtonState = "Invisible"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
If MenuReason = "-" Then
|
||||
|
||||
Else
|
||||
Var MenuReasonString = MenuReason
|
||||
Var MenuReasonStage = "Enable"
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
@ -4025,6 +4135,38 @@
|
|||
<Value> PriceDrinkTmpShow </Value>
|
||||
</Text>
|
||||
|
||||
; next2 button Protect
|
||||
<Button>
|
||||
<State> ConfirmDrinkButtonState </State>
|
||||
<X> 526 </X>
|
||||
<Y> 1785 </Y>
|
||||
<Filename> "ROOT/taobin_project/image/topping/topping2/bd_next2.png"</Filename>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
|
||||
<Text>
|
||||
<State> ConfirmDrinkButtonState </State>
|
||||
<X> 0 </X>
|
||||
<Y> 18 </Y>
|
||||
<Align> Center </Align>
|
||||
<Width> 512 </Width>
|
||||
<Font> KanitTTF </Font>
|
||||
<Size> 36 </Size>
|
||||
<Color> TextSelfTestCntColor </Color>
|
||||
<Value> ShowTextSelfTestCountDown </Value>
|
||||
</Text>
|
||||
|
||||
<EventClick>
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If MenuReason = "arm-not-ready" Then
|
||||
Machine RemoveCup
|
||||
Machine DoorLidOpen
|
||||
EndIf
|
||||
EndIf
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 380 </Y>
|
||||
|
|
@ -4152,7 +4294,32 @@
|
|||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 1 </X>
|
||||
<Y> 1 </Y>
|
||||
<Font> KanitTTF </Font>
|
||||
<Size> 22 </Size>
|
||||
<Width> 1080 </Width>
|
||||
<Align> end </Align>
|
||||
<Color> 0xFF0000 </Color>
|
||||
<Value> "#71"</Value>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 1888 </Y>
|
||||
<State> MenuReasonStage </State>
|
||||
<Font> KanitTTF </Font>
|
||||
<Size> 22 </Size>
|
||||
<Width> 1078 </Width>
|
||||
<Align> end </Align>
|
||||
<Color> 0xFF0000 </Color>
|
||||
<Value> MenuReasonString</Value>
|
||||
</Text>
|
||||
|
||||
|
||||
;
|
||||
|
||||
<EventUnitTest1>
|
||||
|
||||
DEBUGVAR SELLSTATUS
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue