renovate remove cup and cup on arm
This commit is contained in:
parent
34ceea967c
commit
f6a7ec1501
57 changed files with 591 additions and 475 deletions
|
|
@ -389,7 +389,6 @@
|
|||
Var TimerFirst = "true"
|
||||
|
||||
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
|
||||
Var led_new = "0"
|
||||
READ_FILE "/mnt/sdcard/coffeevending/led_new" led_new
|
||||
|
|
@ -1334,8 +1333,26 @@
|
|||
; New mode
|
||||
; Inter + Multi-Instance available ./inter/tha/multi
|
||||
|
||||
|
||||
Var EnableMultiInstanceFromBoxID = 0
|
||||
TRY "ROOT/taobin_project/inter/tha/configure.ev"
|
||||
|
||||
DEBUGVAR EnableMultiInstanceFromBoxID
|
||||
|
||||
If MAT_ID_2301 = "Enable" Then
|
||||
If EnableMultiInstanceFromBoxID = 0 Then
|
||||
|
||||
If CountUpForRestartApp = "" Then
|
||||
Var CountUpForRestartApp = 0
|
||||
EndIf
|
||||
DEBUGVAR CountUpForRestartApp
|
||||
Var CountUpForRestartApp = CountUpForRestartApp + 1
|
||||
|
||||
If CountUpForRestartApp > 1 Then
|
||||
WRITE_FILE "/mnt/sdcard/enable_ui_v3" "true"
|
||||
FINISH
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If BoxID = 173372 Then
|
||||
|
|
@ -1580,20 +1597,7 @@
|
|||
Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
|
||||
EndIf
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
If CheckCupStateDoorCupClose = "" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
|
||||
If CheckCupStateDoorCupClose = "done" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If IgnoreProfileFromRunEV = "" Then
|
||||
Var IgnoreProfileFromRunEV = 0
|
||||
|
|
@ -1753,10 +1757,14 @@
|
|||
|
||||
OpenInst 2 PepsiFullScreenPageBoard
|
||||
EndIf
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
; tap screen for press popup when app hang
|
||||
TapScreen 860 1004
|
||||
Else
|
||||
; tap screen for press popup when app hang
|
||||
TapScreen 860 1004
|
||||
EndIf
|
||||
|
||||
Var buttonRemoveCupOnArm = "Invisible"
|
||||
Var CountDownFailErrorHappendClear = 8
|
||||
</EventOpen>
|
||||
|
||||
|
|
@ -1906,17 +1914,17 @@ PRICE "Reset" "-"
|
|||
</EventUnitTest7>
|
||||
|
||||
<EventUnitTest8>
|
||||
Var buttonRemoveCup = "Enable"
|
||||
DEBUGVAR buttonRemoveCup
|
||||
Var buttonRemoveCupOnArm = "Enable"
|
||||
DEBUGVAR buttonRemoveCupOnArm
|
||||
DEBUGVAR bnRemoveCup
|
||||
DEBUGVAR bpRemoveCup
|
||||
|
||||
</EventUnitTest8>
|
||||
|
||||
<EventUnitTest9>
|
||||
Var buttonRemoveCup = "Enable"
|
||||
Var buttonRemoveCupOnArm = "Enable"
|
||||
Var UseVeryBigRemoveCupButton = "Enable"
|
||||
DEBUGVAR buttonRemoveCup
|
||||
DEBUGVAR buttonRemoveCupOnArm
|
||||
|
||||
|
||||
</EventUnitTest9>
|
||||
|
|
@ -1943,10 +1951,14 @@ PRICE "Reset" "-"
|
|||
DEBUGVAR FailErrorHappend
|
||||
|
||||
If FailErrorHappend = 1 Then
|
||||
If CountDownFailErrorHappendClear > 0 Then
|
||||
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
|
||||
If CountDownFailErrorHappendClear = 1 Then
|
||||
__CMD "error-code-clear-all" "-" "-" "-"
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
Else
|
||||
If CountDownFailErrorHappendClear > 0 Then
|
||||
Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
|
||||
If CountDownFailErrorHappendClear = 1 Then
|
||||
__CMD "error-code-clear-all" "-" "-" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -2288,23 +2300,7 @@ PRICE "Reset" "-"
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
If CheckCupStateDoorCupClose = "" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
|
||||
If CheckCupStateDoorCupClose = "done" Then
|
||||
Var buttonRemoveCup = "Enable"
|
||||
EndIf
|
||||
Else
|
||||
If buttonRemoveCup = "Enable" Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
EndIf
|
||||
;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
|
||||
|
||||
|
||||
|
||||
|
|
@ -2656,7 +2652,7 @@ PRICE "Reset" "-"
|
|||
<Button>
|
||||
<X> btnRemoveCupX </X>
|
||||
<Y> btnRemoveCupY </Y>
|
||||
<State> buttonRemoveCup </State>
|
||||
<State> buttonRemoveCupOnArm </State>
|
||||
;<Color> "0x00BDFF" </Color>
|
||||
<Interval> 500 </Interval>
|
||||
<Filename> bnRemoveCup </Filename>
|
||||
|
|
@ -2666,7 +2662,8 @@ PRICE "Reset" "-"
|
|||
Machine DoorLidOpen
|
||||
|
||||
Var CheckCupStateDoorCupClose = "reset"
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
Var buttonRemoveCupOnArm = "Invisible"
|
||||
RefreshAll
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -2806,4 +2803,6 @@ PRICE "Reset" "-"
|
|||
</Text>
|
||||
|
||||
|
||||
;include="ROOT/inc/remove_cup_tag_on_arm.inc"
|
||||
|
||||
</Page>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue