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.

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

A stupid workaround to add continues scanning feature. #211

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,11 @@ import androidx.core.view.ViewCompat
import androidx.core.view.WindowCompat
import androidx.core.view.WindowInsetsCompat
import com.google.mlkit.vision.barcode.common.Barcode
import io.github.g00fy2.quickie.config.ContinuesScanning
import io.github.g00fy2.quickie.config.ParcelableScannerConfig
import io.github.g00fy2.quickie.databinding.QuickieScannerActivityBinding
import io.github.g00fy2.quickie.extensions.toParcelableContentType
import io.github.g00fy2.quickie.extensions.toQuickieContentType
import io.github.g00fy2.quickie.utils.MlKitErrorHandler
import java.util.concurrent.ExecutorService
import java.util.concurrent.Executors
Expand All @@ -43,6 +45,7 @@ internal class QRScannerActivity : AppCompatActivity() {
private var showTorchToggle = false
private var showCloseButton = false
private var useFrontCamera = false
private var continuousScanning: ContinuesScanning? = null
internal var errorDialog: Dialog? = null
set(value) {
field = value
Expand Down Expand Up @@ -119,8 +122,19 @@ internal class QRScannerActivity : AppCompatActivity() {
QRCodeAnalyzer(
barcodeFormats = barcodeFormats,
onSuccess = { barcode ->
it.clearAnalyzer()
onSuccess(barcode)
if (continuousScanning!=null){
if (continuousScanning?.processResult(
QRResult.QRSuccess(Intent().apply {
putExtra(EXTRA_RESULT_BYTES, barcode.rawBytes)
putExtra(EXTRA_RESULT_VALUE, barcode.rawValue)
putExtra(EXTRA_RESULT_TYPE, barcode.valueType)
putExtra(EXTRA_RESULT_PARCELABLE, barcode.toParcelableContentType())
}.toQuickieContentType()))==true)
onSuccess(barcode)
}else{
it.clearAnalyzer()
onSuccess(barcode)
}
},
onFailure = { exception -> onFailure(exception) },
onPassCompleted = { failureOccurred -> onPassCompleted(failureOccurred) }
Expand Down Expand Up @@ -166,7 +180,7 @@ internal class QRScannerActivity : AppCompatActivity() {
putExtra(EXTRA_RESULT_PARCELABLE, result.toParcelableContentType())
}
)
finish()
if (continuousScanning == null) finish()
}

private fun onFailure(exception: Exception) {
Expand All @@ -189,6 +203,10 @@ internal class QRScannerActivity : AppCompatActivity() {
private fun applyScannerConfig() {
intent?.let { IntentCompat.getParcelableExtra(it, EXTRA_CONFIG, ParcelableScannerConfig::class.java) }?.let {
barcodeFormats = it.formats
if (it.continuousScanningId != -1) {
continuousScanning = ParcelableScannerConfig.continuousScanning[it.continuousScanningId]
ParcelableScannerConfig.continuousScanning.remove(it.continuousScanningId)
}
binding.overlayView.setCustomText(it.stringRes)
binding.overlayView.setCustomIcon(it.drawableRes)
binding.overlayView.setHorizontalFrameRatio(it.horizontalFrameRatio)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package io.github.g00fy2.quickie.config

import io.github.g00fy2.quickie.QRResult

data class ContinuesScanning(val onSuccess :(QRResult.QRSuccess)->Unit, val cooldown: Int) {
private var lastSuccess: Long = cooldown.toLong()
fun updateCooldown() {
lastSuccess = System.currentTimeMillis()
}
fun processResult(result :QRResult.QRSuccess):Boolean {
if (isInCooldown()) return false
updateCooldown()
onSuccess(result)
return true
}
fun isInCooldown(): Boolean {
return System.currentTimeMillis() - lastSuccess < cooldown
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,9 @@ internal class ParcelableScannerConfig(
val useFrontCamera: Boolean,
val showCloseButton: Boolean,
val keepScreenOn: Boolean,
) : Parcelable
val continuousScanningId: Int
): Parcelable {
companion object {
val continuousScanning = mutableMapOf<Int,ContinuesScanning>()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public class ScannerConfig internal constructor(
internal val useFrontCamera: Boolean,
internal val showCloseButton: Boolean,
internal val keepScreenOn: Boolean,
internal val continuousScanning: ContinuesScanning?,
) {

public class Builder {
Expand All @@ -29,6 +30,7 @@ public class ScannerConfig internal constructor(
private var useFrontCamera: Boolean = false
private var showCloseButton: Boolean = false
private var keepScreenOn: Boolean = false
private var continuousScanning: ContinuesScanning ? =null

/**
* Set a list of interested barcode formats. List must not be empty.
Expand Down Expand Up @@ -78,6 +80,12 @@ public class ScannerConfig internal constructor(
*/
public fun setKeepScreenOn(enable: Boolean): Builder = apply { keepScreenOn = enable }

/**
* Set the continuous scan mode.
* `null` to disable continuous scan mode.
*/
public fun setContinuesMode(continuesScanning: ContinuesScanning?): Builder = apply { continuousScanning = continuesScanning }

/**
* Build the BarcodeConfig required by the ScanBarcode ActivityResultContract.
*/
Expand All @@ -92,6 +100,7 @@ public class ScannerConfig internal constructor(
useFrontCamera = useFrontCamera,
showCloseButton = showCloseButton,
keepScreenOn = keepScreenOn,
continuousScanning = continuousScanning
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ package io.github.g00fy2.quickie.extensions
import io.github.g00fy2.quickie.config.ParcelableScannerConfig
import io.github.g00fy2.quickie.config.ScannerConfig

internal fun ScannerConfig.toParcelableConfig() =
ParcelableScannerConfig(
internal fun ScannerConfig.toParcelableConfig(): ParcelableScannerConfig {
var continuesScanningId = -1
if (continuousScanning != null) {
continuesScanningId = ParcelableScannerConfig.continuousScanning.size
ParcelableScannerConfig.continuousScanning[continuesScanningId] = this.continuousScanning
}
return ParcelableScannerConfig(
formats = formats,
stringRes = stringRes,
drawableRes = drawableRes,
Expand All @@ -14,4 +19,6 @@ internal fun ScannerConfig.toParcelableConfig() =
useFrontCamera = useFrontCamera,
showCloseButton = showCloseButton,
keepScreenOn = keepScreenOn,
)
continuesScanningId
)
}