Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸ”€ :: (#318) - improve bar code recognition performance #319

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

πŸ”€ :: (#318) - improve bar code recognition performance #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11028bd
:sparkles: :: Add scan stop logic after scanning qrcode
minStone-dev Oct 10, 2024
fbe2509
:sparkles: :: Qrcode scanner logic refactoring
minStone-dev Oct 10, 2024
ad1642f
Merge remote-tracking branch 'origin/develop' into develop
minStone-dev Oct 12, 2024
03f55b6
:sparkles: :: Change mediaImage type
minStone-dev Nov 1, 2024
b208ef8
:fire: :: Delete log
minStone-dev Nov 1, 2024
0ca0789
:fire: :: Delete null check
minStone-dev Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions feature/qrcode/src/main/java/com/goms/qrcode/QrcodeScanScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.goms.qrcode

import android.Manifest
import android.content.pm.ActivityInfo
import android.util.Log
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
Expand Down Expand Up @@ -181,6 +182,7 @@ private fun QrcodeScanScreen(
if (outingUiState !is OutingUiState.Error) onSuccess()
}
)
Log.d("qrcode","dialog")
}
TrackScreenViewEvent(screenName = stringResource(id = R.string.qrcode_scan_screen))
}
Expand Down
16 changes: 10 additions & 6 deletions feature/qrcode/src/main/java/com/goms/qrcode/component/QrcodeScanPreview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,16 @@ internal fun QrcodeScanPreview(
)
.build()
.also {
it.setAnalyzer(cameraExecutor, QrcodeScanner { qrcodeData ->
if (isScanningEnabled) {
onQrcodeScan(qrcodeData)
isScanningEnabled = false
}
})
it.setAnalyzer(cameraExecutor, QrcodeScanner(
qrcodeData = { qrcodeData ->
Log.d("qrcode","lun")
if (isScanningEnabled) {
isScanningEnabled = false
onQrcodeScan(qrcodeData)
}
},
isScanningEnabled = { isScanningEnabled }
))
}

val cameraSelector = CameraSelector.DEFAULT_BACK_CAMERA
Expand Down
21 changes: 13 additions & 8 deletions feature/qrcode/src/main/java/com/goms/qrcode/util/QrcodeScanner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import androidx.camera.core.ImageAnalysis
import androidx.camera.core.ImageProxy
import com.google.mlkit.vision.barcode.BarcodeScannerOptions
import com.google.mlkit.vision.barcode.BarcodeScanning
import com.google.mlkit.vision.barcode.ZoomSuggestionOptions
import com.google.mlkit.vision.barcode.common.Barcode
import com.google.mlkit.vision.common.InputImage

class QrcodeScanner(
val qrcodeData: (String?) -> Unit
val qrcodeData: (String?) -> Unit,
val isScanningEnabled: () -> Boolean
) : ImageAnalysis.Analyzer {

private val scanner = BarcodeScanning.getClient(
Expand All @@ -19,18 +21,21 @@ class QrcodeScanner(
)
@androidx.annotation.OptIn(androidx.camera.core.ExperimentalGetImage::class)
override fun analyze(imageProxy: ImageProxy) {
val mediaImage = imageProxy.image
if (!isScanningEnabled()) {
imageProxy.close()
return
}

val mediaImage = imageProxy.toBitmap()
mediaImage?.let {
val image = InputImage.fromMediaImage(mediaImage, imageProxy.imageInfo.rotationDegrees)
val image = InputImage.fromBitmap(mediaImage, imageProxy.imageInfo.rotationDegrees)

scanner.process(image)
.addOnSuccessListener { barcodes ->
val qrCodeValues = mutableListOf<String>()
for (barcode in barcodes) {
barcode.displayValue?.let { qrCodeValues.add(it) }
}
if (qrCodeValues.isNotEmpty()) {
qrcodeData(qrCodeValues.joinToString(", "))
barcode.displayValue?.let {
qrcodeData(it)
}
}
}
.addOnFailureListener {
Expand Down
Loading