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

BIN
adv/taobin_adv_07.mp4
View file

Binary file not shown.

BIN
adv/taobin_adv_07_.mp4 Normal file
View file

Binary file not shown.

BIN
adv/taobin_adv_menu2_07.mp4
View file

Binary file not shown.

BIN
adv/taobin_adv_menu2_07_.mp4 Normal file
View file

Binary file not shown.

BIN
adv/taobin_adv_menu_07.mp4
View file

Binary file not shown.

BIN
adv/taobin_adv_menu_07_.mp4 Normal file
View file

Binary file not shown.

BIN
image/page_drink_disable_n2/bn_super_oreo_volcano.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
image/page_drink_n/bn_super_oreo_volcano.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 33 KiB

BIN
image/page_drink_picture2_n/bn_super_oreo_volcano.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 42 KiB

BIN
image/page_drink_press_n/bn_super_oreo_volcano.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
liveness/sound/Big_smile.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Blink_eye.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Blink_eye2.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Detect_multiple_faces.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Eye_not_found_or_closed.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Face_not_found.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Left_eye_not_found_or_closed.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Liveness_check_not_started_yet.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Look_straight_at_the_camera.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Mouth_not_found.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Nose_not_found.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Please_change_environment_to_scan_face.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Please_close_your_mouth.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Please_move_face_into_guide_line.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Please_move_your_face_closer.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Right_eye_not_found_or_closed.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Tilt_head_up_and_down.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Turn_face_to_left.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Turn_face_to_left_or_right.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Turn_face_to_right.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Your_face_is_too_bright.wav Normal file
View file

Binary file not shown.

BIN
liveness/sound/Your_face_is_too_dark.wav Normal file
View file

Binary file not shown.

12
xml/page_board.xml
View file

@ -702,6 +702,18 @@
Var CountDownCheckCamera = 2 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 EnableLiveness
DEBUGVAR LivenessControlVersion DEBUGVAR LivenessControlVersion

2
xml/page_catalog_group_cocktail.xml
View file

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

2
xml/page_catalog_group_forkid.xml
View file

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

2
xml/page_catalog_group_health.xml
View file

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

2
xml/page_catalog_group_recommend3.xml
View file

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

2
xml/page_catalog_group_songkran.xml
View file

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

18
xml/page_identity_verification.xml
View file

@ -68,6 +68,7 @@
Var IDcardTextStatus = "โปรดเสียบบัตรประชาชน \nเพื่อดำเนินการต่อ" Var IDcardTextStatus = "โปรดเสียบบัตรประชาชน \nเพื่อดำเนินการต่อ"
Var LivenessRestartCount = 0 Var LivenessRestartCount = 0
Var FailTrickCount = 0
</EventOpen> </EventOpen>
<EventActionOk> <EventActionOk>
@ -365,6 +366,19 @@
DEBUGVAR LivenessStateString DEBUGVAR LivenessStateString
DEBUGVAR LivenessStateForPlaySound 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 If LivenessResult = "pass" Then
Else Else
@ -378,7 +392,9 @@
If LivenessResult = "pass" Then If LivenessResult = "pass" Then
SAVELOG "Liveness Result - pass" SAVELOG "Liveness Result - pass"
Else Else
SAVELOG "Liveness Result - fail" Var FailTrickCount = FailTrickCount + 1
Var strlog_liveness = "Liveness Result - fail " + FailTrickCount
SAVELOG strlog_liveness
EndIf EndIf
</EventLivenessResult> </EventLivenessResult>

28
xml/page_show_error.xml
View file

@ -137,12 +137,13 @@
DEBUGVAR EmergencyStop DEBUGVAR EmergencyStop
Var TimeOut = 0 Var TimeOut = 0
Var textStep = 0
</EventOpen> </EventOpen>
<Timeout> 5000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
DEBUGVAR EmergencyStop ;DEBUGVAR EmergencyStop
DEBUGVAR NETCORE_LOST_CNT DEBUGVAR NETCORE_LOST_CNT
DEBUGVAR DoorCupPosition ;DEBUGVAR DoorCupPosition
DEBUGVAR MachineStage DEBUGVAR MachineStage
Var EmergencyStop = "-" Var EmergencyStop = "-"
@ -160,7 +161,26 @@
Var MachineErrorDetailAll = MachineErrorDetail + " / " Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng 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 If NETCORE_LOST_CNT > 0 Then
Else Else