调整了人脸识别界面

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

@@ -54,6 +54,9 @@ abstract class BaseActivity<VB : ViewBinding> : AppCompatActivity() {
         // 确保内容延伸到导航栏区域
 //        WindowCompat.setDecorFitsSystemWindows(window, false)
 
+        //保持亮屏
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+
         binding = inflateViewBinding()
         headerBinding = inflateTitleBinding()
         setContentView(binding.root)

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

@@ -60,8 +60,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     }
 
     override fun initialize() {
-
-//        viewModel.activeEngine()
+        viewModel.activeEngine()
         initArcViewModel()
         initArcView()
         openRectInfoDraw = true
@@ -156,6 +155,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
             Timber.i("recognizeUserId observe userId = $userId")
             viewModel.getUserInfoById(memberId = userId?.toInt() ?: 0)
         })
+
+        recognizeViewModel.drawRectInfoText.observe(this, Observer { info ->
+            Timber.i("drawRectInfoText observe info = $info")
+        })
     }
 
     private fun initArcView() {
@@ -250,8 +253,10 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                     val layoutParams = adjustPreviewViewSize(
                         binding.dualCameraTexturePreviewRgb,
                         binding.dualCameraTexturePreviewRgb, binding.dualCameraFaceRectView,
-                        previewSizeRgb, displayOrientation, 1.0f
+                        previewSizeRgb, displayOrientation, 1f
                     )
+                    Timber.d("initRgbCamera previewSizeRgb = ${previewSizeRgb.width}-${previewSizeRgb.height}")
+                    Timber.d("initRgbCamera layoutParams = ${layoutParams.width}-${layoutParams.height}")
                     rgbFaceRectTransformer = FaceRectTransformer(
                         previewSizeRgb.width,
                         previewSizeRgb.height,
@@ -269,7 +274,6 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                 })
             }
 
-
             @RequiresApi(api = Build.VERSION_CODES.Q)
             override fun onPreview(nv21: ByteArray?, camera: Camera?) {
                 if (!isRecognition) {
@@ -322,7 +326,6 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
         rgbCameraHelper!!.start()
     }
 
-
     /**
      * 绘制RGB、IR画面的实时人脸信息
      *
@@ -337,7 +340,6 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
             )
             // 识别成功
             binding.dualCameraFaceRectView.drawRealtimeFaceInfo(rgbDrawInfoList)
-
         }
     }
 

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

@@ -4,6 +4,7 @@ import android.content.Intent
 import androidx.activity.viewModels
 import androidx.lifecycle.lifecycleScope
 import com.sw.plate.utils.ToastUtils
+import com.sw.plate.utils.arcface.face.Test
 import com.sw.platecabinet.databinding.ActivityLoginByPwdBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
 import com.sw.platecabinet.viewmodel.UserViewModel
@@ -28,6 +29,11 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
             val pwd = binding.etPwd.text.toString()
             if (phone.isEmpty() || pwd.isEmpty()) {
                 ToastUtils.showToast("手机或校验码不能为空")
+                val test = Test()
+                for (i in 1..1000) {
+                    test.test1()
+                }
+
                 return@setOnClickListener
             }
             viewModel.loginWithPwd(phone = phone, password = pwd)

app/src/main/java/com/sw/platecabinet/viewmodel/UserViewModel.kt

@@ -14,8 +14,10 @@ import com.sw.platecabinet.model.request.LoginParam
 import com.sw.platecabinet.model.response.EquipmentUserInfo
 import com.sw.platecabinet.model.response.UserFaceModel
 import com.sw.platecabinet.utils.ThreadUtils
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.withContext
 import timber.log.Timber
 
 class UserViewModel : BaseViewModel() {
@@ -55,8 +57,10 @@ class UserViewModel : BaseViewModel() {
                 val faceEntity = list.map {
                     FaceEntity(it.userId, null, Base64.decode(it.faceFeatureString))
                 }
-                faceApi.updateFaceData(index, faceEntity)
-                activeEngine()
+                withContext(Dispatchers.Default) {
+                    faceApi.updateFaceData(index, faceEntity)
+                    activeEngine()
+                }
             }
         }
     }