CodeCow/Auto.js
1
0
Fork 0
mirror of https://github.com/TonyJiangWJ/Auto.js.git synced 2026-06-24 21:33:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化：无脚本执行时不执行无意义的无障碍回调

Browse Source
This commit is contained in:
TonyJiangWJ 2021-08-16 09:58:00 +08:00
parent 71eafc3c6b
commit 78658fdfc3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autojs/src/main/java/com/stardust/autojs/AutoJs.java
View File

@ -68,8 +68,8 @@ public abstract class AutoJs {
mAppUtils = createAppUtils(mContext);
mGlobalConsole = createGlobalConsole();
mNotificationObserver = new AccessibilityNotificationObserver(mContext);
mActivityInfoProvider = new ActivityInfoProvider(mContext);
mScriptEngineService = buildScriptEngineService();
mActivityInfoProvider = new ActivityInfoProvider(mContext, mScriptEngineManager);
ScriptEngineService.setInstance(mScriptEngineService);
init();
}

16
autojs/src/main/java/com/stardust/autojs/core/activity/ActivityInfoProvider.kt
View File

@ -14,6 +14,7 @@ import android.view.accessibility.AccessibilityWindowInfo
import androidx.annotation.RequiresApi
import com.stardust.app.isOpPermissionGranted
import com.stardust.autojs.core.util.Shell
import com.stardust.autojs.engine.ScriptEngineManager
import com.stardust.view.accessibility.AccessibilityDelegate
import java.util.regex.Pattern
@ -21,7 +22,7 @@ import java.util.regex.Pattern
* Created by Stardust on 2017/3/9.
*/
class ActivityInfoProvider(private val context: Context) : AccessibilityDelegate {
class ActivityInfoProvider(private val context: Context, private val scriptEngineManager: ScriptEngineManager) : AccessibilityDelegate {
private val mPackageManager: PackageManager = context.packageManager
@ -34,6 +35,9 @@ class ActivityInfoProvider(private val context: Context) : AccessibilityDelegate
private var mShell: Shell? = null
private var mUseShell = false
private val checkedPackage: Set<String> = HashSet()
private val existsPackage: Set<String> = HashSet()
val latestPackage: String
get() {
val compFromShell = mLatestComponentFromShell
@ -78,8 +82,13 @@ class ActivityInfoProvider(private val context: Context) : AccessibilityDelegate
override fun onAccessibilityEvent(service: AccessibilityService, event: AccessibilityEvent): Boolean {
if (event.eventType == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED) {
if (scriptEngineManager.engines.size == 0) {
return false
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
val start: Long = System.currentTimeMillis()
val window = service.getWindow(event.windowId)
Log.d(LOG_TAG, "get window cost: " + (System.currentTimeMillis() - start) + "ms")
if (window?.isFocused != false) {
setLatestComponent(event.packageName, event.className)
return false
@ -166,8 +175,13 @@ class ActivityInfoProvider(private val context: Context) : AccessibilityDelegate
}
private fun isPackageExists(packageName: String): Boolean {
if (checkedPackage.contains(packageName)) {
return existsPackage.contains(packageName)
}
checkedPackage.plus(packageName)
return try {
mPackageManager.getPackageInfo(packageName, 0)
existsPackage.plus(packageName)
true
} catch (e: PackageManager.NameNotFoundException) {
false