Add file select 5
This commit is contained in:
parent
6b2caad97a
commit
3713f62d05
18 changed files with 2057 additions and 45 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 4.8 KiB |
|
|
@ -28,6 +28,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -14,6 +14,8 @@
|
|||
DEBUGVAR SoundVolume
|
||||
|
||||
|
||||
|
||||
|
||||
Var NextOrder = "false"
|
||||
|
||||
Var Seeker = "next"
|
||||
|
|
@ -554,6 +556,23 @@
|
|||
Else
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Refresh
|
||||
|
||||
TimerReset
|
||||
|
|
|
|||
|
|
@ -100,6 +100,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -167,6 +167,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -155,6 +155,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -143,6 +143,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -142,6 +142,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -140,6 +140,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -133,6 +133,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -139,6 +139,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -155,6 +155,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -135,6 +135,19 @@
|
|||
Open CurrentXMLFileName2
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@
|
|||
Var QRCODE8 = ""
|
||||
|
||||
Var CountStepPackPayment = 0
|
||||
Var CountStepForCupFlagDelay = 1
|
||||
|
||||
|
||||
Var Seeker.TaobinErrorNetwork = 0
|
||||
|
||||
|
|
@ -126,13 +128,10 @@
|
|||
</EventOpen>
|
||||
<Timeout> 900 </Timeout>
|
||||
<EventTimeout>
|
||||
DEBUGVAR Seeker
|
||||
DEBUGVAR HaveCup
|
||||
DEBUGVAR CupChecking
|
||||
DEBUGVAR CountStepPackPayment
|
||||
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If web_ready = "false" Then
|
||||
|
||||
If MachineStage = "remove-cup" Then
|
||||
SAVELOG "MachineStage = remove-cup"
|
||||
|
|
@ -147,9 +146,17 @@
|
|||
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If CupChecking = "true" Then
|
||||
Var CountStepForCupFlagDelay = 3
|
||||
EndIf
|
||||
If HaveCup = "true" Then
|
||||
Var CountStepForCupFlagDelay = 3
|
||||
EndIf
|
||||
|
||||
If ReadyForBrew = "false" Then
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
Var ReadyForBrew = "false"
|
||||
|
|
@ -162,12 +169,18 @@
|
|||
EndIf
|
||||
|
||||
If CupChecking = "false" Then
|
||||
If HaveCup = "false" Then
|
||||
Var CountStepPackPayment = CountStepPackPayment + 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If CountStepPackPayment = 1 Then
|
||||
DEBUGVAR Seeker
|
||||
DEBUGVAR HaveCup
|
||||
DEBUGVAR CupChecking
|
||||
DEBUGVAR CountStepPackPayment
|
||||
DEBUGVAR CountStepForCupFlagDelay
|
||||
|
||||
|
||||
|
||||
If CountStepPackPayment = CountStepForCupFlagDelay Then
|
||||
|
||||
SAVELOG ExtendData
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,15 @@
|
|||
Var show_error_normal = "Invisible"
|
||||
Var show_error_sp1 = "Enable"
|
||||
|
||||
If EmergencyStop = "true" Then
|
||||
Var stop_now = "true"
|
||||
If show_eng = "true" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
|
||||
Else
|
||||
Var DirImage = "ROOT/taobin_project/image/vending_error"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If MachineStage = "mcu-upgrade" Then
|
||||
If show_eng = "true" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
|
||||
|
|
@ -97,12 +106,25 @@
|
|||
Var RandomImage = RandomImage + ".png"
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR Seeker
|
||||
DEBUGVAR DoorCupPosition
|
||||
DEBUGVAR DoorLidPosition
|
||||
DEBUGVAR EmergencyStop
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 5000 </Timeout>
|
||||
<EventTimeout>
|
||||
;SAVELOG MachineErrorDetail
|
||||
SAVELOG EmergencyStop
|
||||
If EmergencyStop = "true" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var MachineErrorDetailAll = "Emergency stop!"
|
||||
|
||||
EndIf
|
||||
Else
|
||||
|
||||
Var MachineErrorDetailAll = MachineErrorDetail + " / "
|
||||
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
|
||||
|
||||
|
|
@ -136,6 +158,8 @@
|
|||
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
|
|
|
|||
|
|
@ -190,6 +190,18 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If Seeker = "curr" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var EmergencyStop = "true"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
|
||||
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Refresh
|
||||
TimerReset
|
||||
</EventTimeout>
|
||||
|
|
|
|||
1801
xml/page_topping_select5.xml
Normal file
1801
xml/page_topping_select5.xml
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -95,8 +95,8 @@
|
|||
Var RandomPromotionMyworld = 0
|
||||
Var RandomSalePackage = 0
|
||||
|
||||
Var XMLPageVersion = "6.07"
|
||||
Var XMLPageVersionInt = 607
|
||||
Var XMLPageVersion = "6.09"
|
||||
Var XMLPageVersionInt = 609
|
||||
</EventOpen>
|
||||
|
||||
<Text>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue