Revert "[Android] Change default value to from NAN to 0 (#2883)"

This reverts commit 6daad9e.
apache · Sep 19, 2019 · fe41a75 · fe41a75
1 parent e2dc1bb
commit fe41a75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -158,7 +158,7 @@ public static int getFontSize(Map<String, Object> 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<String, Object> 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
@@ -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);
 
     }