From fe41a75da69f65f7f5c6e1f9bc5ea99e199913cb Mon Sep 17 00:00:00 2001 From: chen Date: Thu, 19 Sep 2019 15:54:53 +0800 Subject: [PATCH] Revert "[Android] Change default value to from NAN to 0 (#2883)" This reverts commit 6daad9ee33ebd50dba2e01bd3a972b3488ba56ac. --- android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java | 4 ++-- .../java/com/taobao/weex/ui/animation/TransformParser.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java index 9a3a76da60..36f7d89410 100644 --- a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java +++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java @@ -158,7 +158,7 @@ public static int getFontSize(Map style,int viewPortW) { if (style == null) { return (int) WXViewUtils.getRealPxByWidth(WXText.sDEFAULT_SIZE,viewPortW); } - int fontSize = (int) WXViewUtils.getRealPxByWidth(style.get(Constants.Name.FONT_SIZE), 0f,viewPortW); + int fontSize = (int) WXViewUtils.getRealPxByWidth(style.get(Constants.Name.FONT_SIZE),viewPortW); if (fontSize <= 0) { fontSize = WXText.sDEFAULT_SIZE; } @@ -213,7 +213,7 @@ public static int getLineHeight(Map style,int viewPortW){ if (style == null) { return UNSET; } - int lineHeight = (int)WXViewUtils.getRealPxByWidth(style.get(Constants.Name.LINE_HEIGHT), 0f,viewPortW); + int lineHeight = (int)WXViewUtils.getRealPxByWidth(style.get(Constants.Name.LINE_HEIGHT),viewPortW); if (lineHeight <= 0) { lineHeight = UNSET; } 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 081b114296..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 @@ -300,7 +300,7 @@ private static float parsePercentOrPx(String raw, int unit, int viewportW) { if ((suffix = raw.lastIndexOf(WXUtils.PERCENT)) != -1) { return parsePercent(raw.substring(0, suffix), unit, precision); } - return WXViewUtils.getRealPxByWidth(raw, 0f,viewportW); + return WXViewUtils.getRealPxByWidth(raw,viewportW); }