From 78dd252b78771b5550f0b7b22ff7e92d11d82951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sat, 16 Mar 2024 17:13:41 +0800 Subject: [PATCH] Improve qr scanner --- .../sfa/ui/profile/QRScanActivity.kt | 50 +++++++++++++++---- .../ui/profileoverride/PerAppProxyActivity.kt | 36 ++++++------- app/src/main/res/layout/sheet_add_profile.xml | 2 + app/src/main/res/menu/qr_scan_menu.xml | 16 +++++- app/src/main/res/values/strings.xml | 6 ++- .../java/io/nekohasekai/sfa/vendor/Vendor.kt | 1 - 6 files changed, 79 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/profile/QRScanActivity.kt b/app/src/main/java/io/nekohasekai/sfa/ui/profile/QRScanActivity.kt index 5907a93..dbb87af 100644 --- a/app/src/main/java/io/nekohasekai/sfa/ui/profile/QRScanActivity.kt +++ b/app/src/main/java/io/nekohasekai/sfa/ui/profile/QRScanActivity.kt @@ -10,6 +10,7 @@ import android.view.Menu import android.view.MenuItem import androidx.activity.result.contract.ActivityResultContract import androidx.activity.result.contract.ActivityResultContracts +import androidx.camera.core.Camera import androidx.camera.core.CameraSelector import androidx.camera.core.ImageAnalysis import androidx.camera.core.Preview @@ -69,6 +70,9 @@ class QRScanActivity : AbstractActivity() { } } private val vendorAnalyzer = Vendor.createQRCodeAnalyzer(onSuccess, onFailure) + private lateinit var cameraProvider: ProcessCameraProvider + private lateinit var cameraPreview: Preview + private lateinit var camera: Camera private fun startCamera() { val cameraProviderFuture = try { @@ -78,14 +82,14 @@ class QRScanActivity : AbstractActivity() { return } cameraProviderFuture.addListener({ - val cameraProvider = try { + cameraProvider = try { cameraProviderFuture.get() } catch (e: Exception) { fatalError(e) return@addListener } - val preview = Preview.Builder().build() + cameraPreview = Preview.Builder().build() .also { it.setSurfaceProvider(binding.previewView.surfaceProvider) } imageAnalysis = ImageAnalysis.Builder().build() imageAnalyzer = vendorAnalyzer ?: ZxingQRCodeAnalyzer(onSuccess, onFailure) @@ -93,8 +97,8 @@ class QRScanActivity : AbstractActivity() { cameraProvider.unbindAll() try { - cameraProvider.bindToLifecycle( - this, CameraSelector.DEFAULT_BACK_CAMERA, preview, imageAnalysis + camera = cameraProvider.bindToLifecycle( + this, CameraSelector.DEFAULT_BACK_CAMERA, cameraPreview, imageAnalysis ) } catch (e: Exception) { fatalError(e) @@ -134,20 +138,46 @@ class QRScanActivity : AbstractActivity() { } override fun onCreateOptionsMenu(menu: Menu): Boolean { - if (vendorAnalyzer == null) { - return false - } menuInflater.inflate(R.menu.qr_scan_menu, menu) + if (vendorAnalyzer == null) { + menu.findItem(R.id.action_use_vendor_analyzer).isEnabled = false + } else { + menu.findItem(R.id.action_use_vendor_analyzer).isChecked = true + } return true } override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.action_disable_vendor_analyzer -> { + R.id.action_use_front_camera -> { + item.isChecked = !item.isChecked + cameraProvider.unbindAll() + try { + camera = cameraProvider.bindToLifecycle( + this, + if (!item.isChecked) CameraSelector.DEFAULT_BACK_CAMERA else CameraSelector.DEFAULT_FRONT_CAMERA, + cameraPreview, + imageAnalysis + ) + } catch (e: Exception) { + fatalError(e) + } + } + + R.id.action_enable_torch -> { + item.isChecked = !item.isChecked + camera.cameraControl.enableTorch(item.isChecked) + } + + R.id.action_use_vendor_analyzer -> { + item.isChecked = !item.isChecked imageAnalysis.clearAnalyzer() - imageAnalyzer = ZxingQRCodeAnalyzer(onSuccess, onFailure) + imageAnalyzer = if (item.isChecked) { + vendorAnalyzer!! + } else { + ZxingQRCodeAnalyzer(onSuccess, onFailure) + } imageAnalysis.setAnalyzer(analysisExecutor, imageAnalyzer) - item.isVisible = false } else -> return super.onOptionsItemSelected(item) diff --git a/app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt b/app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt index 4e43052..b907e57 100644 --- a/app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt +++ b/app/src/main/java/io/nekohasekai/sfa/ui/profileoverride/PerAppProxyActivity.kt @@ -83,25 +83,27 @@ class PerAppProxyActivity : AbstractActivity() { setTitle(R.string.title_per_app_proxy) lifecycleScope.launch { - proxyMode = if (Settings.perAppProxyMode == Settings.PER_APP_PROXY_INCLUDE) { - Settings.PER_APP_PROXY_INCLUDE - } else { - Settings.PER_APP_PROXY_EXCLUDE - } - withContext(Dispatchers.Main) { - if (proxyMode == Settings.PER_APP_PROXY_INCLUDE) { - binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_include_description) + withContext(Dispatchers.IO) { + proxyMode = if (Settings.perAppProxyMode == Settings.PER_APP_PROXY_INCLUDE) { + Settings.PER_APP_PROXY_INCLUDE } else { - binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_exclude_description) + Settings.PER_APP_PROXY_EXCLUDE + } + withContext(Dispatchers.Main) { + if (proxyMode == Settings.PER_APP_PROXY_INCLUDE) { + binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_include_description) + } else { + binding.perAppProxyMode.setText(R.string.per_app_proxy_mode_exclude_description) + } + } + reloadApplicationList() + filterApplicationList() + withContext(Dispatchers.Main) { + adapter = ApplicationAdapter(displayPackages) + binding.appList.adapter = adapter + delay(500L) + binding.progress.isVisible = false } - } - reloadApplicationList() - filterApplicationList() - withContext(Dispatchers.Main) { - adapter = ApplicationAdapter(displayPackages) - binding.appList.adapter = adapter - delay(500L) - binding.progress.isVisible = false } } } diff --git a/app/src/main/res/layout/sheet_add_profile.xml b/app/src/main/res/layout/sheet_add_profile.xml index 2b71d33..84b38d5 100644 --- a/app/src/main/res/layout/sheet_add_profile.xml +++ b/app/src/main/res/layout/sheet_add_profile.xml @@ -34,6 +34,7 @@ @@ -58,6 +59,7 @@ diff --git a/app/src/main/res/menu/qr_scan_menu.xml b/app/src/main/res/menu/qr_scan_menu.xml index 97307c3..c8d3fe1 100644 --- a/app/src/main/res/menu/qr_scan_menu.xml +++ b/app/src/main/res/menu/qr_scan_menu.xml @@ -2,7 +2,19 @@ + android:checkable="true" + android:id="@+id/action_use_front_camera" + android:title="@string/profile_add_scan_use_front_camera" /> + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 574d851..e5e0324 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -42,7 +42,10 @@ Import Scan QR code - Import remote profile from clipboard + Front camera + MLKit analyzer + Torch + Create Manually Undo @@ -189,6 +192,5 @@ Open Settings Core - Disable Google MLKit \ No newline at end of file diff --git a/app/src/other/java/io/nekohasekai/sfa/vendor/Vendor.kt b/app/src/other/java/io/nekohasekai/sfa/vendor/Vendor.kt index d9e06b9..da86b2f 100644 --- a/app/src/other/java/io/nekohasekai/sfa/vendor/Vendor.kt +++ b/app/src/other/java/io/nekohasekai/sfa/vendor/Vendor.kt @@ -2,7 +2,6 @@ package io.nekohasekai.sfa.vendor import android.app.Activity import androidx.camera.core.ImageAnalysis -import java.lang.Exception object Vendor : VendorInterface {