From e5cc3ef4f918fbe5171ae3eecceaae1040833e9c Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Wed, 12 Jul 2017 10:50:34 +0800
Subject: [PATCH] change getRootInActiveWindow back to 2.0.12 Beta

---
 .../menu/layout_inspector/LayoutInspector.java       |  2 +-
 .../scriptdroid/external/widget/ScriptWidgets.java   |  6 +++++-
 .../main/res/xml/accessibility_service_config.xml    |  4 ++--
 .../view/accessibility/AccessibilityService.java     | 12 +++++++-----
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/stardust/scriptdroid/external/floatingwindow/menu/layout_inspector/LayoutInspector.java b/app/src/main/java/com/stardust/scriptdroid/external/floatingwindow/menu/layout_inspector/LayoutInspector.java
index dbf4ab2f..e2a30562 100644
--- a/app/src/main/java/com/stardust/scriptdroid/external/floatingwindow/menu/layout_inspector/LayoutInspector.java
+++ b/app/src/main/java/com/stardust/scriptdroid/external/floatingwindow/menu/layout_inspector/LayoutInspector.java
@@ -27,8 +27,8 @@ public class LayoutInspector {
             mCapture = null;
         } else {
             final AccessibilityNodeInfo root = service.getRootInActiveWindow();
-            Log.d(LOG_TAG, "captureCurrentWindow: root = null");
             if (root == null) {
+                Log.d(LOG_TAG, "captureCurrentWindow: root = null");
                 mCapture = null;
             } else {
                 mExecutor.execute(new Runnable() {
diff --git a/app/src/main/java/com/stardust/scriptdroid/external/widget/ScriptWidgets.java b/app/src/main/java/com/stardust/scriptdroid/external/widget/ScriptWidgets.java
index 5c0dbdbd..b80f0d05 100644
--- a/app/src/main/java/com/stardust/scriptdroid/external/widget/ScriptWidgets.java
+++ b/app/src/main/java/com/stardust/scriptdroid/external/widget/ScriptWidgets.java
@@ -48,6 +48,9 @@ public class ScriptWidgets {
     static void removeAllNotIn(Set<Integer> appWidgetIdSet) {
         List<String> keysToRemove = new LinkedList<>();
         for (Map.Entry<String, ?> entry : widgets.getAll().entrySet()) {
+            if (entry.getKey().equals("max_rc")) {
+                continue;
+            }
             Matcher matcher = ID_PATTERN.matcher(entry.getKey());
             if (matcher.find()) {
                 int id = Integer.parseInt(matcher.group(1));
@@ -55,7 +58,8 @@ public class ScriptWidgets {
                     keysToRemove.add(entry.getKey());
                 }
             } else {
-                Log.e(LOG_TAG, "illegal key: " + entry.getKey());
+                Log.w(LOG_TAG, "illegal key: " + entry.getKey());
+                keysToRemove.add(entry.getKey());
             }
         }
         SharedPreferences.Editor editor = widgets.edit();
diff --git a/autojs/src/main/res/xml/accessibility_service_config.xml b/autojs/src/main/res/xml/accessibility_service_config.xml
index a557ab7b..9c541b8b 100644
--- a/autojs/src/main/res/xml/accessibility_service_config.xml
+++ b/autojs/src/main/res/xml/accessibility_service_config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
-                       android:accessibilityEventTypes="typeAllMask"
+                       android:accessibilityEventTypes="typeNotificationStateChanged|typeAnnouncement|typeAssistReadingContext|typeContextClicked|typeGestureDetectionEnd|typeGestureDetectionStart|typeTouchExplorationGestureEnd|typeTouchExplorationGestureStart|typeTouchInteractionEnd|typeTouchInteractionStart|typeViewAccessibilityFocusCleared|typeViewAccessibilityFocused|typeViewClicked|typeViewHoverEnter|typeViewHoverExit|typeViewFocused|typeViewLongClicked|typeViewScrolled|typeViewSelected|typeViewTextChanged|typeViewTextSelectionChanged|typeViewTextTraversedAtMovementGranularity|typeWindowContentChanged|typeWindowsChanged|typeWindowStateChanged"
                        android:accessibilityFeedbackType="feedbackGeneric"
-                       android:accessibilityFlags="flagRetrieveInteractiveWindows|flagIncludeNotImportantViews|flagReportViewIds|flagRequestEnhancedWebAccessibility"
+                       android:accessibilityFlags="flagIncludeNotImportantViews|flagReportViewIds|flagRetrieveInteractiveWindows|flagRequestEnhancedWebAccessibility"
                        android:canPerformGestures="true"
                        android:canRequestEnhancedWebAccessibility="true"
                        android:canRetrieveWindowContent="true"
diff --git a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java
index d93834ef..34e4f027 100644
--- a/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java
+++ b/automator/src/main/java/com/stardust/view/accessibility/AccessibilityService.java
@@ -59,13 +59,14 @@ public class AccessibilityService extends android.accessibilityservice.Accessibi
     @Override
     public void onAccessibilityEvent(final AccessibilityEvent event) {
         Log.v(TAG, "onAccessibilityEvent: " + event);
-        try {
+        if (event.getEventType() == AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED
+                || event.getEventType() == AccessibilityEvent.TYPE_VIEW_HOVER_ENTER
+                || event.getEventType() == AccessibilityEvent.TYPE_VIEW_HOVER_EXIT) {
             AccessibilityNodeInfo root = super.getRootInActiveWindow();
-            Log.v(TAG, "getRootInActiveWindow: " + root);
-            if (root != null)
+            if (root != null) {
                 mRootInActiveWindow = root;
-        } catch (Exception ignored) {
-
+                Log.d(TAG, "rootInActiveWindow: " + mRootInActiveWindow);
+            }
         }
         if (!containsAllEventTypes && !eventTypes.contains(event.getEventType()))
             return;
@@ -81,6 +82,7 @@ public class AccessibilityService extends android.accessibilityservice.Accessibi
         }
     }
 
+
     @Override
     public void onInterrupt() {