feat: 优化自动化测试，页面查找

Author: RealOnlyone

Android/app/build.gradle

@@ -201,10 +201,9 @@ dependencies {
     releaseImplementation rootProject.ext.dependencies["okgo"]
     //高德地图定位
     implementation rootProject.ext.dependencies["amap_location"]
-    //高德地图
-//    implementation rootProject.ext.dependencies["amap_map3d"]
     //高德搜索
     implementation rootProject.ext.dependencies["amap_search"]
+    //高德地图
     implementation rootProject.ext.dependencies["amap_navi"]
     //腾讯地图定位
 //    implementation rootProject.ext.dependencies["tencent_location"]

Android/config.gradle

@@ -13,7 +13,7 @@ ext {
         //是否使用本地仓库，需要使用绝对路径，仓库地址在 local.properties 中添加 LOCAL_REPOSITORY_URL
         use_local    : true,
         group_id     : 'io.github.didi.dokit',
-        version      : '3.7.2'
+        version      : '3.7.3'
     ]
 
     android = [compileSdkVersion             : 29,
@@ -132,12 +132,10 @@ ext {
                     "didi_rpc"                      : 'com.didichuxing.foundation:rpc:2.1.0.86',
                     "okgo"                          : "com.lzy.net:okgo:3.0.4",
                     //高德地图定位
-                    "amap_location"                 : 'com.amap.api:location:latest.integration',
+                    "amap_location"                 : 'com.amap.api:location:6.1.0',
                     //高德地图
-                    "amap_map2d"                    : 'com.amap.api:map2d:latest.integration',
-                    "amap_map3d"                    : 'com.amap.api:map3d:latest.integration',
-                    "amap_search"                   : 'com.amap.api:search:latest.integration',
-                    "amap_navi"                     : 'com.amap.api:navi-3dmap:latest.integration',
+                    "amap_search"                   : 'com.amap.api:search:9.2.0',
+                    "amap_navi"                     : 'com.amap.api:navi-3dmap:8.1.0_3dmap8.1.0',
                     //腾讯地图定位
                     "tencent_location"              : 'com.tencent.map.geolocation:TencentLocationSdk-openplatform:7.2.5',
                     "tencent_map"                   : 'com.tencent.map:tencent-map-vector-sdk:4.4.0',

Android/dokit-autotest/src/main/java/com/didichuxing/doraemonkit/kit/autotest/AutoTestManager.kt

@@ -425,6 +425,17 @@ object AutoTestManager {
         }
 
         override fun onControlEventProcessFailed(activity: Activity?, view: View?, controlEvent: ControlEvent, code: Int, message: String) {
+            // 解决轻微滑动导致的回放滑动异常问题，当作正常响应继续流程
+            if (controlEvent.eventType == EventType.WSE_COMMON_EVENT) {
+                controlEvent.viewC12c?.let {
+                    if (it.actionType == ActionType.ON_SCROLL) {
+                        LogHelper.e("AutoTestManager","ON_SCROLL ERROR!")
+                        onControlEventProcessSuccess(activity, view, controlEvent)
+                        return
+                    }
+                }
+            }
+
             val msg = AutoTestMessage(command = "action_response", message = "failed")
             msg.params["eventId"] = controlEvent.eventId
             msg.params["message"] = message

Android/dokit-test/src/main/java/com/didichuxing/doraemonkit/kit/test/event/ControlEventManager.kt

@@ -28,6 +28,8 @@ object ControlEventManager {
 
     private val controlEventProcessor: ControlEventProcessor = ControlEventProcessor()
 
+    private var lastEventDiffTime: Long = 0
+
     fun updateEventId(id: String) {
         if (id.isNullOrEmpty()) {
             currentEventId = createNextEventId()
@@ -51,7 +53,8 @@ object ControlEventManager {
     fun onControlEventAction(activity: Activity?, view: View?, controlEvent: ControlEvent) {
         if (!onControlEventActionIntercept(activity, view, controlEvent)) {
             updateEventId(controlEvent.eventId)
-            controlEvent.diffTime = getEventDiffTime()
+            controlEvent.diffTime = lastEventDiffTime
+            lastEventDiffTime = getEventDiffTime()
             onControlEventActionListenerSet.forEach {
                 it.onControlEventAction(activity, view, controlEvent)
             }

Android/dokit-test/src/main/java/com/didichuxing/doraemonkit/kit/test/event/ViewC12c.kt

@@ -15,6 +15,7 @@ data class ViewC12c(
     val actionName: String = ActionType.UNKNOWN.getDesc(),
     val params: Map<String, String> = mutableMapOf(),
     val windowIndex: Int = -1,
+    val windowNode: WindowNode? = null,
     val viewPath: String = "",
     val viewPaths: MutableList<SystemViewNode>? = null,
     val accEventType: Int = -1,
@@ -27,5 +28,5 @@ data class ViewC12c(
     var inputValue: String = "",
     var position: Position? = null,
     val doKitViewNode: DoKitViewNode? = null,
-    val doKitViewPanelNode:DoKitViewPanelNode? = null
+    val doKitViewPanelNode: DoKitViewPanelNode? = null
 )

Android/dokit-test/src/main/java/com/didichuxing/doraemonkit/kit/test/event/WindowNode.kt

@@ -0,0 +1,20 @@
+package com.didichuxing.doraemonkit.kit.test.event
+
+/**
+ * didi Create on 2022/4/13 .
+ *
+ * Copyright (c) 2022/4/13 by didiglobal.com.
+ *
+ * @author <a href="[email protected]">zhangjun</a>
+ * @version 1.0
+ * @Date 2022/4/13 3:07 下午
+ * @Description 窗口信息，帮助精确查找
+ */
+data class WindowNode(
+    val name: String = "", //通常获取到的是 activity 的类名称
+    val windowId: String = "",//window 唯一识别id，通过id来实现快速查找窗口
+    val type: Int = 0,//窗口类型  0，其他，1：activity ，2：Dialog
+    val rootViewName: String = "",
+    var index: Int = 0
+
+)

Android/dokit-test/src/main/java/com/didichuxing/doraemonkit/kit/test/event/monitor/AccessibilityEventMonitor.kt

@@ -2,6 +2,7 @@ package com.didichuxing.doraemonkit.kit.test.event.monitor;
 
 import android.os.Build
 import android.view.View
+import android.view.ViewParent
 import android.view.accessibility.AccessibilityEvent
 import android.widget.*
 import com.didichuxing.doraemonkit.extension.tagName
@@ -106,6 +107,7 @@ object AccessibilityEventMonitor {
             actionName = actionType.getDesc(),
             accEventType = acc.eventType,
             windowIndex = viewRootImplIndex,
+            windowNode = createWindowNode(view.rootView),
             viewPaths = ViewPathUtil.createViewPathOfWindow(view),
             accEventInfo = transformAccEventInfo(acc),
             text = if (view is TextView) {
@@ -118,6 +120,15 @@ object AccessibilityEventMonitor {
         )
     }
 
+    private fun createWindowNode(rootView: View): WindowNode {
+        val windowNode: WindowNode = WindowPathUtil.createWindowNode(rootView)
+        val parents: List<ViewParent> = WindowPathUtil.filterViewRoot(XposedHookUtil.ROOT_VIEWS)
+        val windows: List<ViewParent> = WindowPathUtil.filterWindowViewRoot(parents, windowNode)
+        val index = windows.indexOf(rootView.parent)
+        windowNode.index = index
+        return windowNode
+    }
+
     private fun createDoKitViewPanel(view: View): DoKitViewPanelNode? {
         if (view.rootView is DoKitFrameLayout) {
             val viewParents = WindowPathUtil.filterDoKitViewRoot(XposedHookUtil.ROOT_VIEWS)

Android/dokit-test/src/main/java/com/didichuxing/doraemonkit/kit/test/event/processor/AbstractEventProcessor.kt

@@ -127,12 +127,25 @@ abstract class AbstractEventProcessor {
                 LogHelper.e("DoKit", "findWindowRootView() check failed.")
             }
         } else {
-            if (viewC12c.windowIndex > 0) {
-                viewParent = WindowPathUtil.findViewRoot(XposedHookUtil.ROOT_VIEWS, viewC12c.windowIndex)
+            if (viewC12c.windowIndex >= 0) {
+                val windowNode = viewC12c.windowNode
+                if (windowNode != null) {
+                    val parents: List<ViewParent> = WindowPathUtil.filterViewRoot(XposedHookUtil.ROOT_VIEWS)
+                    val windows: List<ViewParent> = WindowPathUtil.filterWindowViewRoot(parents, viewC12c.windowNode)
+                    if (windowNode.index >= 0 && windowNode.index < windows.size) {
+                        viewParent = windows[windowNode.index]
+                    } else {
+                        if (windows.isNotEmpty()) {
+                            viewParent = windows.last()
+                        }
+                    }
+                } else {
+                    viewParent = WindowPathUtil.findViewRoot(XposedHookUtil.ROOT_VIEWS, viewC12c.windowIndex)
+                }
             }
         }
-
         return viewParent
     }
 
+
 }

Android/dokit-test/src/main/java/com/didichuxing/doraemonkit/kit/test/utils/WindowPathUtil.java

@@ -3,8 +3,12 @@
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewParent;
+import android.view.Window;
 
 import com.didichuxing.doraemonkit.kit.core.DoKitFrameLayout;
+import com.didichuxing.doraemonkit.kit.test.event.WindowNode;
+import com.didichuxing.doraemonkit.test.R;
+import com.didichuxing.doraemonkit.util.RandomUtils;
 import com.didichuxing.doraemonkit.util.ReflectUtils;
 
 import java.util.ArrayList;
@@ -70,6 +74,49 @@ public static List<ViewParent> filterViewRoot(List<ViewParent> viewParents) {
     }
 
 
+    public static List<ViewParent> filterWindowViewRoot(List<ViewParent> viewParents, WindowNode windowNode) {
+        List<ViewParent> parents = new ArrayList<>();
+        if (viewParents != null) {
+            for (ViewParent parent : viewParents) {
+                WindowNode node = createWindowNode(parent);
+                if (TextUtils.equals(node.getName(), windowNode.getName())
+                    && node.getType() == windowNode.getType()
+                    && TextUtils.equals(node.getRootViewName(), windowNode.getRootViewName())) {
+                    parents.add(parent);
+                }
+            }
+        }
+        return parents;
+    }
+
+
+    public static WindowNode createWindowNode(ViewParent parent) {
+        WindowNode windowNode;
+        View rootView = ReflectUtils.reflect(parent).field("mView").get();
+        windowNode = createWindowNode(rootView);
+        return windowNode;
+    }
+
+    public static WindowNode createWindowNode(View rootView) {
+        WindowNode windowNode;
+        Object node = rootView.getTag(R.id.dokit_test_windowNode);
+        if (node == null) {
+            Window window = ReflectUtils.reflect(rootView).field("mWindow").get();
+            windowNode = new WindowNode(
+                window.getAttributes().getTitle().toString(),
+                RandomUtils.random16HexString(),
+                window.getAttributes().type,
+                rootView.getClass().getName(),
+                0
+            );
+            rootView.setTag(R.id.dokit_test_windowNode, windowNode);
+        } else {
+            windowNode = (WindowNode) node;
+        }
+        return windowNode;
+    }
+
+
     /**
      * 过滤出Window上的Activity 和Dialog
      */

Android/dokit/src/main/res/values/ids.xml

@@ -35,4 +35,5 @@
     <item name="dokit_baseQuickAdapter_swiping_support" type="id"/>
     <item name="dokit_baseQuickAdapter_dragging_support" type="id"/>
     <item name="dokit_baseQuickAdapter_databinding_support" type="id"/>
+    <item name="dokit_test_windowNode" type="id"/>
 </resources>