feat(assists-web): 添加二维码扫描功能并优化应用性能

ven-coder · ven-coder · commit 715efff6e01a · 2025-07-07T22:37:38.000+08:00
- 在 AndroidManifest.xml 中启用硬件加速以提升应用性能
- 在 App.kt 中设置全局步骤默认间隔时长为 1000 毫秒
- 新增 scanQR 方法以支持二维码扫描功能
- 更新 CustomFileProvider.kt 以支持 ActivityResult API
- 在 README.md 中添加示例代码，展示如何使用新功能
diff --git a/README.md b/README.md
@@ -172,7 +172,7 @@ class MyStepImpl:StepImpl() {
             //步骤1逻辑
 	    ...
             //返回下一步需要执行的序号，通过Step.get([序号])，如果需要重复该步骤可返回Step.repeat，如果返回Step.none则不执行任何步骤，相当于停止
-            return@next Step.get(2) //将会执行步骤2逻辑
+            return@next Step.get(2, delay = 1000) //将会执行步骤2逻辑
         }.next(2) {
             //步骤2逻辑
 	    ...
diff --git a/assists-web/build.gradle b/assists-web/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     implementation "com.google.code.gson:gson:2.11.0"
     implementation project(':assists')
     implementation project(':assists-mp')
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
 }
 task sourcesJar(type: Jar) {
     archiveClassifier.set('sources')
@@ -48,7 +49,7 @@ afterEvaluate {
                 from components.release
                 groupId = 'com.github.ven-coder'
                 artifactId = 'assists-web'
-                version = '0.0.21-SNAPSHOT'
+                version = '0.0.22-SNAPSHOT'
                 artifact sourcesJar
             }
         }
diff --git a/assists-web/src/main/AndroidManifest.xml b/assists-web/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.ven.assists_web">
 
-    <application>
+    <application android:hardwareAccelerated="true">
         <provider
             android:name="com.ven.assists.web.CustomFileProvider"
             android:authorities="${applicationId}.assistsweb.fileprovider"
diff --git a/assists-web/src/main/java/com/ven/assists/web/ASJavascriptInterface.kt b/assists-web/src/main/java/com/ven/assists/web/ASJavascriptInterface.kt
@@ -12,6 +12,7 @@ import com.blankj.utilcode.util.ScreenUtils
 import com.google.gson.JsonArray
 import com.google.gson.JsonObject
 import com.google.gson.reflect.TypeToken
+import com.journeyapps.barcodescanner.ScanOptions
 import com.ven.assists.AssistsCore
 import com.ven.assists.AssistsCore.click
 import com.ven.assists.AssistsCore.containsText
@@ -33,17 +34,18 @@ import com.ven.assists.AssistsCore.scrollForward
 import com.ven.assists.AssistsCore.selectionText
 import com.ven.assists.AssistsCore.setNodeText
 import com.ven.assists.AssistsCore.takeScreenshot
+import com.ven.assists.mp.MPManager
+import com.ven.assists.mp.MPManager.getBitmap
 import com.ven.assists.utils.CoroutineWrapper
 import com.ven.assists.window.AssistsWindowManager
 import com.ven.assists.window.AssistsWindowManager.overlayToast
-import com.ven.assists.mp.MPManager
-import com.ven.assists.mp.MPManager.getBitmap
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import java.io.ByteArrayOutputStream
 
+
 class ASJavascriptInterface(val webView: WebView) {
     private val coroutineScope = CoroutineScope(Dispatchers.Main)
 
@@ -64,6 +66,19 @@ class ASJavascriptInterface(val webView: WebView) {
         runCatching {
             val request = GsonUtils.fromJson<CallRequest<JsonObject>>(json, object : TypeToken<CallRequest<JsonObject>>() {}.type)
             when (request.method) {
+                CallMethod.scanQR -> {
+                    CoroutineWrapper.launch {
+                        val scanIntentResult = CustomFileProvider.requestLaunchersScan(ScanOptions())
+                        callback(CallResponse<JsonObject>(code = 0, data = JsonObject().apply {
+                            addProperty("value", scanIntentResult?.contents ?: "")
+                        }, callbackId = request.callbackId))
+                    }
+
+                    result = GsonUtils.toJson(CallResponse<JsonObject>(code = 0, data = JsonObject().apply {
+                        addProperty("resultType", "callback")
+                    }))
+                }
+
                 CallMethod.setOverlayFlags -> {
                     request.arguments?.apply {
                         val flagList = arrayListOf<Int>()
diff --git a/assists-web/src/main/java/com/ven/assists/web/CallMethod.kt b/assists-web/src/main/java/com/ven/assists/web/CallMethod.kt
@@ -37,4 +37,5 @@ object CallMethod {
     const val nodeGestureClickByDouble="nodeGestureClickByDouble"
     const val takeScreenshot="takeScreenshot"
     const val setOverlayFlags="setOverlayFlags"
+    const val scanQR="scanQR"
 }
diff --git a/assists-web/src/main/java/com/ven/assists/web/CustomFileProvider.kt b/assists-web/src/main/java/com/ven/assists/web/CustomFileProvider.kt
@@ -1,11 +1,26 @@
 package com.ven.assists.web
 
+import android.app.Activity
 import android.app.Application
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.FileProvider
+import com.blankj.utilcode.util.ActivityUtils
+import com.journeyapps.barcodescanner.ScanContract
+import com.journeyapps.barcodescanner.ScanIntentResult
+import com.journeyapps.barcodescanner.ScanOptions
+import com.ven.assists.mp.MPManager
 import com.ven.assists.utils.CoroutineWrapper
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.delay
 
 class CustomFileProvider : FileProvider() {
+
+
     override fun onCreate(): Boolean {
         val applicationContext = context?.applicationContext
         if (applicationContext is Application) {
@@ -29,7 +44,80 @@ class CustomFileProvider : FileProvider() {
                     delay(1000)
                 }
             }
+
+            applicationContext.unregisterActivityLifecycleCallbacks(activityLifecycleCallbacks)
+            applicationContext.registerActivityLifecycleCallbacks(activityLifecycleCallbacks)
         }
         return super.onCreate()
     }
+
+    private val activityLifecycleCallbacks = object : Application.ActivityLifecycleCallbacks {
+        override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
+            if (activity is ComponentActivity && requestLaunchers[activity] == null) {
+                requestLaunchers[activity] = activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
+                    currentCompletableDeferred?.complete(result)
+                }
+            }
+            if (activity is ComponentActivity && requestLaunchersScan[activity] == null) {
+                requestLaunchersScan[activity] = activity.registerForActivityResult(ScanContract()) { result ->
+                    currentCompletableDeferredScan?.complete(result)
+                }
+            }
+        }
+
+        override fun onActivityStarted(activity: Activity) {
+        }
+
+        override fun onActivityResumed(activity: Activity) {
+        }
+
+        override fun onActivityPaused(activity: Activity) {
+        }
+
+        override fun onActivityStopped(activity: Activity) {
+        }
+
+        override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
+        }
+
+        override fun onActivityDestroyed(activity: Activity) {
+            requestLaunchers.remove(activity)
+            requestLaunchersScan.remove(activity)
+        }
+    }
+
+    companion object {
+        private val requestLaunchers = hashMapOf<Activity, ActivityResultLauncher<Intent>>()
+        private var currentCompletableDeferred: CompletableDeferred<ActivityResult>? = null
+        private val requestLaunchersScan = hashMapOf<Activity, ActivityResultLauncher<ScanOptions>>()
+        private var currentCompletableDeferredScan: CompletableDeferred<ScanIntentResult>? = null
+
+        suspend fun requestLaunchers(intent: Intent): ActivityResult? {
+            val result = runCatching {
+                currentCompletableDeferred?.completeExceptionally(RuntimeException("reset"))
+                currentCompletableDeferred = null
+                currentCompletableDeferred = CompletableDeferred<ActivityResult>()
+                ActivityUtils.getTopActivity()?.let {
+                    requestLaunchers[it]?.launch(intent)
+                } ?: return@runCatching null
+                return@runCatching currentCompletableDeferred?.await()
+            }
+            return result.getOrNull()
+
+        }
+        suspend fun requestLaunchersScan(scanOptions: ScanOptions): ScanIntentResult? {
+            val result = runCatching {
+                currentCompletableDeferredScan?.completeExceptionally(RuntimeException("reset"))
+                currentCompletableDeferredScan = null
+                currentCompletableDeferredScan = CompletableDeferred<ScanIntentResult>()
+                ActivityUtils.getTopActivity()?.let {
+                    requestLaunchersScan[it]?.launch(scanOptions)
+                } ?: return@runCatching null
+                return@runCatching currentCompletableDeferredScan?.await()
+            }
+            return result.getOrNull()
+
+        }
+    }
+
 }
diff --git a/simple/src/main/java/com/ven/assists/simple/App.kt b/simple/src/main/java/com/ven/assists/simple/App.kt
@@ -2,6 +2,7 @@ package com.ven.assists.simple
 
 import android.app.Application
 import com.blankj.utilcode.util.Utils
+import com.ven.assists.AssistsCore
 import com.ven.assists.simple.step.GestureBottomTab
 import com.ven.assists.simple.step.GestureScrollSocial
 import com.ven.assists.simple.step.OpenWechatSocial
@@ -11,11 +12,14 @@ import com.ven.assists.stepper.StepManager
 
 class App : Application() {
 
-    companion object{
+    companion object {
         const val TARGET_PACKAGE_NAME = "com.tencent.mm"
     }
+
     override fun onCreate() {
         super.onCreate()
         Utils.init(this)
+        //设置全局步骤默认间隔时长
+        StepManager.DEFAULT_STEP_DELAY = 1000L
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ dependencies {`
`36`	`36`	`implementation "com.google.code.gson:gson:2.11.0"`
`37`	`37`	`implementation project(':assists')`
`38`	`38`	`implementation project(':assists-mp')`
	`39`	`+ implementation 'com.journeyapps:zxing-android-embedded:4.3.0'`
`39`	`40`	`}`
`40`	`41`	`task sourcesJar(type: Jar) {`
`41`	`42`	`archiveClassifier.set('sources')`
`@@ -48,7 +49,7 @@ afterEvaluate {`
`48`	`49`	`from components.release`
`49`	`50`	`groupId = 'com.github.ven-coder'`
`50`	`51`	`artifactId = 'assists-web'`
`51`		`- version = '0.0.21-SNAPSHOT'`
	`52`	`+ version = '0.0.22-SNAPSHOT'`
`52`	`53`	`artifact sourcesJar`
`53`	`54`	`}`
`54`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,5 @@ object CallMethod {`
`37`	`37`	`const val nodeGestureClickByDouble="nodeGestureClickByDouble"`
`38`	`38`	`const val takeScreenshot="takeScreenshot"`
`39`	`39`	`const val setOverlayFlags="setOverlayFlags"`
	`40`	`+ const val scanQR="scanQR"`
`40`	`41`	`}`