diff --git a/.idea/misc.xml b/.idea/misc.xml index e236b7d..7e8cd7e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt index 7e3372c..f0f2438 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt @@ -1,5 +1,6 @@ package com.sw.platecabinet.activity +import android.util.Log import androidx.lifecycle.lifecycleScope import com.sw.plate.utils.arcface.FaceApi import com.sw.plate.utils.arcface.faceserver.FaceServer @@ -21,6 +22,7 @@ class InitActivity : BaseActivity() { } override fun initialize() { + Log.d("InitActivity", "collectFace,initialize: ") binding.takeButton.setOnClickListener { finish() } diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt index 92b068a..42d40bb 100644 --- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt +++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt @@ -551,6 +551,7 @@ class LoginByFaceActivity : BaseActivity(), private fun resumeCamera() { isRecognition = true if (rgbCameraHelper != null && rgbCameraHelper!!.isStopped) { + Log.d(TAG, "collectFace,resumeCamera: ") rgbCameraHelper!!.start() } } @@ -579,6 +580,7 @@ class LoginByFaceActivity : BaseActivity(), it.cancel() it.start() } + initFaceScheduler() checkFaceState() } catch (e: Exception) { e.printStackTrace() @@ -603,7 +605,7 @@ class LoginByFaceActivity : BaseActivity(), // goInitActivity() } - private val totalTimeInMillis = 30 * 1000L + private val totalTimeInMillis = 10 * 1000L fun initCountTime() { countDownTimer = object : CountDownTimer(totalTimeInMillis, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -671,8 +673,14 @@ class LoginByFaceActivity : BaseActivity(), tcpClient?.send(jsonObject) } - private val getFaceScheduler: ScheduledExecutorService? = Executors.newScheduledThreadPool(1); - private val checkFaceScheduler: ScheduledExecutorService? = Executors.newScheduledThreadPool(1); + private var getFaceScheduler: ScheduledExecutorService? = null + private var checkFaceScheduler: ScheduledExecutorService? = null + + private fun initFaceScheduler() { + getFaceScheduler = Executors.newScheduledThreadPool(1) + checkFaceScheduler = Executors.newScheduledThreadPool(1) + } + private fun getFaceData(block: (String) -> Unit) { getFaceScheduler?.scheduleWithFixedDelay( @@ -848,7 +856,7 @@ class LoginByFaceActivity : BaseActivity(), }.start() } - private val WAITING_TIME = 3 * 1000L + private val WAITING_TIME = 1 * 1000L private var checkStartTime = 0L // private var checkFaceJob: Job? = null private fun checkFaceState() { @@ -866,7 +874,7 @@ class LoginByFaceActivity : BaseActivity(), } private fun checkFaceBlock() { - Log.d("Login", "currentUserId=${currentUserId}") + Log.d("Login", "collectFace,currentUserId=${currentUserId}") if (currentUserId.isNullOrBlank().not()) { // checkFaceJob?.cancel() checkFaceScheduler?.shutdown() diff --git a/lib_face/src/main/java/com/sw/plate/utils/arcface/face/FaceHelper.java b/lib_face/src/main/java/com/sw/plate/utils/arcface/face/FaceHelper.java index 411fdf1..5a6999d 100644 --- a/lib_face/src/main/java/com/sw/plate/utils/arcface/face/FaceHelper.java +++ b/lib_face/src/main/java/com/sw/plate/utils/arcface/face/FaceHelper.java @@ -666,7 +666,7 @@ public class FaceHelper implements FaceListener { noticeCurrentStatus("识别通过"); changeRecognizeStatus(trackId, RequestFeatureStatus.SUCCEED); } else { - noticeCurrentStatus("未通过:NOT_REGISTERED"); + noticeCurrentStatus("未通过:NOT_REGISTERED,"+compareResult.getSimilar()); retryRecognizeDelayed(trackId); } }