* [Android] Fix duplication of animation initialization due to transf…

…ormOrigin of CSS http://dotwe.org/vue/c793e8f291dba9ab7ba660d07b0644e6
apache · Jun 27, 2018 · 709d780 · 709d780
1 parent 7490d74
commit 709d780
Showing 1 changed file with 11 additions and 3 deletions.
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
@@ -61,6 +61,8 @@ public class GraphicActionAnimation extends BasicGraphicAction {
 
   private final static String TAG = "GraphicActionAnimation";
 
+  private final boolean styleNeedInit;
+
   @Nullable
   private
   final String callback;
@@ -71,13 +73,15 @@ public class GraphicActionAnimation extends BasicGraphicAction {
 
   public GraphicActionAnimation(@NonNull String pageId, @NonNull String ref, @NonNull WXAnimationBean animationBean) {
     super(pageId, ref);
+    this.styleNeedInit = false;
     this.callback = null;
     this.mAnimationBean = animationBean;
   }
 
   public GraphicActionAnimation(@NonNull String pageId, @NonNull String ref, @Nullable String animation,
                                 @Nullable final String callBack) {
     super(pageId, ref);
+    this.styleNeedInit = true;
     this.callback = callBack;
     if (!TextUtils.isEmpty(animation)) {
       this.mAnimationBean = JSONObject.parseObject(animation, WXAnimationBean.class);
@@ -86,6 +90,7 @@ public GraphicActionAnimation(@NonNull String pageId, @NonNull String ref, @Null
   public GraphicActionAnimation(@NonNull String pageId, @NonNull String ref, @NonNull WXAnimationBean animationBean,
                                 @Nullable final String callBack) {
     super(pageId, ref);
+    this.styleNeedInit = false;
     this.mAnimationBean = animationBean;
     this.callback = callBack;
   }
@@ -107,9 +112,12 @@ public void executeAction() {
     }
 
     if (null != mAnimationBean.styles) {
-      mAnimationBean.styles.init(mAnimationBean.styles.transformOrigin,
-              mAnimationBean.styles.transform, (int) component.getLayoutWidth(), (int) component.getLayoutHeight(),
-              instance.getInstanceViewPortWidth());
+      if(styleNeedInit) {
+        mAnimationBean.styles.init(mAnimationBean.styles.transformOrigin,
+            mAnimationBean.styles.transform, (int) component.getLayoutWidth(),
+            (int) component.getLayoutHeight(),
+            instance.getInstanceViewPortWidth());
+      }
       startAnimation(instance, component);
     }
   }