maxinyu/SecurityDefenseDevice
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

人脸识别优化

Browse Source
This commit is contained in:
maxinyu
2026-06-01 11:38:32 +08:00
parent 5cda6d959e
commit c4fd35bfe4
6 changed files with 91 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt
View File

@@ -216,7 +216,7 @@ class AlarmLogActivity : AppCompatActivity() {
val response = RetrofitNetwork.getNetworkService().getDeviceAlarmList( val response = RetrofitNetwork.getNetworkService().getDeviceAlarmList(
deviceId = currentDeviceId, deviceId = currentDeviceId,
pageNum = "1", pageNum = "1",
pageSize = "100" pageSize = "10"
) )
Log.d("AlarmLogActivity", "请求完成") Log.d("AlarmLogActivity", "请求完成")

3
app/src/main/java/com/example/defenseapplication/login/FaceLoginActivity.kt
View File

@@ -35,9 +35,6 @@ class FaceLoginActivity : AppCompatActivity() {
binding.btnStartVerification.setOnClickListener { binding.btnStartVerification.setOnClickListener {
val intent= Intent(this, FaceVerificationActivity::class.java) val intent= Intent(this, FaceVerificationActivity::class.java)
startActivity(intent) startActivity(intent)
Toast.makeText(this, R.string.redirect_face_recognition_page, Toast.LENGTH_SHORT).show()
} }
} }
} }

9
app/src/main/java/com/example/defenseapplication/personal/FaceManagementActivity.kt
View File

@@ -2,14 +2,9 @@ package com.example.defenseapplication.personal
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import androidx.activity.enableEdgeToEdge
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat
import com.example.defenseapplication.R
import com.example.defenseapplication.databinding.FaceManagementActivityBinding import com.example.defenseapplication.databinding.FaceManagementActivityBinding
import com.example.defenseapplication.databinding.LoginPasswordActivityBinding import com.example.defenseapplication.login.FaceLoginActivity
import com.example.defenseapplication.login.FaceVerificationActivity
import com.gyf.immersionbar.ImmersionBar import com.gyf.immersionbar.ImmersionBar
//人脸管理页面 //人脸管理页面
@@ -29,7 +24,7 @@ class FaceManagementActivity : AppCompatActivity() {
finish() finish()
} }
binding.faceManagement.setOnClickListener { binding.faceManagement.setOnClickListener {
startActivity(Intent(this, FaceVerificationActivity::class.java)) startActivity(Intent(this, FaceLoginActivity::class.java))
} }
} }
} }

93
app/src/main/java/com/example/defenseapplication/view/FaceOverlayView.kt
View File

@@ -1,64 +1,81 @@
package com.example.defenseapplication.view package com.example.defenseapplication.view
import android.content.Context import android.content.Context
import android.graphics.Canvas import android.graphics.*
import android.graphics.Color
import android.graphics.Paint
import android.graphics.Path
import android.graphics.RectF
import android.util.AttributeSet import android.util.AttributeSet
import android.view.View import android.view.View
import com.google.mlkit.vision.face.Face import com.google.mlkit.vision.face.Face
class FaceOverlayView(context: Context, attrs: AttributeSet?) : View(context, attrs) { class FaceOverlayView @JvmOverloads constructor(
private val framePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0
) : View(context, attrs, defStyleAttr) {
private val whitePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = Color.WHITE color = Color.WHITE
style = Paint.Style.STROKE
strokeWidth = 6f
}
private val maskPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = Color.parseColor("#7A000000")
style = Paint.Style.FILL style = Paint.Style.FILL
} }
private val facePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply { private val clearPaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = Color.parseColor("#80FFFFFF") xfermode = PorterDuffXfermode(PorterDuff.Mode.CLEAR)
style = Paint.Style.STROKE
strokeWidth = 3f
} }
private val maskPath = Path() private val circlePath = Path()
private val frameRect = RectF() private var centerX = 0f
private var faces = mutableListOf<Face>() private var centerY = 0f
private var radius = 0f
fun setFaces(faces: List<Face>) { // 需要绘制的所有人脸边界框（初始为空）
this.faces = faces.toMutableList() private var faces: List<Face> = emptyList()
invalidate() // 触发 onDraw
// 绘制人脸框的画笔
private val facePaint = Paint(Paint.ANTI_ALIAS_FLAG).apply {
color = Color.GREEN
style = Paint.Style.STROKE
strokeWidth = 6f
}
override fun onSizeChanged(w: Int, h: Int, oldW: Int, oldH: Int) {
super.onSizeChanged(w, h, oldW, oldH)
// 计算圆形区域（取屏幕中心，半径为宽高中较小值的一半，留一些边距）
centerX = w / 2f
centerY = h / 2f
radius = minOf(w, h) / 2f * 0.8f
circlePath.reset()
circlePath.addCircle(centerX, centerY, radius, Path.Direction.CW)
} }
override fun onDraw(canvas: Canvas) { override fun onDraw(canvas: Canvas) {
super.onDraw(canvas) super.onDraw(canvas)
val cx = width / 2f // 1. 绘制白色背景
val cy = height * 0.45f canvas.drawColor(Color.WHITE)
val radius = minOf(width, height) * 0.31f
maskPath.reset() // 2. 裁剪出圆形区域并清除该区域像素（露出下层摄像头预览）
maskPath.addRect(0f, 0f, width.toFloat(), height.toFloat(), Path.Direction.CW) canvas.save()
maskPath.addCircle(cx, cy, radius, Path.Direction.CCW) canvas.clipPath(circlePath)
canvas.drawPath(maskPath, maskPaint) canvas.drawPaint(clearPaint)
canvas.drawCircle(cx, cy, radius, framePaint)
frameRect.set(cx - radius, cy - radius, cx + radius, cy + radius) // 3. 在圆形区域内绘制人脸框（坐标需要转换）
for (face in faces) { for (face in faces) {
val rect = face.boundingBox val rect = face.boundingBox
val clippedLeft = rect.left.coerceAtLeast(frameRect.left.toInt()).toFloat() // 注意：rect 的坐标是基于 ImageProxy 中图像的原始尺寸和旋转的，
val clippedTop = rect.top.coerceAtLeast(frameRect.top.toInt()).toFloat() // 需要转换为当前 View 的坐标系。简单示例：直接绘制原始矩形（可能位置偏移较大）
val clippedRight = rect.right.coerceAtMost(frameRect.right.toInt()).toFloat() // 更精确的做法：传入图像宽高和旋转，用 Matrix 映射。
val clippedBottom = rect.bottom.coerceAtMost(frameRect.bottom.toInt()).toFloat() // 这里提供一个基本转换示例（假设预览视图已填充全屏，且无缩放裁剪）：
if (clippedRight > clippedLeft && clippedBottom > clippedTop) { canvas.drawRect(rect.left.toFloat(), rect.top.toFloat(),
canvas.drawRect(clippedLeft, clippedTop, clippedRight, clippedBottom, facePaint) rect.right.toFloat(), rect.bottom.toFloat(), facePaint)
}
} }
canvas.restore()
}
/**
* 由 FaceAnalyzer 调用，设置最新检测到的人脸列表
*/
fun setFaces(faces: List<Face>) {
this.faces = faces
invalidate() // 触发重绘
} }
} }

34
app/src/main/res/layout/face_login_activity.xml
View File

@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:background="@color/login_background" android:background="@color/login_background"
android:id="@+id/main" android:id="@+id/main"
android:padding="16dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".login.FaceLoginActivity"> tools:context=".login.FaceLoginActivity">
@@ -12,12 +11,12 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topContainer" android:id="@+id/topContainer"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="56dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:paddingStart="16dp" android:layout_marginStart="16dp"
android:paddingEnd="16dp"> android:layout_marginRight="16dp">
<ImageView <ImageView
android:id="@+id/backIcon" android:id="@+id/backIcon"
android:layout_width="24dp" android:layout_width="24dp"
@@ -44,6 +43,7 @@
<!-- 副标题：注册用户 --> <!-- 副标题：注册用户 -->
<TextView <TextView
android:layout_marginStart="16dp"
android:id="@+id/tvRegisterSubtitle" android:id="@+id/tvRegisterSubtitle"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="20dp" android:textSize="20dp"
android:textStyle="bold" android:textStyle="bold"
android:layout_marginTop="8dp" android:layout_marginTop="25dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/topContainer" /> app:layout_constraintTop_toBottomOf="@id/topContainer" />
@@ -63,6 +63,7 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvRegisterSubtitle" app:layout_constraintTop_toBottomOf="@id/tvRegisterSubtitle"
android:layout_marginTop="10dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:paddingEnd="16dp"> android:paddingEnd="16dp">
<ImageView <ImageView
@@ -82,16 +83,16 @@
android:textColor="@color/green" android:textColor="@color/green"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/safeIcon" android:layout_marginStart="5dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@id/safeIcon"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@id/safeIcon"
app:layout_constraintTop_toTopOf="@id/safeIcon" /> app:layout_constraintBottom_toBottomOf="@id/safeIcon" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<!-- 人脸图标占位符（模拟人脸识别形象） --> <!-- 人脸图标占位符（模拟人脸识别形象） -->
<ImageView <ImageView
android:paddingTop="50dp" android:layout_marginTop="50dp"
android:id="@+id/cardFaceIcon" android:id="@+id/cardFaceIcon"
android:layout_width="150dp" android:layout_width="150dp"
android:layout_height="150dp" android:layout_height="150dp"
@@ -114,22 +115,23 @@
app:layout_constraintTop_toBottomOf="@id/cardFaceIcon" /> app:layout_constraintTop_toBottomOf="@id/cardFaceIcon" />
<LinearLayout <LinearLayout
android:layout_marginStart="30dp"
android:layout_marginEnd="30dp"
android:layout_marginTop="48dp"
android:orientation="horizontal" android:orientation="horizontal"
android:id="@+id/cbLowLight" android:id="@+id/cbLowLight"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvInstruction" app:layout_constraintTop_toBottomOf="@id/tvInstruction">
android:paddingStart="16dp"
android:paddingTop="48dp"
android:paddingEnd="16dp">
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_gravity="center"
android:background="@drawable/face_login_gray_bg" android:background="@drawable/face_login_gray_bg"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -166,6 +168,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_gravity="center"
android:background="@drawable/face_login_gray_bg" android:background="@drawable/face_login_gray_bg"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -202,6 +205,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_gravity="center"
android:background="@drawable/face_login_gray_bg" android:background="@drawable/face_login_gray_bg"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -238,6 +242,7 @@
android:layout_weight="1" android:layout_weight="1"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<LinearLayout <LinearLayout
android:layout_gravity="center"
android:background="@drawable/face_login_gray_bg" android:background="@drawable/face_login_gray_bg"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -276,7 +281,6 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="25dp" android:layout_marginStart="25dp"
android:layout_marginEnd="25dp" android:layout_marginEnd="25dp"
android:text="@string/start_verification" android:text="@string/start_verification"

27
app/src/main/res/layout/face_verification_activity.xml
View File

@@ -5,35 +5,39 @@
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@android:color/black"
tools:context=".login.FaceVerificationActivity"> tools:context=".login.FaceVerificationActivity">
<androidx.camera.view.PreviewView <androidx.camera.view.PreviewView
android:id="@+id/previewView" android:id="@+id/previewView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent"
android:background="@android:color/black" />
<com.example.defenseapplication.view.FaceOverlayView <com.example.defenseapplication.view.FaceOverlayView
android:id="@+id/overlay" android:id="@+id/overlay"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="match_parent" /> android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/topContainer" android:id="@+id/topContainer"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="56dp"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent"
android:layout_marginStart="16dp"
android:layout_marginRight="16dp">
<ImageView <ImageView
android:id="@+id/backIcon" android:id="@+id/backIcon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/ic_back_arrow" android:src="@drawable/back"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -43,7 +47,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/face_collection" android:text="@string/face_collection"
android:textColor="@android:color/white"
android:textSize="22sp" android:textSize="22sp"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/backIcon" app:layout_constraintBottom_toBottomOf="@id/backIcon"
@@ -77,7 +80,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/face_in_circle" android:text="@string/face_in_circle"
android:textColor="@android:color/white"
android:textSize="20sp" android:textSize="20sp"
android:textStyle="bold" android:textStyle="bold"
android:letterSpacing="0.03" /> android:letterSpacing="0.03" />
@@ -92,7 +94,6 @@
android:paddingHorizontal="24dp" android:paddingHorizontal="24dp"
android:paddingTop="20dp" android:paddingTop="20dp"
android:paddingBottom="28dp" android:paddingBottom="28dp"
android:background="@drawable/bg_bottom_gradient"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"> app:layout_constraintStart_toStartOf="parent">