This commit is contained in:
mazengfei
2026-02-28 16:54:57 +08:00
parent cc88dccaa6
commit 4ea95092f5
3 changed files with 23 additions and 4 deletions
@@ -10,11 +10,13 @@ import android.util.DisplayMetrics
import android.view.View
import android.view.ViewGroup
import android.view.ViewTreeObserver
import android.widget.ImageView
import androidx.annotation.RequiresApi
import androidx.core.view.isVisible
import androidx.lifecycle.Observer
import androidx.lifecycle.lifecycleScope
import com.arcsoft.face.ErrorInfo
import com.bumptech.glide.Glide
import com.google.gson.Gson
import com.sw.inbound.utils.DateTimeUtils
import com.sw.plate.utils.Base64
@@ -358,6 +360,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
visible()
text = "新用户采集"
}
binding.ivCollectPhoto.visible()
}
/**
@@ -512,7 +515,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
val layoutParams = adjustPreviewViewSize(
binding.dualCameraTexturePreviewRgb,
binding.dualCameraTexturePreviewRgb, binding.dualCameraFaceRectView,
previewSizeRgb, displayOrientation, 0.6f
previewSizeRgb, displayOrientation, 0.7f
//0.6f
)
loadLogInfo("initRgbCamera previewSizeRgb = ${previewSizeRgb.width}-${previewSizeRgb.height}")
loadLogInfo("initRgbCamera layoutParams = ${layoutParams.width}-${layoutParams.height}")
@@ -700,6 +704,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
* 重置识别状态
*/
private fun resetRecognizeState() {
binding.ivCollectPhoto.gone()
binding.ivCollectPhoto.setImageDrawable(null)
binding.tvToInit.text = "15"
binding.llCollectButton.gone()
retryFailCount = 0
@@ -818,7 +824,11 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
return@addUserFace
}
Thread {
saveFaceInfo(faceModel)
saveFaceInfo(faceModel) {
runOnUiThread {
Glide.with(this@LoginByFaceActivity).load(imageFile).into(binding.ivCollectPhoto)
}
}
uploadFaceDebouncer.reset()
}.start()
}
@@ -856,7 +866,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
private var currentUserId: String? = null
private fun saveFaceInfo(faceModel: UserFaceModel) {
private fun saveFaceInfo(faceModel: UserFaceModel, block:()-> Unit= {}) {
try {
loadLogInfo("collectFace,saveFaceInfo: ----------8,保存人脸取特征数据-----------")
val faceDao = FaceDatabase.getInstance(this).faceDao()
@@ -875,6 +885,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
runOnUiThread { recognizeViewModel.onPreviewFrame(emptyFrame, true) }
loadLogInfo("---------------------------------")
collectCount = 0
block()
} catch (e: Exception) {
e.printStackTrace()
loadLogInfo("collectFace,saveFaceInfo: ----------13,人脸采集异常:${e.message}-----------")