[Weex][Android] 7.7.5 weex-core transition not start bugfix http://dotwe.org/vue/73f432adf4d115456bcdd8fd4ce924f1
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/1f78f8c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1f78f8c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1f78f8c3 Branch: refs/heads/master Commit: 1f78f8c346f47f31924afdab1cc12af930b9c91a Parents: b4fb9d3 Author: jianbai.gbj <jianbai....@alibaba-inc.com> Authored: Sat Apr 28 15:10:01 2018 +0800 Committer: YorkShen <shenyua...@gmail.com> Committed: Mon May 7 15:52:08 2018 +0800 ---------------------------------------------------------------------- .../ui/action/GraphicActionAbstractAddElement.java | 2 +- .../weex/ui/action/GraphicActionUpdateStyle.java | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1f78f8c3/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java index a26c39e..7128dc1 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAbstractAddElement.java @@ -57,7 +57,7 @@ public abstract class GraphicActionAbstractAddElement extends BasicGraphicAction WXComponent component = WXComponentFactory.newInstance(instance, parent, basicComponentData); WXSDKManager.getInstance().getWXRenderManager().registerComponent(getPageId(), getRef(), component); - if(mStyle.containsKey(Constants.Name.TRANSFORM)) { + if(mStyle.containsKey(Constants.Name.TRANSFORM) && component.getTransition() == null) { Map<String, Object> animationMap = new ArrayMap<>(2); animationMap.put(Constants.Name.TRANSFORM, mStyle.get(Constants.Name.TRANSFORM)); animationMap http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1f78f8c3/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java index 90525e7..fffed20 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionUpdateStyle.java @@ -58,7 +58,7 @@ public class GraphicActionUpdateStyle extends BasicGraphicAction { } if (null != mStyle) { component.addStyle(mStyle, mIsCausedByPesudo); - if(style.containsKey(Constants.Name.TRANSFORM)) { + if(style.containsKey(Constants.Name.TRANSFORM) && component.getTransition() == null) { Map<String, Object> animationMap = new ArrayMap<>(2); animationMap.put(Constants.Name.TRANSFORM, style.get(Constants.Name.TRANSFORM)); animationMap @@ -95,11 +95,13 @@ public class GraphicActionUpdateStyle extends BasicGraphicAction { } if (null != mStyle) { component.addStyle(mStyle, mIsCausedByPesudo); - Map<String, Object> animationMap = new ArrayMap<>(2); - animationMap.put(Constants.Name.TRANSFORM, style.get(Constants.Name.TRANSFORM)); - animationMap.put(Constants.Name.TRANSFORM_ORIGIN, style.get(Constants.Name.TRANSFORM_ORIGIN)); - component.addAnimationForElement(animationMap); - WXBridgeManager.getInstance().markDirty(component.getInstanceId(), component.getRef(), true); + if(style.containsKey(Constants.Name.TRANSFORM) && component.getTransition() == null){ + Map<String, Object> animationMap = new ArrayMap<>(2); + animationMap.put(Constants.Name.TRANSFORM, style.get(Constants.Name.TRANSFORM)); + animationMap.put(Constants.Name.TRANSFORM_ORIGIN, style.get(Constants.Name.TRANSFORM_ORIGIN)); + component.addAnimationForElement(animationMap); + WXBridgeManager.getInstance().markDirty(component.getInstanceId(), component.getRef(), true); + } } if (null != paddings) {
