do 7.14

2023-04-25 22:15:31 +07:00 · 2023-04-25 22:15:31 +07:00 · 67918819bf
commit 67918819bf
parent 271934696b
40 changed files with 59 additions and 11 deletions
--- a/adv/taobin_adv_07.mp4
+++ b/adv/taobin_adv_07.mp4
--- a/adv/taobin_adv_07_.mp4
+++ b/adv/taobin_adv_07_.mp4
--- a/adv/taobin_adv_menu2_07.mp4
+++ b/adv/taobin_adv_menu2_07.mp4
--- a/adv/taobin_adv_menu2_07_.mp4
+++ b/adv/taobin_adv_menu2_07_.mp4
--- a/adv/taobin_adv_menu_07.mp4
+++ b/adv/taobin_adv_menu_07.mp4
--- a/adv/taobin_adv_menu_07_.mp4
+++ b/adv/taobin_adv_menu_07_.mp4
--- a/image/page_drink_disable_n2/bn_super_oreo_volcano.png
+++ b/image/page_drink_disable_n2/bn_super_oreo_volcano.png
--- a/image/page_drink_n/bn_super_oreo_volcano.png
+++ b/image/page_drink_n/bn_super_oreo_volcano.png
--- a/image/page_drink_picture2_n/bn_super_oreo_volcano.png
+++ b/image/page_drink_picture2_n/bn_super_oreo_volcano.png
--- a/image/page_drink_press_n/bn_super_oreo_volcano.png
+++ b/image/page_drink_press_n/bn_super_oreo_volcano.png
--- a/liveness/sound/Big_smile.wav
+++ b/liveness/sound/Big_smile.wav
--- a/liveness/sound/Blink_eye.wav
+++ b/liveness/sound/Blink_eye.wav
--- a/liveness/sound/Blink_eye2.wav
+++ b/liveness/sound/Blink_eye2.wav
--- a/liveness/sound/Detect_multiple_faces.wav
+++ b/liveness/sound/Detect_multiple_faces.wav
--- a/liveness/sound/Eye_not_found_or_closed.wav
+++ b/liveness/sound/Eye_not_found_or_closed.wav
--- a/liveness/sound/Face_not_found.wav
+++ b/liveness/sound/Face_not_found.wav
--- a/liveness/sound/Left_eye_not_found_or_closed.wav
+++ b/liveness/sound/Left_eye_not_found_or_closed.wav
--- a/liveness/sound/Liveness_check_not_started_yet.wav
+++ b/liveness/sound/Liveness_check_not_started_yet.wav
--- a/liveness/sound/Look_straight_at_the_camera.wav
+++ b/liveness/sound/Look_straight_at_the_camera.wav
--- a/liveness/sound/Mouth_not_found.wav
+++ b/liveness/sound/Mouth_not_found.wav
--- a/liveness/sound/Nose_not_found.wav
+++ b/liveness/sound/Nose_not_found.wav
--- a/liveness/sound/Please_change_environment_to_scan_face.wav
+++ b/liveness/sound/Please_change_environment_to_scan_face.wav
--- a/liveness/sound/Please_close_your_mouth.wav
+++ b/liveness/sound/Please_close_your_mouth.wav
--- a/liveness/sound/Please_move_face_into_guide_line.wav
+++ b/liveness/sound/Please_move_face_into_guide_line.wav
--- a/liveness/sound/Please_move_your_face_closer.wav
+++ b/liveness/sound/Please_move_your_face_closer.wav
--- a/liveness/sound/Right_eye_not_found_or_closed.wav
+++ b/liveness/sound/Right_eye_not_found_or_closed.wav
--- a/liveness/sound/Tilt_head_up_and_down.wav
+++ b/liveness/sound/Tilt_head_up_and_down.wav
--- a/liveness/sound/Turn_face_to_left.wav
+++ b/liveness/sound/Turn_face_to_left.wav
--- a/liveness/sound/Turn_face_to_left_or_right.wav
+++ b/liveness/sound/Turn_face_to_left_or_right.wav
--- a/liveness/sound/Turn_face_to_right.wav
+++ b/liveness/sound/Turn_face_to_right.wav
--- a/liveness/sound/Your_face_is_too_bright.wav
+++ b/liveness/sound/Your_face_is_too_bright.wav
--- a/liveness/sound/Your_face_is_too_dark.wav
+++ b/liveness/sound/Your_face_is_too_dark.wav
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -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
--- a/xml/page_catalog_group_cocktail.xml
+++ b/xml/page_catalog_group_cocktail.xml
@ -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
--- a/xml/page_catalog_group_forkid.xml
+++ b/xml/page_catalog_group_forkid.xml
@ -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
--- a/xml/page_catalog_group_health.xml
+++ b/xml/page_catalog_group_health.xml
@ -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
--- a/xml/page_catalog_group_recommend3.xml
+++ b/xml/page_catalog_group_recommend3.xml
@ -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
--- a/xml/page_catalog_group_songkran.xml
+++ b/xml/page_catalog_group_songkran.xml
@ -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
--- a/xml/page_identity_verification.xml
+++ b/xml/page_identity_verification.xml
@ -68,6 +68,7 @@
    Var IDcardTextStatus = "โปรดเสียบบัตรประชาชน \nเพื่อดำเนินการต่อ"

    Var LivenessRestartCount = 0
+    Var FailTrickCount = 0
 </EventOpen>

 <EventActionOk>
@ -365,6 +366,19 @@
    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

    Else
@ -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>

--- a/xml/page_show_error.xml
+++ b/xml/page_show_error.xml
@ -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