fix:无障碍修复 (alibaba#3289)

jinwencan · May 5, 2022 · 1aabf04 · 1aabf04
1 parent a66e061
commit 1aabf04
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/android/sdk/src/main/java/org/apache/weex/common/Constants.java b/android/sdk/src/main/java/org/apache/weex/common/Constants.java
@@ -200,6 +200,7 @@ public interface Name {
     String ARIA_LABEL = "ariaLabel";
     String ARIA_HIDDEN = "ariaHidden";
     String ROLE = "role";
+    String ACCESSIBLE = "accessible";
 
     String LAYERLIMIT = "layerLimit";
     String LAYER_LIMIT = "layer-limit";

diff --git a/android/sdk/src/main/java/org/apache/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXComponent.java
@@ -18,6 +18,9 @@
  */
 package org.apache.weex.ui.component;
 
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_YES;
+
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -855,6 +858,10 @@ protected boolean setProperty(String key, Object param) {
         String label = WXUtils.getString(param, "");
         setAriaLabel(label);
         return true;
+      case Constants.Name.ACCESSIBLE:
+        boolean accessible = WXUtils.getBoolean(param, false);
+        setAccessible(accessible);
+        return true;
       case Constants.Name.ARIA_HIDDEN:
         boolean isHidden = WXUtils.getBoolean(param, false);
         setAriaHidden(isHidden);
@@ -1308,7 +1315,7 @@ protected MeasureOutput measure(int width, int height) {
   protected void setAriaHidden(boolean isHidden) {
     View host = getHostView();
     if (host != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-      host.setImportantForAccessibility(isHidden ? View.IMPORTANT_FOR_ACCESSIBILITY_NO : View.IMPORTANT_FOR_ACCESSIBILITY_YES);
+      host.setImportantForAccessibility(isHidden ? IMPORTANT_FOR_ACCESSIBILITY_NO : IMPORTANT_FOR_ACCESSIBILITY_YES);
     }
   }
 
@@ -1319,6 +1326,18 @@ protected void setAriaLabel(String label) {
     }
   }
 
+  protected void setAccessible(Boolean accessible) {
+    View host = getHostView();
+    if (host != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+      if (accessible) {
+        getHostView().setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_YES);
+      } else {
+        getHostView().setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+      }
+    }
+  }
+
+
   protected void setRole(String roleKey) {
     View host = getHostView();
     String role = roleKey;
@@ -1464,7 +1483,7 @@ protected void createViewImpl() {
         if(mHost.getId() == View.NO_ID)
           mHost.setId(WXViewUtils.generateViewId());
         if(TextUtils.isEmpty(mHost.getContentDescription()) && WXEnvironment.isApkDebugable()){
-          mHost.setContentDescription(getRef());
+       //   mHost.setContentDescription(getRef());
         }
         ComponentObserver observer;
         if ((observer = getInstance().getComponentObserver()) != null) {

diff --git a/android/sdk/src/main/java/org/apache/weex/ui/component/WXVContainer.java b/android/sdk/src/main/java/org/apache/weex/ui/component/WXVContainer.java
@@ -18,8 +18,11 @@
  */
 package org.apache.weex.ui.component;
 
+import static android.view.View.IMPORTANT_FOR_ACCESSIBILITY_NO;
+
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.support.annotation.Nullable;
 import android.support.v4.view.ViewCompat;
 import android.util.Pair;
@@ -197,6 +200,9 @@ public void createViewImpl() {
     }
     if (getHostView() != null) {
       getHostView().setClipToPadding(false);
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+        getHostView().setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);
+      }
     }
   }