From 36aa642903cdd05cf50c22a1547bdd6bd81c6414 Mon Sep 17 00:00:00 2001 From: Katherine Jiang Date: Fri, 30 Aug 2019 10:53:46 +0800 Subject: [PATCH] review --- .../com/taobao/weex/ui/action/GraphicActionAnimation.java | 4 ++-- .../java/com/taobao/weex/ui/animation/TransformParser.java | 2 +- .../sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java | 4 ++-- 3 files changed, 5 insertions(+), 5 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 index bf05d361bc..1f9f39b9a2 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 @@ -204,11 +204,11 @@ ObjectAnimator createAnimator(final View target, final int viewPortWidth) { ViewGroup.LayoutParams layoutParams = target.getLayoutParams(); if (!TextUtils.isEmpty(style.width)) { holders.add(PropertyValuesHolder.ofInt(new WidthProperty(), layoutParams.width, - (int) WXViewUtils.getRealPxByWidth(style.width,0.0f, viewPortWidth))); + (int) WXViewUtils.getRealPxByWidth(style.width, Float.NaN, viewPortWidth))); } if (!TextUtils.isEmpty(style.height)) { holders.add(PropertyValuesHolder.ofInt(new HeightProperty(), layoutParams.height, - (int) WXViewUtils.getRealPxByWidth(style.width,0.0f, viewPortWidth))); + (int) WXViewUtils.getRealPxByWidth(style.width, Float.NaN, viewPortWidth))); } } diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/TransformParser.java b/android/sdk/src/main/java/com/taobao/weex/ui/animation/TransformParser.java index 99e72e49f7..e83a96b92e 100644 --- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/TransformParser.java +++ b/android/sdk/src/main/java/com/taobao/weex/ui/animation/TransformParser.java @@ -243,7 +243,7 @@ private Float parseCameraDistance(List rawValue){ return new LinkedHashMap<>(); } - protected static Pair parsePivot(@Nullable String transformOrigin, + static Pair parsePivot(@Nullable String transformOrigin, int width, int height, int viewportW) { if (!TextUtils.isEmpty(transformOrigin)) { int firstSpace = transformOrigin.indexOf(FunctionParser.SPACE); diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java index ec4d507c64..e9ffe64089 100644 --- a/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java +++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXViewUtils.java @@ -312,9 +312,9 @@ public static float getRealPxByWidth(Object value, float df, int customViewport) pxValue = Float.parseFloat(temp); } } catch (NumberFormatException nfe) { - WXLogUtils.e("Argument format error! value is " + temp, WXLogUtils.getStackTrace(nfe)); + WXLogUtils.e(WXLogUtils.getStackTrace(nfe)); } catch (Exception e) { - WXLogUtils.e("Argument error! value is " + temp, WXLogUtils.getStackTrace(e)); + WXLogUtils.e(WXLogUtils.getStackTrace(e)); } if (mUseWebPx) { return (float) Math.rint(pxValue);