From 9d69069fe92c167ada5913327df27d6bb6ef5c12 Mon Sep 17 00:00:00 2001
From: cyqw <cyqw@163.com>
Date: Sun, 17 Dec 2023 11:27:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86node.performAction(AccessibilityNodeIn?=
 =?UTF-8?q?fo.ACTION=5FCLICK)=E9=83=BD=E6=94=B9=E4=B8=BAclick=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E6=89=80=E6=9C=89=E5=BA=94=E7=94=A8=E9=83=BD?=
 =?UTF-8?q?=E8=83=BD=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../touchhelper/TouchHelperServiceImpl.java   | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/zfdang/touchhelper/TouchHelperServiceImpl.java b/app/src/main/java/com/zfdang/touchhelper/TouchHelperServiceImpl.java
index 001217f..06c5ae5 100644
--- a/app/src/main/java/com/zfdang/touchhelper/TouchHelperServiceImpl.java
+++ b/app/src/main/java/com/zfdang/touchhelper/TouchHelperServiceImpl.java
@@ -485,15 +485,9 @@ private boolean skipAdByKeywords(AccessibilityNodeInfo node) {
                 clickedWidgets.add(nodeDesc);
 
                 ShowToastInIntentService("正在根据关键字跳过广告...");
-                boolean clicked = node.performAction(AccessibilityNodeInfo.ACTION_CLICK);
-                if (BuildConfig.DEBUG) {
-                    Log.d(TAG, "self clicked = " + clicked);
-                }
-                if (!clicked) {
-                    Rect rect = new Rect();
-                    node.getBoundsInScreen(rect);
-                    click(rect.centerX(), rect.centerY(), 0, 20);
-                }
+                Rect rect = new Rect();
+                node.getBoundsInScreen(rect);
+                click(rect.centerX(), rect.centerY(), 0, 20);
 
                 // is it possible that there are more nodes to click and this node does not work?
                 return true;
@@ -533,15 +527,8 @@ private boolean skipAdByTargetedWidget(AccessibilityNodeInfo node, Set<PackageWi
                     clickedWidgets.add(nodeDesc);
 
                     ShowToastInIntentService("正在根据控件跳过广告...");
-                    if (e.onlyClick) {
-                        click(temRect.centerX(), temRect.centerY(), 0, 20);
-                    } else {
-                        if (!node.performAction(AccessibilityNodeInfo.ACTION_CLICK)) {
-                            if (!node.getParent().performAction(AccessibilityNodeInfo.ACTION_CLICK)) {
-                                click(temRect.centerX(), temRect.centerY(), 0, 20);
-                            }
-                        }
-                    }
+                    click(temRect.centerX(), temRect.centerY(), 0, 20);
+
                     // clear setWidgets, stop trying
                     if (setTargetedWidgets == set) setTargetedWidgets = null;
                     return true;