[incubator-weex] branch master updated: [Android] Change default value to from NAN to 0 (#2883)

[kyork]

This is an automated email from the ASF dual-hosted git repository.

kyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git


The following commit(s) were added to refs/heads/master by this push:
     new 6daad9e  [Android] Change default value to from NAN to 0 (#2883)
6daad9e is described below

commit 6daad9ee33ebd50dba2e01bd3a972b3488ba56ac
Author: YorkShen <shenyua...@gmail.com>
AuthorDate: Thu Sep 5 20:16:37 2019 +0800

    [Android] Change default value to from NAN to 0 (#2883)
    
    This is a bug in default value introduced by 
thttps://github.com/apache/incubator-weex/pull/2783 ,which change some default 
value from 0 to Float.NAN . This commit will revert the behaviour change.
---
 android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java            | 4 ++--
 .../src/main/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 36f7d89..9a3a76d 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 class WXStyle implements Map<String, 
Object>,Cloneable {
     if (style == null) {
       return (int) 
WXViewUtils.getRealPxByWidth(WXText.sDEFAULT_SIZE,viewPortW);
     }
-    int fontSize = (int) 
WXViewUtils.getRealPxByWidth(style.get(Constants.Name.FONT_SIZE),viewPortW);
+    int fontSize = (int) 
WXViewUtils.getRealPxByWidth(style.get(Constants.Name.FONT_SIZE), 0f,viewPortW);
     if (fontSize <= 0) {
       fontSize = WXText.sDEFAULT_SIZE;
     }
@@ -213,7 +213,7 @@ public class WXStyle implements Map<String, 
Object>,Cloneable {
     if (style == null) {
       return UNSET;
     }
-    int lineHeight = 
(int)WXViewUtils.getRealPxByWidth(style.get(Constants.Name.LINE_HEIGHT),viewPortW);
+    int lineHeight = 
(int)WXViewUtils.getRealPxByWidth(style.get(Constants.Name.LINE_HEIGHT), 
0f,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 e83a96b..081b114 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 @@ public class TransformParser {
         if ((suffix = raw.lastIndexOf(WXUtils.PERCENT)) != -1) {
             return parsePercent(raw.substring(0, suffix), unit, precision);
         }
-        return WXViewUtils.getRealPxByWidth(raw,viewportW);
+        return WXViewUtils.getRealPxByWidth(raw, 0f,viewportW);
 
     }