优化

.idea/misc.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="zulu-17" project-jdk-type="JavaSDK">

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<ActivityInitBinding>() {
     }
 
     override fun initialize() {
+        Log.d("InitActivity", "collectFace,initialize: ")
         binding.takeButton.setOnClickListener {
             finish()
         }

app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt

@@ -551,6 +551,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     private fun resumeCamera() {
         isRecognition = true
         if (rgbCameraHelper != null && rgbCameraHelper!!.isStopped) {
+            Log.d(TAG, "collectFace,resumeCamera: ")
             rgbCameraHelper!!.start()
         }
     }
@@ -579,6 +580,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                 it.cancel()
                 it.start()
             }
+            initFaceScheduler()
             checkFaceState()
         } catch (e: Exception) {
             e.printStackTrace()
@@ -603,7 +605,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 //        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<ActivityLoginFaceBinding>(),
         tcpClient?.send(jsonObject)
     }
 
-    private val getFaceScheduler: ScheduledExecutorService? = Executors.newScheduledThreadPool(1);
+    private var getFaceScheduler: ScheduledExecutorService? = null
-    private val checkFaceScheduler: ScheduledExecutorService? = Executors.newScheduledThreadPool(1);
+    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<ActivityLoginFaceBinding>(),
         }.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<ActivityLoginFaceBinding>(),
     }
 
     private fun checkFaceBlock() {
-        Log.d("Login", "currentUserId=${currentUserId}")
+        Log.d("Login", "collectFace,currentUserId=${currentUserId}")
         if (currentUserId.isNullOrBlank().not()) {
 //            checkFaceJob?.cancel()
             checkFaceScheduler?.shutdown()

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);
         }
     }