优化
This commit is contained in:
@@ -10,11 +10,13 @@ import android.util.DisplayMetrics
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.view.ViewTreeObserver
|
import android.view.ViewTreeObserver
|
||||||
|
import android.widget.ImageView
|
||||||
import androidx.annotation.RequiresApi
|
import androidx.annotation.RequiresApi
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
import androidx.lifecycle.Observer
|
import androidx.lifecycle.Observer
|
||||||
import androidx.lifecycle.lifecycleScope
|
import androidx.lifecycle.lifecycleScope
|
||||||
import com.arcsoft.face.ErrorInfo
|
import com.arcsoft.face.ErrorInfo
|
||||||
|
import com.bumptech.glide.Glide
|
||||||
import com.google.gson.Gson
|
import com.google.gson.Gson
|
||||||
import com.sw.inbound.utils.DateTimeUtils
|
import com.sw.inbound.utils.DateTimeUtils
|
||||||
import com.sw.plate.utils.Base64
|
import com.sw.plate.utils.Base64
|
||||||
@@ -358,6 +360,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
|||||||
visible()
|
visible()
|
||||||
text = "新用户采集"
|
text = "新用户采集"
|
||||||
}
|
}
|
||||||
|
binding.ivCollectPhoto.visible()
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -512,7 +515,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
|||||||
val layoutParams = adjustPreviewViewSize(
|
val layoutParams = adjustPreviewViewSize(
|
||||||
binding.dualCameraTexturePreviewRgb,
|
binding.dualCameraTexturePreviewRgb,
|
||||||
binding.dualCameraTexturePreviewRgb, binding.dualCameraFaceRectView,
|
binding.dualCameraTexturePreviewRgb, binding.dualCameraFaceRectView,
|
||||||
previewSizeRgb, displayOrientation, 0.6f
|
previewSizeRgb, displayOrientation, 0.7f
|
||||||
|
//0.6f
|
||||||
)
|
)
|
||||||
loadLogInfo("initRgbCamera previewSizeRgb = ${previewSizeRgb.width}-${previewSizeRgb.height}")
|
loadLogInfo("initRgbCamera previewSizeRgb = ${previewSizeRgb.width}-${previewSizeRgb.height}")
|
||||||
loadLogInfo("initRgbCamera layoutParams = ${layoutParams.width}-${layoutParams.height}")
|
loadLogInfo("initRgbCamera layoutParams = ${layoutParams.width}-${layoutParams.height}")
|
||||||
@@ -700,6 +704,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
|||||||
* 重置识别状态
|
* 重置识别状态
|
||||||
*/
|
*/
|
||||||
private fun resetRecognizeState() {
|
private fun resetRecognizeState() {
|
||||||
|
binding.ivCollectPhoto.gone()
|
||||||
|
binding.ivCollectPhoto.setImageDrawable(null)
|
||||||
binding.tvToInit.text = "15"
|
binding.tvToInit.text = "15"
|
||||||
binding.llCollectButton.gone()
|
binding.llCollectButton.gone()
|
||||||
retryFailCount = 0
|
retryFailCount = 0
|
||||||
@@ -818,7 +824,11 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
|||||||
return@addUserFace
|
return@addUserFace
|
||||||
}
|
}
|
||||||
Thread {
|
Thread {
|
||||||
saveFaceInfo(faceModel)
|
saveFaceInfo(faceModel) {
|
||||||
|
runOnUiThread {
|
||||||
|
Glide.with(this@LoginByFaceActivity).load(imageFile).into(binding.ivCollectPhoto)
|
||||||
|
}
|
||||||
|
}
|
||||||
uploadFaceDebouncer.reset()
|
uploadFaceDebouncer.reset()
|
||||||
}.start()
|
}.start()
|
||||||
}
|
}
|
||||||
@@ -856,7 +866,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
|||||||
|
|
||||||
private var currentUserId: String? = null
|
private var currentUserId: String? = null
|
||||||
|
|
||||||
private fun saveFaceInfo(faceModel: UserFaceModel) {
|
private fun saveFaceInfo(faceModel: UserFaceModel, block:()-> Unit= {}) {
|
||||||
try {
|
try {
|
||||||
loadLogInfo("collectFace,saveFaceInfo: ----------8,保存人脸取特征数据-----------")
|
loadLogInfo("collectFace,saveFaceInfo: ----------8,保存人脸取特征数据-----------")
|
||||||
val faceDao = FaceDatabase.getInstance(this).faceDao()
|
val faceDao = FaceDatabase.getInstance(this).faceDao()
|
||||||
@@ -875,6 +885,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
|
|||||||
runOnUiThread { recognizeViewModel.onPreviewFrame(emptyFrame, true) }
|
runOnUiThread { recognizeViewModel.onPreviewFrame(emptyFrame, true) }
|
||||||
loadLogInfo("---------------------------------")
|
loadLogInfo("---------------------------------")
|
||||||
collectCount = 0
|
collectCount = 0
|
||||||
|
block()
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
e.printStackTrace()
|
e.printStackTrace()
|
||||||
loadLogInfo("collectFace,saveFaceInfo: ----------13,人脸采集异常:${e.message}-----------")
|
loadLogInfo("collectFace,saveFaceInfo: ----------13,人脸采集异常:${e.message}-----------")
|
||||||
|
|||||||
@@ -213,6 +213,14 @@
|
|||||||
<!-- android:src="@drawable/ic_log_show"-->
|
<!-- android:src="@drawable/ic_log_show"-->
|
||||||
<!-- android:textSize="16sp" />-->
|
<!-- android:textSize="16sp" />-->
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/ivCollectPhoto"
|
||||||
|
android:layout_width="200dp"
|
||||||
|
android:layout_height="200dp"
|
||||||
|
android:adjustViewBounds="true"
|
||||||
|
android:layout_gravity="top|start"
|
||||||
|
android:visibility="gone"/>
|
||||||
|
|
||||||
</FrameLayout>
|
</FrameLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@@ -62,6 +62,6 @@ dependencies {
|
|||||||
implementation("com.google.code.gson:gson:2.8.6")
|
implementation("com.google.code.gson:gson:2.8.6")
|
||||||
|
|
||||||
val glideVersion = "4.12.0"
|
val glideVersion = "4.12.0"
|
||||||
implementation("com.github.bumptech.glide:glide:$glideVersion")
|
api("com.github.bumptech.glide:glide:$glideVersion")
|
||||||
annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")
|
annotationProcessor("com.github.bumptech.glide:compiler:$glideVersion")
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user