add ViewNode.sibling

Krosxx · Apr 26, 2023 · ade0ea8 · ade0ea8
1 parent 549c4ba
commit ade0ea8
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 12 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -9,9 +9,6 @@
     <instrumentation
         android:name=".MyInstrumentation"
         android:targetPackage="${applicationId}" />
-    <instrumentation
-        android:name="cn.vove7.accessibility.uiauto.AutoInstrumentation"
-        android:targetPackage="${applicationId}" />
     <application
         android:name=".DemoApp"
         android:allowBackup="true"

diff --git a/app/src/main/java/cn/vove7/andro_accessibility_api/demo/MainActivity.kt b/app/src/main/java/cn/vove7/andro_accessibility_api/demo/MainActivity.kt
@@ -26,6 +26,7 @@ class MainActivity : AppCompatActivity() {
         val actions = mutableListOf(
             BaseNavigatorAction(),
             PickScreenText(),
+            SiblingTestAction(),
             DrawableAction(),
             WaitAppAction(),
             SelectTextAction(),

diff --git a/app/src/main/java/cn/vove7/andro_accessibility_api/demo/actions/actoins.kt b/app/src/main/java/cn/vove7/andro_accessibility_api/demo/actions/actoins.kt
@@ -26,6 +26,7 @@ import cn.vove7.auto.core.utils.AdapterRectF
 import cn.vove7.auto.core.utils.AutoGestureDescription
 import cn.vove7.auto.core.utils.GestureResultCallback
 import cn.vove7.auto.core.viewfinder.*
+import cn.vove7.auto.core.viewnode.ViewNode
 import kotlinx.coroutines.*
 import timber.log.Timber
 import kotlin.coroutines.coroutineContext
@@ -85,6 +86,20 @@ class PickScreenText : Action() {
     }
 }
 
+class SiblingTestAction :Action() {
+    override val name: String = "SiblingTest"
+
+    override suspend fun run(act: ComponentActivity) {
+        printLayoutInfo()
+        val view = withText(name).requireFirst()
+        Timber.i("view: $view")
+        Timber.i("view.previousSibling: ${view.previousSibling}")
+        Timber.i("view.nextSibling: ${view.nextSibling}")
+        check(view.previousSibling?.nextSibling == view)
+        toast("assert success")
+    }
+}
+
 class DrawableAction : Action() {
     override val name: String
         get() = "手势画图 - Rect - Circle - Oval"

diff --git a/core/src/main/java/cn/vove7/auto/core/viewfinder/FinderBuilderWithOperation.kt b/core/src/main/java/cn/vove7/auto/core/viewfinder/FinderBuilderWithOperation.kt
@@ -3,6 +3,7 @@ package cn.vove7.auto.core.viewfinder
 import android.os.Build
 import android.view.accessibility.AccessibilityNodeInfo
 import androidx.annotation.RequiresApi
+import cn.vove7.auto.core.viewnode.ViewNode
 import cn.vove7.auto.core.viewnode.ViewOperation
 import kotlinx.coroutines.runBlocking
 
@@ -143,4 +144,9 @@ interface FinderBuilderWithOperation : ViewOperation {
 
     @RequiresApi(Build.VERSION_CODES.R)
     override fun sendImeAction() = node.sendImeAction()
+
+    override val previousSibling: ViewNode?
+        get() = node.previousSibling
+    override val nextSibling: ViewNode?
+        get() = node.nextSibling
 }
diff --git a/core/src/main/java/cn/vove7/auto/core/viewfinder/SmartFinder.kt b/core/src/main/java/cn/vove7/auto/core/viewfinder/SmartFinder.kt
@@ -2,6 +2,7 @@ package cn.vove7.auto.core.viewfinder
 
 import android.view.accessibility.AccessibilityNodeInfo
 import cn.vove7.auto.core.viewnode.ViewNode
+import cn.vove7.auto.core.viewnode.ViewOperation
 
 /**
  * # SmartFinder

diff --git a/core/src/main/java/cn/vove7/auto/core/viewfinder/view_finder_api.kt b/core/src/main/java/cn/vove7/auto/core/viewfinder/view_finder_api.kt
@@ -9,6 +9,7 @@ import androidx.annotation.RequiresApi
 import cn.vove7.auto.core.utils.times
 import cn.vove7.auto.core.viewfinder.*
 import cn.vove7.auto.core.viewnode.ViewNode
+import timber.log.Timber
 
 /**
  * # apis
@@ -105,17 +106,17 @@ private fun ViewNode?.printWithChild(
     includeInvisible: Boolean
 ) {
     if (this == null) {
-        Log.d("ViewNode", "*" * dep + "[$index] null")
+        Timber.tag("ViewNode").d("*" * dep + "[" + index + "] null")
         return
     }
     if (!includeInvisible && !isVisibleToUser) {
-        Log.w("ViewNode", "*" * dep + "[$index] " + "InVisible")
+        Timber.tag("ViewNode").w("*" * dep + "[" + index + "] " + "InVisible")
         return
     }
     if (isVisibleToUser) {
-        Log.d("ViewNode", "*" * dep + "[$index] " + toString())
+        Timber.tag("ViewNode").d("*" * dep + "[" + index + "] " + toString())
     } else {
-        Log.w("ViewNode", "*" * dep + "[$index] " + toString())
+        Timber.tag("ViewNode").w("*" * dep + "[" + index + "] " + toString())
     }
     children.forEachIndexed { i, it ->
         it.printWithChild(i, dep + 1, includeInvisible)

diff --git a/core/src/main/java/cn/vove7/auto/core/viewnode/ViewNode.kt b/core/src/main/java/cn/vove7/auto/core/viewnode/ViewNode.kt
@@ -104,6 +104,16 @@ class ViewNode(
     override val parent: ViewNode?
         get() = if (buildWithChildren) null else node.parent?.let { ViewNode(it) }
 
+    override val previousSibling: ViewNode?
+        get() = parent?.children?.let { parChildren ->
+            parChildren.getOrNull(parChildren.indexOf(this) - 1)
+        }
+
+    override val nextSibling: ViewNode?
+        get() = parent?.children?.let { parChildren ->
+            parChildren.getOrNull(parChildren.indexOf(this) + 1)
+        }
+
     override fun tryClick(): Boolean {
         return tryOp(AccessibilityNodeInfo.ACTION_CLICK)
     }
@@ -410,4 +420,13 @@ class ViewNode(
     override fun sendImeAction(): Boolean {
         return node.performAction(android.R.id.accessibilityActionImeEnter)
     }
+
+    override fun equals(other: Any?): Boolean {
+        return if (other is ViewNode) {
+            node == other.node
+        } else false
+    }
+
+    override fun hashCode() = node.hashCode()
+
 }
diff --git a/core/src/main/java/cn/vove7/auto/core/viewnode/ViewOperation.kt b/core/src/main/java/cn/vove7/auto/core/viewnode/ViewOperation.kt
@@ -2,10 +2,8 @@ package cn.vove7.auto.core.viewnode
 
 import android.graphics.Point
 import android.graphics.Rect
-import android.os.Build
 import android.view.accessibility.AccessibilityNodeInfo
 import android.view.accessibility.AccessibilityNodeInfo.RangeInfo
-import androidx.annotation.RequiresApi
 import cn.vove7.auto.core.utils.ViewChildList
 import cn.vove7.auto.core.viewfinder.SmartFinder
 
@@ -57,6 +55,10 @@ interface ViewOperation {
      */
     val parent: ViewNode?
 
+    // 兄弟结点
+    val previousSibling: ViewNode?
+    val nextSibling: ViewNode?
+
     val requireParent: ViewNode
         get() {
             return parent ?: throw NullPointerException("parent is null of $this")
@@ -151,22 +153,22 @@ interface ViewOperation {
 
     fun desc(): CharSequence?
 
-    //选择
+    // 选择
     fun select(): Boolean
 
     fun setSelection(start: Int, end: Int): Boolean
     fun clearSelection(): Boolean
 
     fun trySelect(): Boolean
 
-    //获得焦点
+    // 获得焦点
     fun focus(): Boolean
 
     fun clearFocus(): Boolean
 
     /***以下不常用***/
 
-    //一般
+    // 一般
     fun scrollUp(): Boolean
 
     fun scrollDown(): Boolean