[WEEX][Weex-Core] Fix CSS Transition Not Works Bug And Adapter For Ra…

…x Wrong Duration Unit (#2217) This is a typically misused behaviour of transition property, supporting it is only for backwards compatibility.
apache · Mar 15, 2019 · bb0913c · bb0913c
1 parent f95db5a
commit bb0913c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java b/android/sdk/src/main/java/com/taobao/weex/dom/transition/WXTransition.java
@@ -674,6 +674,14 @@ private static long parseTimeMillis(Map<String, Object> style, String key, long
         if(duration != null){
             duration = duration.replaceAll("ms", "");
         }
+        if(duration != null){
+            if(WXEnvironment.isApkDebugable()){
+                if(duration.contains("px")){
+                    WXLogUtils.w("Transition Duration Unit Only Support ms, " + duration + " is not ms Unit");
+                }
+            }
+            duration = duration.replaceAll("px", "");
+        }
         if(TextUtils.isEmpty(duration)){
             return  defaultValue;
         }

diff --git a/weex_core/Source/android/bridge/platform/android_side.cpp b/weex_core/Source/android/bridge/platform/android_side.cpp
@@ -414,7 +414,7 @@ int AndroidSide::HasTransitionPros(
   if (env == nullptr)
     return -1;
 
-  if (style == nullptr) {
+  if (style != nullptr) {
     return wx_bridge_->HasTransitionPros(env, page_id, ref, *style);
   } else {
     return wx_bridge_->HasTransitionPros(