From 52e163c4fbb8395058052e559995b996c747cf09 Mon Sep 17 00:00:00 2001 From: yxping Date: Mon, 15 Oct 2018 17:22:02 +0800 Subject: [PATCH] [Android] fix transform origin not right when animating with AnimationModule --- .../com/taobao/weex/ui/action/GraphicActionAnimation.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAnimation.java b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAnimation.java index 6df77b2448..4023b0c232 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAnimation.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/action/GraphicActionAnimation.java @@ -41,6 +41,7 @@ import com.alibaba.fastjson.JSONObject; import com.taobao.weex.WXSDKInstance; import com.taobao.weex.WXSDKManager; +import com.taobao.weex.common.Constants; import com.taobao.weex.ui.animation.BackgroundColorProperty; import com.taobao.weex.ui.animation.HeightProperty; import com.taobao.weex.ui.animation.WXAnimationBean; @@ -120,6 +121,12 @@ public void executeAction() { if (null != mAnimationBean.styles) { if(styleNeedInit) { + // Synchronize transformOrigin between component styles and animation style before + // animation start. + String transformOrigin = (String) component.getStyles().get(Constants.Name.TRANSFORM_ORIGIN); + if (TextUtils.isEmpty(mAnimationBean.styles.transformOrigin)) { + mAnimationBean.styles.transformOrigin = transformOrigin; + } mAnimationBean.styles.init(mAnimationBean.styles.transformOrigin, mAnimationBean.styles.transform, (int) component.getLayoutWidth(), (int) component.getLayoutHeight(),