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

Merge branch 'master' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
kong 2022-07-05 13:45:01 +07:00
commit 5357a100c7
5 changed files with 115 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

70
xml/page_board.xml
View file

@ -52,6 +52,8 @@
Var Seeker.CurrCreditTelNum = ""
Var Seeker.CurrCreditPinNum = ""
; On open
Var menu_back_to_main = "ROOT/taobin_project/xml/page_back_to_main.xml"
@ -470,8 +472,35 @@
Var show_lang = "THAI"
GetDateEndOfMonth SalaryDate
DEBUGVAR SalaryDate
;Var NETCORE_EVENT_CNT_TMP = 0
;DEBUGVAR NETCORE_EVENT_CNT_TMP
;DEBUGVAR NCIC07_EVENT_CNT
;
;If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then
;
; Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1
; If NETCORE_EVENT_CNT_X >= 3 Then
; Var stop_now = "true"
; Var MachineErrorDetailAll = "Netcore Lost"
; DEBUGVAR "NCIC07_EVENT_CNT"
; DEBUGVAR NCIC07_EVENT_CNT
; Open "ROOT/taobin_project/xml/page_show_error.xml"
; EndIf
;
;
;
;Else
;
; Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT
; Var NETCORE_EVENT_CNT_X = 0
;
;EndIf
Var NETCORE_EVENT_CNT_X = 0
Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT
</EventOpen>
@ -506,6 +535,29 @@
SAVELOG "NETCORE_LOST_CNT"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
DEBUGVAR NETCORE_EVENT_CNT_X
If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then
Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1
If NETCORE_EVENT_CNT_X >= 30 Then
Var stop_now = "true"
Var MachineErrorDetailAll = "Netcore Lost"
DEBUGVAR "NCIC07_EVENT_CNT"
DEBUGVAR NCIC07_EVENT_CNT
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
Else
Var NETCORE_EVENT_CNT_X = 0
Var NETCORE_EVENT_CNT_TMP = NCIC07_EVENT_CNT
EndIf
EndIf
If MachineStage = "drink-failed" Then
@ -630,6 +682,20 @@
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

4
xml/page_show_consent.xml
View file

@ -33,7 +33,7 @@
Var ShowCountDownBrewing = CountDownBrewing
Var Timeout = Timeout + 1
If Timeout > 60 Then
If Timeout > 30 Then
; goto lid straw
;SAVELOG "Timeout"
;Open "ROOT/taobin_project/xml/page_lid_straw.xml"
@ -78,7 +78,7 @@
<Image>
<X> 158 </X>
<Y> 665 </Y>
<Y> 481 </Y>
<Filename> Var( DirImage + "/img_popup2.png") </Filename>
</Image>

66
xml/page_show_error.xml
View file

@ -98,6 +98,16 @@
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
EndIf
If NETCORE_EVENT_CNT_X >= 30 Then
Var NETCORE_EVENT_CNT_X = 0
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
StopLongPlay
@ -154,34 +164,48 @@
If NETCORE_LOST_CNT > 0 Then
Else
If MachineStage = "show-menu" Then
DEBUGVAR NCIC07_EVENT_CNT
DEBUGVAR NETCORE_EVENT_CNT_TMP
If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then
Else
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_board.xml"
Var LEDSet = "false"
Open "ROOT/taobin_project/xml/page_remove_cup.xml"
EndIf
If MachineStage = "remove-cup" Then
Var LEDSet = "false"
Open "ROOT/taobin_project/xml/page_remove_cup.xml"
EndIf
EndIf
If MachineStage = "drink-failed" Then
Var FirstOpen = 1
Var LEDSet = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
If FirstOpen = 1 Then
Var FirstOpen = 0
If MachineStage = "close-maintenance" Then
If MachineStage = "drink-failed" Then
Var FirstOpen = 1
Var LEDSet = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
If FirstOpen = 1 Then
Var FirstOpen = 0
If MachineStage = "close-maintenance" Then
Var LEDSet = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
EndIf
EndIf