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

do 7.14

Browse source
This commit is contained in:
kong 2023-04-25 22:15:31 +07:00
parent 271934696b
commit 67918819bf
40 changed files with 59 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
xml/page_board.xml
View file

@ -702,6 +702,18 @@
Var CountDownCheckCamera = 2
If Not#CameraSettingStatus = "" Then
DEBUGVAR CameraCount
If CameraCount = 1 Then
Var CountDownCheckCamera = 2
CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7"
Else
Var CountDownCheckCamera = 5
EndIf
Else
Var CountDownCheckCamera = 20
EndIf
DEBUGVAR EnableLiveness
DEBUGVAR LivenessControlVersion
@ -895,7 +907,7 @@
Var CountDownCheckCamera = 2
CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=0.7"
Else
Var CountDownCheckCamera = 5
Var CountDownCheckCamera = 5
EndIf
Else
Var CountDownCheckCamera = 20

2
xml/page_catalog_group_cocktail.xml
View file

@ -320,7 +320,7 @@
SAVELOG "Click rec"
Var NextPage = "-"
; zone promote
If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else

2
xml/page_catalog_group_forkid.xml
View file

@ -329,7 +329,7 @@
SAVELOG "Click rec"
Var NextPage = "-"
; zone promote
If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else

2
xml/page_catalog_group_health.xml
View file

@ -320,7 +320,7 @@
SAVELOG "Click rec"
Var NextPage = "-"
; zone promote
If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else

2
xml/page_catalog_group_recommend3.xml
View file

@ -337,7 +337,7 @@
SAVELOG "Click rec"
Var NextPage = "-"
; zone promote
If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else

2
xml/page_catalog_group_songkran.xml
View file

@ -316,7 +316,7 @@
SAVELOG "Click rec"
Var NextPage = "-"
; zone promote
If SongkranEnable = 1 Then
Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml"
Else

18
xml/page_identity_verification.xml
View file

@ -68,6 +68,7 @@
Var IDcardTextStatus = "โปรดเสียบบัตรประชาชน \nเพื่อดำเนินการต่อ"
Var LivenessRestartCount = 0
Var FailTrickCount = 0
</EventOpen>
<EventActionOk>
@ -364,6 +365,19 @@
<EventLivenessState>
DEBUGVAR LivenessStateString
DEBUGVAR LivenessStateForPlaySound
Var SoundWavFileName = "/mnt/sdcard/coffeevending/taobin_project/liveness/sound/" + LivenessStateForPlaySound
Var SoundWavFileName = SoundWavFileName + ".wav"
DEBUGVAR SoundWavFileName
DEBUGVAR PrevSoundWavFileName
If PrevSoundWavFileName = SoundWavFileName Then
Else
Play SoundWavFileName
Var PrevSoundWavFileName = SoundWavFileName
EndIf
If LivenessResult = "pass" Then
@ -378,7 +392,9 @@
If LivenessResult = "pass" Then
SAVELOG "Liveness Result - pass"
Else
SAVELOG "Liveness Result - fail"
Var FailTrickCount = FailTrickCount + 1
Var strlog_liveness = "Liveness Result - fail " + FailTrickCount
SAVELOG strlog_liveness
EndIf
</EventLivenessResult>

28
xml/page_show_error.xml
View file

@ -137,12 +137,13 @@
DEBUGVAR EmergencyStop
Var TimeOut = 0
Var textStep = 0
</EventOpen>
<Timeout> 5000 </Timeout>
<Timeout> 1000 </Timeout>
<EventTimeout>
DEBUGVAR EmergencyStop
;DEBUGVAR EmergencyStop
DEBUGVAR NETCORE_LOST_CNT
DEBUGVAR DoorCupPosition
;DEBUGVAR DoorCupPosition
DEBUGVAR MachineStage
Var EmergencyStop = "-"
@ -160,7 +161,26 @@
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
DEBUGVAR MachineStage
If textStep > 3 Then
Var textStep = 0
Var MachineErrorDetailAll = MachineErrorDetailAll + " [ \ ]"
EndIf
If textStep = 3 Then
Var MachineErrorDetailAll = MachineErrorDetailAll + " [ - ]"
EndIf
If textStep = 2 Then
Var MachineErrorDetailAll = MachineErrorDetailAll + " [ / ]"
EndIf
If textStep = 1 Then
Var MachineErrorDetailAll = MachineErrorDetailAll + " [ | ]"
EndIf
Var textStep = textStep + 1
;DEBUGVAR MachineErrorDetailAll
;DEBUGVAR textStep
If NETCORE_LOST_CNT > 0 Then
Else