From 392a4b953df53db1527a3b975de94b467fe4b5f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=A0=E8=84=9A=E6=9C=AC=E4=BA=BA?= <742374184@qq.com>
Date: Tue, 11 Jul 2023 00:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=93=E5=B1=95=E6=97=A0=E9=9A=9C=E7=A2=8D?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=9B=9E=E8=B0=83=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessibility/AccessibilityService.kt     |  4 +--
 .../automator/AccessibilityEventWrapper.kt    | 26 ++++++++++++-------
 version.properties                            |  6 ++---
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/core/accessibility/AccessibilityService.kt b/app/src/main/java/org/autojs/autojs/core/accessibility/AccessibilityService.kt
index a423910c..9c6aa475 100644
--- a/app/src/main/java/org/autojs/autojs/core/accessibility/AccessibilityService.kt
+++ b/app/src/main/java/org/autojs/autojs/core/accessibility/AccessibilityService.kt
@@ -56,9 +56,7 @@ open class AccessibilityService : android.accessibilityservice.AccessibilityServ
     }
 
     override fun onAccessibilityEvent(event: AccessibilityEvent) {
-        if (instance != this) {
-            instance = this
-        }
+        if (instance != this) instance = this
         val type = event.eventType
         eventBox[type]?.onAccessibilityEvent(AccessibilityEventWrapper(event))
         if (containsAllEventTypes || eventTypes.contains(type)) {
diff --git a/app/src/main/java/org/autojs/autojs/core/automator/AccessibilityEventWrapper.kt b/app/src/main/java/org/autojs/autojs/core/automator/AccessibilityEventWrapper.kt
index 23fb4f6c..bffcec05 100644
--- a/app/src/main/java/org/autojs/autojs/core/automator/AccessibilityEventWrapper.kt
+++ b/app/src/main/java/org/autojs/autojs/core/automator/AccessibilityEventWrapper.kt
@@ -1,27 +1,35 @@
 package org.autojs.autojs.core.automator
 
 import android.view.accessibility.AccessibilityEvent
+import android.view.accessibility.AccessibilityNodeInfo
 
 class AccessibilityEventWrapper(event: AccessibilityEvent) {
-    private val node = event.source
+    val raw = event
+    val packageName: CharSequence? = event.packageName
+    val eventType = event.eventType
+    val eventTime = event.eventTime
+    val action = event.action
+    val isFullScreen = event.isFullScreen
+    val className = event.className
+    val source = event.source?.let { UiObject(it, getDepth(it), getIndexInParent(it)) }
 
-    val source = if (node != null) UiObject(node, null, getDepth(), getIndexInParent()) else null
-
-    private fun getDepth(): Int {
+    private fun getDepth(node: AccessibilityNodeInfo): Int {
         var depth = 0
-        if (node == null) return 0
-        while (node.parent != null) {
+        var father = node.parent
+        while (father != null) {
             depth++
+            father = father.parent
         }
         return depth
     }
 
-    private fun getIndexInParent(): Int {
-        val parent = node!!.parent
+    private fun getIndexInParent(node: AccessibilityNodeInfo): Int {
         var index = 0
+        val parent = node.parent ?: return 0
         while (parent.getChild(index) != node) {
             index++
         }
         return index
     }
-}
\ No newline at end of file
+}
+
diff --git a/version.properties b/version.properties
index 7fcf9914..7018538d 100644
--- a/version.properties
+++ b/version.properties
@@ -1,8 +1,8 @@
-#Mon Jul 10 18:23:10 CST 2023
-BUILD_TIME=1688984590330
+#Tue Jul 11 00:23:06 CST 2023
+BUILD_TIME=1689006186217
 COMPILE_SDK_VERSION=33
 JAVA_VERSION=20
 MIN_SDK_VERSION=24
 TARGET_SDK_VERSION=33
-VERSION_BUILD=2006
+VERSION_BUILD=2010
 VERSION_NAME=6.3.2