accessibility open mode

Sherryutan · Sep 13, 2020 · 6469a14 · 6469a14
1 parent 748aeed
commit 6469a14
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/src/common/src/main/java/com/alipay/hulu/common/tools/CmdTools.java b/src/common/src/main/java/com/alipay/hulu/common/tools/CmdTools.java
@@ -390,6 +390,20 @@ public static String execHighPrivilegeCmd(String cmd) {
         return execAdbCmd(cmd, 0);
     }
 
+    /**
+     * 激活辅助功能
+     * @param key
+     * @param value
+     * @return
+     */
+    public static String putAccessibility(String key, String value) {
+        String cmd = "content call --uri content://settings/secure --method PUT_secure --arg " + key + "  --extra _user:i:0 --extra value:s:" + value;
+        if (isRooted()) {
+            return execRootCmd(cmd, null, true, null).toString();
+        }
+        return execAdbCmd(cmd, 0);
+    }
+
     /**
      * 带超时的高权限命令执行
      * @param cmd shell命令（shell之后的部分）

diff --git a/src/common/src/main/java/com/alipay/hulu/common/utils/activity/PermissionDialogActivity.java b/src/common/src/main/java/com/alipay/hulu/common/utils/activity/PermissionDialogActivity.java
@@ -572,8 +572,8 @@ public void onFailed() {
                             latch.countDown();
                         }
                     });
-                    CmdTools.execHighPrivilegeCmd("settings put secure enabled_accessibility_services com.alipay.hulu/com.alipay.hulu.shared.event.accessibility.AccessibilityServiceImpl");
-                    CmdTools.execHighPrivilegeCmd("settings put secure accessibility_enabled 1");
+                    CmdTools.putAccessibility("enabled_accessibility_services", "com.alipay.hulu/com.alipay.hulu.shared.event.accessibility.AccessibilityServiceImpl");
+                    CmdTools.putAccessibility("accessibility_enabled", "1");
 
                     try {
                         latch.await(2000, TimeUnit.MILLISECONDS);
@@ -849,11 +849,11 @@ public void onFailed() {
         });
 
         // 切换回TalkBack
-        CmdTools.execHighPrivilegeCmd("settings put secure enabled_accessibility_services com.android.talkback/com.google.android.marvin.talkback.TalkBackService");
+        CmdTools.putAccessibility("enabled_accessibility_services", "com.android.talkback/com.google.android.marvin.talkback.TalkBackService");
         // 等2秒
         MiscUtil.sleep(2000);
 
-        CmdTools.execHighPrivilegeCmd("settings put secure enabled_accessibility_services com.alipay.hulu/com.alipay.hulu.shared.event.accessibility.AccessibilityServiceImpl");
+        CmdTools.putAccessibility("enabled_accessibility_services", "com.alipay.hulu/com.alipay.hulu.shared.event.accessibility.AccessibilityServiceImpl");
 
         // 等待辅助功能重新激活
         try {

diff --git a/...d/src/main/java/com/alipay/hulu/shared/node/tree/accessibility/AccessibilityProvider.java b/...d/src/main/java/com/alipay/hulu/shared/node/tree/accessibility/AccessibilityProvider.java
@@ -329,7 +329,7 @@ private void restartAccessibilityService() {
         cleanInstrumentationAndUiAutomator();
 
         // 切换回TalkBack
-        CmdTools.execHighPrivilegeCmd("settings put secure enabled_accessibility_services com.android.talkback/com.google.android.marvin.talkback.TalkBackService");
+        CmdTools.putAccessibility("enabled_accessibility_services", "com.android.talkback/com.google.android.marvin.talkback.TalkBackService");
         // 等2秒
         MiscUtil.sleep(2000);
 
@@ -348,7 +348,7 @@ public void onFailed() {
             }
         });
 
-        CmdTools.execHighPrivilegeCmd("settings put secure enabled_accessibility_services com.alipay.hulu/com.alipay.hulu.shared.event.accessibility.AccessibilityServiceImpl");
+        CmdTools.putAccessibility("enabled_accessibility_services", "com.alipay.hulu/com.alipay.hulu.shared.event.accessibility.AccessibilityServiceImpl");
 
         // 等待辅助功能重新激活
         try {