THAI INTER: Merge branch masterpiece -> th_mmr
This commit is contained in:
commit
3c994e2ed1
548 changed files with 161156 additions and 52934 deletions
|
|
@ -7,6 +7,14 @@
|
|||
<Background> "0xEAE6E1" </Background>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventOpen>
|
||||
|
||||
If UsePepsiTheme = 1 Then
|
||||
|
||||
Var ShowErrorPage = CountryRootPath + "/xml/page_show_error.lxml"
|
||||
Open ShowErrorPage
|
||||
|
||||
EndIf
|
||||
|
||||
Var countClick = 0
|
||||
Var countClick2 = 0
|
||||
|
||||
|
|
@ -43,13 +51,13 @@
|
|||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
|
||||
Var EmergencyStop = "-"
|
||||
|
||||
|
||||
|
||||
|
||||
If EmergencyStop = "true" Then
|
||||
If DoorCupPosition = "bottom" Then
|
||||
; It normal
|
||||
; It normal
|
||||
Var EmergencyStop = "false"
|
||||
Else
|
||||
Var MachineErrorDetailAll = "Emergency stop!"
|
||||
|
|
@ -74,7 +82,7 @@
|
|||
Var MachineErrorDetailAll = MachineErrorDetailAll + " [ | ]"
|
||||
EndIf
|
||||
|
||||
Var textStep = textStep + 1
|
||||
Var textStep = textStep + 1
|
||||
|
||||
;DEBUGVAR MachineErrorDetailAll
|
||||
;DEBUGVAR textStep
|
||||
|
|
@ -82,12 +90,12 @@
|
|||
If NETCORE_LOST_CNT > 0 Then
|
||||
|
||||
Else
|
||||
|
||||
|
||||
DEBUGVAR NCIC07_EVENT_CNT
|
||||
DEBUGVAR NETCORE_EVENT_CNT_TMP
|
||||
|
||||
If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then
|
||||
|
||||
If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then
|
||||
|
||||
Var NETCORE_LOST_COUNT_UP = NETCORE_LOST_COUNT_UP + 1
|
||||
DEBUGVAR NETCORE_LOST_COUNT_UP
|
||||
|
||||
|
|
@ -107,7 +115,7 @@
|
|||
EndIf
|
||||
|
||||
Else
|
||||
|
||||
|
||||
If stop_now_from_netcore_event = 1 Then
|
||||
Var stop_now = "false"
|
||||
SAVELOG "stop_now_from_netcore_event is set"
|
||||
|
|
@ -121,19 +129,19 @@
|
|||
EndIf
|
||||
|
||||
If MachineStage = "" Then
|
||||
|
||||
|
||||
Var LEDSet = "false"
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
|
||||
EndIf
|
||||
If MachineStage = "show-menu" Then
|
||||
|
||||
|
||||
Var LEDSet = "false"
|
||||
Open "ROOT/taobin_project/xml/page_board.xml"
|
||||
|
||||
EndIf
|
||||
If MachineStage = "remove-cup" Then
|
||||
|
||||
|
||||
Var LEDSet = "false"
|
||||
Open "ROOT/taobin_project/xml/page_remove_cup.xml"
|
||||
|
||||
|
|
@ -149,7 +157,7 @@
|
|||
If FirstOpen = 1 Then
|
||||
Var FirstOpen = 0
|
||||
If MachineStage = "close-maintenance" Then
|
||||
|
||||
|
||||
Var LEDSet = "true"
|
||||
;Open "ROOT/taobin_project/xml/page_show_error.xml"
|
||||
Refresh
|
||||
|
|
@ -159,7 +167,7 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
|
@ -189,7 +197,7 @@
|
|||
Var LanguageButtonEnable = "Enable"
|
||||
Var ButtonLanguageCurrentXPosition = 990
|
||||
Var ButtonLanguageCurrentYPosition = 648
|
||||
|
||||
|
||||
Var ButtonLanguageListXPosition = 970
|
||||
Var ButtonLanguageListYPosition = 640
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
|
|
@ -233,7 +241,7 @@
|
|||
EndIf
|
||||
|
||||
If MachineStage = "mcu-upgrade" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/vending_error"
|
||||
EndIf
|
||||
If LanguageShow = "ENG" Then
|
||||
|
|
@ -257,7 +265,7 @@
|
|||
EndIf
|
||||
|
||||
If NeedUpgrade = "true" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/vending_error"
|
||||
EndIf
|
||||
If LanguageShow = "ENG" Then
|
||||
|
|
@ -281,11 +289,11 @@
|
|||
EndIf
|
||||
|
||||
DEBUGVAR MachineStage
|
||||
|
||||
|
||||
If MachineStage = "close-maintenance" Then
|
||||
DEBUGVAR stop_now
|
||||
If stop_now = "true" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/vending_error"
|
||||
EndIf
|
||||
If LanguageShow = "ENG" Then
|
||||
|
|
@ -309,8 +317,8 @@
|
|||
Else
|
||||
Var show_error_normal = "Enable"
|
||||
Var show_error_sp1 = "Invisible"
|
||||
|
||||
If LanguageShow = "THAI" Then
|
||||
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/close_th"
|
||||
EndIf
|
||||
If LanguageShow = "ENG" Then
|
||||
|
|
@ -338,7 +346,7 @@
|
|||
|
||||
If MachineStage = "drink-failed" Then
|
||||
If stop_now = "true" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/vending_error"
|
||||
EndIf
|
||||
If LanguageShow = "ENG" Then
|
||||
|
|
@ -359,7 +367,7 @@
|
|||
Else
|
||||
Var show_error_normal = "Enable"
|
||||
Var show_error_sp1 = "Invisible"
|
||||
If LanguageShow = "THAI" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/close_th"
|
||||
EndIf
|
||||
If LanguageShow = "ENG" Then
|
||||
|
|
@ -379,9 +387,9 @@
|
|||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
If NETCORE_LOST_CNT > 0 Then
|
||||
If LanguageShow = "THAI" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/vending_error"
|
||||
EndIf
|
||||
If LanguageShow = "ENG" Then
|
||||
|
|
@ -403,7 +411,7 @@
|
|||
|
||||
If NETCORE_EVENT_CNT_X >= 30 Then
|
||||
Var NETCORE_EVENT_CNT_X = 0
|
||||
If LanguageShow = "THAI" Then
|
||||
If LanguageShow = "THAI" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/vending_error"
|
||||
EndIf
|
||||
If LanguageShow = "ENG" Then
|
||||
|
|
@ -488,10 +496,10 @@
|
|||
<Height> 50 </Height>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var countClick = countClick + 1
|
||||
If countClick = 3 Then
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
If countClick = 10 Then
|
||||
|
|
@ -511,8 +519,8 @@
|
|||
<Height> 50 </Height>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
<EventClick>
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -529,4 +537,4 @@
|
|||
</Text>
|
||||
|
||||
|
||||
</Page>
|
||||
</Page>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue