This is an automated email from the ASF dual-hosted git repository.
kyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git
The following commit(s) were added to refs/heads/master by this push:
new f745b79 * [Android] modify interactionTime algorithm ,ignore fixd
element (#1900)
f745b79 is described below
commit f745b794d97fd8cea74d63fb031c7a1af75d1d73
Author: chen <[email protected]>
AuthorDate: Wed Dec 12 16:30:44 2018 +0800
* [Android] modify interactionTime algorithm ,ignore fixd element (#1900)
---
.../com/taobao/weex/ui/action/GraphicActionAddElement.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java
index 2a3b5da..9db1ee1 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAddElement.java
@@ -84,8 +84,14 @@ public class GraphicActionAddElement extends
GraphicActionAbstractAddElement {
if (null != parent && parent.isIgnoreInteraction){
child.isIgnoreInteraction = true;
}
- if (null!= child && null != child.getAttrs() &&
"1".equals(child.getAttrs().get("ignoreInteraction"))){
- child.isIgnoreInteraction = true;
+ if (!child.isIgnoreInteraction ){
+ Object flag = null;
+ if (null != child.getAttrs()){
+ flag = child.getAttrs().get("ignoreInteraction");
+ }
+ if ("1".equals(flag) || "true".equals(flag) || child.isFixed()){
+ child.isIgnoreInteraction = true;
+ }
}
} catch (ClassCastException e) {