Cleared warnings

This commit is contained in:
Gabriel Low
2026-09-09 22:48:06 +08:00
parent 981071ef74
commit 7cf217488a
22 changed files with 126 additions and 140 deletions
@@ -40,6 +40,7 @@ import java.text.SimpleDateFormat
import java.util.Locale
import com.google.mlkit.vision.pose.PoseLandmark // for testing
import java.util.concurrent.Executor
/**
* @brief Owns all CameraX use-case binding and recording control.
@@ -55,7 +56,7 @@ import com.google.mlkit.vision.pose.PoseLandmark // for testing
*/
class CameraXController(
private val appContext: Context,
private val cameraExecutor: java.util.concurrent.Executor
private val cameraExecutor: Executor,
) {
/** @brief Callbacks through which [CameraXController] reports camera, recording, and pose-detection events. */
@@ -145,15 +146,16 @@ class CameraXController(
previewView: PreviewView,
callback: Callback,
lensFacing: Int = CameraSelector.LENS_FACING_BACK,
feedbackUi: FeedbackUI
feedbackUi: FeedbackUI,
) {
this.callback = callback
this.currentLensFacing = lensFacing
this.feedbackUI = feedbackUi
val providerFuture = ProcessCameraProvider.getInstance(appContext)
providerFuture.addListener({
try {
providerFuture.addListener(
{
try {
val provider = providerFuture.get()
cameraProvider = provider
@@ -186,7 +188,7 @@ class CameraXController(
callback.onPoseResult(result)
}
},
onError = { e -> callback.onPoseDetectorError(e.message ?: "Pose detector error") }
onError = { e -> callback.onPoseDetectorError(e.message ?: "Pose detector error") },
)
poseAnalyzer = analyzer
@@ -250,7 +252,7 @@ class CameraXController(
// result yet), this leaves the canvas fully transparent, so the
// recorded frame passes through untouched.
canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR)
if (poseDetectionEnabled && poseFrame != null) {
if ((poseDetectionEnabled && poseFrame != null)) {
val frameSize = frame.size
// Mirrors the same raw-buffer-dimensions-plus-rotation-degrees
// convention CameraX uses for ImageAnalysis/ImageProxy (see
@@ -284,8 +286,8 @@ class CameraXController(
} else {
emptyMap()
}
feedbackUI?.drawCircles(canvas, singleLandmark, transform, true)
feedbackUI?.showBanner(canvas, "Body too upright, take a larger 1st step", true)
feedbackUI?.drawCircles(canvas, singleLandmark, transform, forRecord = true)
feedbackUI?.showBanner(canvas, "Body too upright, take a larger 1st step", forRecord = true)
}
true
}