You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/03/14 04:00:05 UTC
[1/5] incubator-weex git commit: bug fix. can't set blurRadius dynamic
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev 8b23f71ef -> de623bed5
bug fix. can't set blurRadius dynamic
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/fd7a85bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/fd7a85bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/fd7a85bd
Branch: refs/heads/0.11-dev
Commit: fd7a85bd9596cc1ec492fa153b1d3765d6f0ff47
Parents: 1c9fe4e
Author: chuyi <ji...@alibaba-inc.com>
Authored: Fri Mar 10 10:51:48 2017 +0800
Committer: chuyi <ji...@alibaba-inc.com>
Committed: Fri Mar 10 10:51:48 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/dom/WXStyle.java | 22 +++---------
.../com/taobao/weex/ui/component/WXImage.java | 35 ++++++++++++++++----
.../java/com/taobao/weex/utils/WXUtils.java | 22 ++++++++++++
.../java/com/taobao/weex/dom/WXStyleTest.java | 2 +-
4 files changed, 56 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fd7a85bd/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
----------------------------------------------------------------------
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 4122b4b..254444b 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
@@ -245,25 +245,11 @@ public class WXStyle implements Map<String, Object>,Cloneable {
}
public int getBlur() {
- try {
- if(get(Constants.Name.FILTER) == null) {
- return 0;
- }
- String value = get(Constants.Name.FILTER).toString().trim();
- int start = value.indexOf("blur(");
- int end = value.indexOf("px)");
- if(end == -1) {
- end = value.indexOf(")");
- }
- if(start == 0 && start < end) {
- int blur = Integer.parseInt(value.substring(5,end));
- //unlike css blur filter(https://developer.mozilla.org/en-US/docs/Web/CSS/filter),in weex
- //we specify the blur radius in [0,10] to improve performance and avoid potential oom issue.
- return Math.min(10,Math.max(0,blur));
- }
- }catch (NumberFormatException e) {
+ if(get(Constants.Name.FILTER) == null) {
+ return 0;
}
- return 0;
+ String value = get(Constants.Name.FILTER).toString().trim();
+ return WXUtils.getBlurRadius(value);
}
/*
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fd7a85bd/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
index f893d55..cbe1936 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
@@ -245,7 +245,7 @@ import java.util.Map;
*/
@Component(lazyload = false)
public class WXImage extends WXComponent<ImageView> {
-
+ private String mSrc;
public static class Ceator implements ComponentCreator {
public WXComponent createInstance(WXSDKInstance instance, WXDomObject node, WXVContainer parent) throws IllegalAccessException, InvocationTargetException, InstantiationException {
return new WXImage(instance,node,parent);
@@ -291,10 +291,18 @@ public class WXImage extends WXComponent<ImageView> {
String src = WXUtils.getString(param, null);
if (src != null)
setSrc(src);
+ this.mSrc = src;
return true;
case Constants.Name.IMAGE_QUALITY:
return true;
case Constants.Name.FILTER:
+ int blurRadius = 0;
+ if(param != null && param instanceof String) {
+ blurRadius = WXUtils.getBlurRadius((String) param);
+ }
+ if(!TextUtils.isEmpty(this.mSrc)) {
+ setBlurRadius(this.mSrc,blurRadius);
+ }
return true;
}
return super.setProperty(key, param);
@@ -362,7 +370,16 @@ public class WXImage extends WXComponent<ImageView> {
if (Constants.Scheme.LOCAL.equals(rewrited.getScheme())) {
setLocalSrc(rewrited);
} else {
- setRemoteSrc(rewrited);
+ setRemoteSrc(rewrited, getBlurRadiusFromStyles());
+ }
+ }
+
+ private void setBlurRadius(@NonNull String src, int blurRadius) {
+ if(getInstance() != null) {
+ Uri parsedUri = getInstance().rewriteUri(Uri.parse(src), URIAdapter.IMAGE);
+ if(!Constants.Scheme.LOCAL.equals(parsedUri.getScheme())) {
+ setRemoteSrc(parsedUri,blurRadius);
+ }
}
}
@@ -381,7 +398,7 @@ public class WXImage extends WXComponent<ImageView> {
}
}
- private void setRemoteSrc(Uri rewrited) {
+ private void setRemoteSrc(Uri rewrited,int blurRadius) {
WXImageStrategy imageStrategy = new WXImageStrategy();
imageStrategy.isClipping = true;
@@ -389,9 +406,7 @@ public class WXImage extends WXComponent<ImageView> {
WXImageSharpen imageSharpen = getDomObject().getAttrs().getImageSharpen();
imageStrategy.isSharpen = imageSharpen == WXImageSharpen.SHARPEN;
- int radius = getDomObject().getStyles().getBlur();
- radius = Math.max(0, radius);
- imageStrategy.blurRadius = Math.min(10, radius);
+ imageStrategy.blurRadius = Math.max(0, blurRadius);
imageStrategy.setImageListener(new WXImageStrategy.ImageListener() {
@Override
@@ -462,6 +477,14 @@ public class WXImage extends WXComponent<ImageView> {
}
}
+ private int getBlurRadiusFromStyles() {
+ if(getDomObject() != null) {
+ return getDomObject().getStyles().getBlur();
+ } else {
+ return 0;
+ }
+ }
+
public interface Measurable {
int getNaturalWidth();
int getNaturalHeight();
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fd7a85bd/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
index b2842eb..4a9d52c 100755
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
@@ -513,6 +513,28 @@ public class WXUtils {
return originValue;
}
+ public static int getBlurRadius(@Nullable String blurRadius) {
+ if(blurRadius == null || "".equals(blurRadius)) {
+ return 0;
+ }
+ blurRadius = blurRadius.trim();
+ try {
+ int start = blurRadius.indexOf("blur(");
+ int end = blurRadius.indexOf("px)");
+ if(end == -1) {
+ end = blurRadius.indexOf(')');
+ }
+ if(start == 0 && start < end) {
+ int blur = Integer.parseInt(blurRadius.substring(5,end));
+ //we should not limit blur radius
+ return Math.max(0,blur);
+ }
+ }catch (NumberFormatException e) {
+ WXLogUtils.e(e.getMessage());
+ }
+ return 0;
+ }
+
public static int parseUnitOrPercent(String raw, int unit) {
int suffix;
if ((suffix = raw.lastIndexOf(WXUtils.PERCENT)) != -1) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/fd7a85bd/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java b/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java
index 0772804..a3397ca 100644
--- a/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java
@@ -254,7 +254,7 @@ public class WXStyleTest {
style.put(Constants.Name.FILTER,"blur(-1px)");
assertEquals(0,style.getBlur());
style.put(Constants.Name.FILTER,"blur(100px)");
- assertEquals(10,style.getBlur());
+ assertEquals(100,style.getBlur());
style.put(Constants.Name.FILTER,"blur(1p0px)");
assertEquals(0,style.getBlur());
style.put(Constants.Name.FILTER,"7");
[2/5] incubator-weex git commit: use FunctionParser
Posted by so...@apache.org.
use FunctionParser
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e29772b6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e29772b6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e29772b6
Branch: refs/heads/0.11-dev
Commit: e29772b6e695acdea89a543ee52bf2c8fea1dec7
Parents: fd7a85b
Author: chuyi <ji...@alibaba-inc.com>
Authored: Fri Mar 10 13:26:07 2017 +0800
Committer: chuyi <ji...@alibaba-inc.com>
Committed: Fri Mar 10 13:26:07 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/dom/WXStyle.java | 9 ++--
.../com/taobao/weex/ui/component/WXImage.java | 52 +++++++++++++++-----
.../java/com/taobao/weex/utils/WXUtils.java | 22 ---------
.../java/com/taobao/weex/dom/WXStyleTest.java | 23 ++-------
.../taobao/weex/utils/FunctionParserTest.java | 11 +++--
5 files changed, 53 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e29772b6/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
----------------------------------------------------------------------
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 254444b..d9db03f 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
@@ -206,6 +206,7 @@ package com.taobao.weex.dom;
import android.graphics.Typeface;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import android.support.v4.util.ArrayMap;
import android.text.Layout;
import android.text.TextUtils;
@@ -244,12 +245,12 @@ public class WXStyle implements Map<String, Object>,Cloneable {
map = new ArrayMap<>();
}
- public int getBlur() {
+ @Nullable
+ public String getBlur() {
if(get(Constants.Name.FILTER) == null) {
- return 0;
+ return null;
}
- String value = get(Constants.Name.FILTER).toString().trim();
- return WXUtils.getBlurRadius(value);
+ return get(Constants.Name.FILTER).toString().trim();
}
/*
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e29772b6/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
index cbe1936..2f7eb40 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java
@@ -210,6 +210,7 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Build;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
@@ -230,6 +231,7 @@ import com.taobao.weex.ui.view.WXImageView;
import com.taobao.weex.ui.view.border.BorderDrawable;
import com.taobao.weex.utils.ImageDrawable;
import com.taobao.weex.utils.ImgURIUtil;
+import com.taobao.weex.utils.SingleFunctionParser;
import com.taobao.weex.utils.WXDomUtils;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
@@ -238,6 +240,7 @@ import com.taobao.weex.utils.WXViewUtils;
import java.lang.reflect.InvocationTargetException;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -246,6 +249,15 @@ import java.util.Map;
@Component(lazyload = false)
public class WXImage extends WXComponent<ImageView> {
private String mSrc;
+ private int mBlurRadius;
+
+ private static SingleFunctionParser.FlatMapper<Integer> BLUR_RADIUS_MAPPER = new SingleFunctionParser.FlatMapper<Integer>() {
+ @Override
+ public Integer map(String raw) {
+ return WXUtils.getInteger(raw,0);
+ }
+ };
+
public static class Ceator implements ComponentCreator {
public WXComponent createInstance(WXSDKInstance instance, WXDomObject node, WXVContainer parent) throws IllegalAccessException, InvocationTargetException, InstantiationException {
return new WXImage(instance,node,parent);
@@ -291,14 +303,13 @@ public class WXImage extends WXComponent<ImageView> {
String src = WXUtils.getString(param, null);
if (src != null)
setSrc(src);
- this.mSrc = src;
return true;
case Constants.Name.IMAGE_QUALITY:
return true;
case Constants.Name.FILTER:
int blurRadius = 0;
if(param != null && param instanceof String) {
- blurRadius = WXUtils.getBlurRadius((String) param);
+ blurRadius = parseBlurRadius((String)param);
}
if(!TextUtils.isEmpty(this.mSrc)) {
setBlurRadius(this.mSrc,blurRadius);
@@ -363,19 +374,24 @@ public class WXImage extends WXComponent<ImageView> {
if (src == null) {
return;
}
-
+ this.mSrc = src;
WXSDKInstance instance = getInstance();
Uri rewrited = instance.rewriteUri(Uri.parse(src), URIAdapter.IMAGE);
if (Constants.Scheme.LOCAL.equals(rewrited.getScheme())) {
setLocalSrc(rewrited);
} else {
- setRemoteSrc(rewrited, getBlurRadiusFromStyles());
+ int blur = 0;
+ if(getDomObject() != null) {
+ String blurStr = getDomObject().getStyles().getBlur();
+ blur = parseBlurRadius(blurStr);
+ }
+ setRemoteSrc(rewrited, blur);
}
}
private void setBlurRadius(@NonNull String src, int blurRadius) {
- if(getInstance() != null) {
+ if(getInstance() != null && blurRadius != mBlurRadius) {
Uri parsedUri = getInstance().rewriteUri(Uri.parse(src), URIAdapter.IMAGE);
if(!Constants.Scheme.LOCAL.equals(parsedUri.getScheme())) {
setRemoteSrc(parsedUri,blurRadius);
@@ -383,6 +399,23 @@ public class WXImage extends WXComponent<ImageView> {
}
}
+ private int parseBlurRadius(@Nullable String rawRadius) {
+ if(rawRadius == null) {
+ return 0;
+ }
+ SingleFunctionParser<Integer> parser = new SingleFunctionParser<Integer>(rawRadius,BLUR_RADIUS_MAPPER);
+ List<Integer> list = null;
+ try {
+ list = parser.parse("blur");
+ }catch (Exception e) {
+ return 0;
+ }
+ if(list == null || list.isEmpty()) {
+ return 0;
+ }
+ return list.get(0);
+ }
+
@Override
public void recycled() {
super.recycled();
@@ -407,6 +440,7 @@ public class WXImage extends WXComponent<ImageView> {
imageStrategy.isSharpen = imageSharpen == WXImageSharpen.SHARPEN;
imageStrategy.blurRadius = Math.max(0, blurRadius);
+ this.mBlurRadius = blurRadius;
imageStrategy.setImageListener(new WXImageStrategy.ImageListener() {
@Override
@@ -477,14 +511,6 @@ public class WXImage extends WXComponent<ImageView> {
}
}
- private int getBlurRadiusFromStyles() {
- if(getDomObject() != null) {
- return getDomObject().getStyles().getBlur();
- } else {
- return 0;
- }
- }
-
public interface Measurable {
int getNaturalWidth();
int getNaturalHeight();
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e29772b6/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
index 4a9d52c..b2842eb 100755
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXUtils.java
@@ -513,28 +513,6 @@ public class WXUtils {
return originValue;
}
- public static int getBlurRadius(@Nullable String blurRadius) {
- if(blurRadius == null || "".equals(blurRadius)) {
- return 0;
- }
- blurRadius = blurRadius.trim();
- try {
- int start = blurRadius.indexOf("blur(");
- int end = blurRadius.indexOf("px)");
- if(end == -1) {
- end = blurRadius.indexOf(')');
- }
- if(start == 0 && start < end) {
- int blur = Integer.parseInt(blurRadius.substring(5,end));
- //we should not limit blur radius
- return Math.max(0,blur);
- }
- }catch (NumberFormatException e) {
- WXLogUtils.e(e.getMessage());
- }
- return 0;
- }
-
public static int parseUnitOrPercent(String raw, int unit) {
int suffix;
if ((suffix = raw.lastIndexOf(WXUtils.PERCENT)) != -1) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e29772b6/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java b/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java
index a3397ca..3d7f3ad 100644
--- a/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/dom/WXStyleTest.java
@@ -238,27 +238,10 @@ public class WXStyleTest {
@Test
public void testBlur() {
assertEquals(0,style.size());
- assertEquals(0,style.getBlur());
+ assertEquals(null,style.getBlur());
style.put(Constants.Name.FILTER,"blur(5px)");
- assertEquals(5,style.getBlur());
- style.put(Constants.Name.FILTER,"blur(1)");
- assertEquals(1,style.getBlur());
- style.put(Constants.Name.FILTER,"blur(1dp)");
- assertEquals(0,style.getBlur());
- style.put(Constants.Name.FILTER,"bur(1px)");
- assertEquals(0,style.getBlur());
- style.put(Constants.Name.FILTER,"blur(1px");
- assertEquals(0,style.getBlur());
- style.put(Constants.Name.FILTER,"blur(-1)");
- assertEquals(0,style.getBlur());
- style.put(Constants.Name.FILTER,"blur(-1px)");
- assertEquals(0,style.getBlur());
- style.put(Constants.Name.FILTER,"blur(100px)");
- assertEquals(100,style.getBlur());
- style.put(Constants.Name.FILTER,"blur(1p0px)");
- assertEquals(0,style.getBlur());
- style.put(Constants.Name.FILTER,"7");
- assertEquals(0,style.getBlur());
+ assertEquals("blur(5px)",style.getBlur());
+
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e29772b6/android/sdk/src/test/java/com/taobao/weex/utils/FunctionParserTest.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/test/java/com/taobao/weex/utils/FunctionParserTest.java b/android/sdk/src/test/java/com/taobao/weex/utils/FunctionParserTest.java
index b61a0e3..9a66d26 100644
--- a/android/sdk/src/test/java/com/taobao/weex/utils/FunctionParserTest.java
+++ b/android/sdk/src/test/java/com/taobao/weex/utils/FunctionParserTest.java
@@ -206,7 +206,7 @@ package com.taobao.weex.utils;
import org.junit.Test;
-import static org.junit.Assert.*;
+import java.util.List;
/**
* Created by sospartan on 27/09/2016.
@@ -215,11 +215,12 @@ public class FunctionParserTest {
@Test
public void testParse() throws Exception {
- new SingleFunctionParser<String>("transform(50 , 20)", new SingleFunctionParser.FlatMapper<String>() {
+ List<Integer> s = new SingleFunctionParser<>("blur(5px)", new SingleFunctionParser.FlatMapper<Integer>() {
@Override
- public String map(String raw) {
- return null;
+ public Integer map(String raw) {
+ return WXUtils.getInteger(raw,0);
}
- }).parse("transform");
+ }).parse("blur");
+ System.out.println(s);
}
}
\ No newline at end of file
[3/5] incubator-weex git commit: break change. blur refactor
Posted by so...@apache.org.
break change. blur refactor
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/df001bb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/df001bb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/df001bb7
Branch: refs/heads/0.11-dev
Commit: df001bb73008448771e8b27264ba0dfc784b6ce5
Parents: e29772b
Author: chuyi <ji...@alibaba-inc.com>
Authored: Tue Mar 14 11:42:48 2017 +0800
Committer: chuyi <ji...@alibaba-inc.com>
Committed: Tue Mar 14 11:42:48 2017 +0800
----------------------------------------------------------------------
.../sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/df001bb7/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java b/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java
index f952a9e..fe7ec9b 100755
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java
@@ -221,7 +221,7 @@ public class WXImageStrategy {
public boolean isSharpen;
/**
- * The blur radius of the image. [0,10],0 means no blur.
+ * The blur radius of the image. 0 means no blur.
* */
public int blurRadius;
[4/5] incubator-weex git commit: Merge branch '0.11-bugfix-chuyi' of
http://github.com/Rowandjj/incubator-weex into 0.11-dev This closes #99
Posted by so...@apache.org.
Merge branch '0.11-bugfix-chuyi' of http://github.com/Rowandjj/incubator-weex into 0.11-dev
This closes #99
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9598679f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9598679f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9598679f
Branch: refs/heads/0.11-dev
Commit: 9598679f3af7365c670bc22609e719ec77c9d1f1
Parents: 4fc5514 df001bb
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 14 11:57:02 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 14 11:57:02 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/common/WXImageStrategy.java | 2 +-
.../main/java/com/taobao/weex/dom/WXStyle.java | 25 ++------
.../com/taobao/weex/ui/component/WXImage.java | 61 ++++++++++++++++++--
.../java/com/taobao/weex/dom/WXStyleTest.java | 23 +-------
.../taobao/weex/utils/FunctionParserTest.java | 11 ++--
5 files changed, 71 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9598679f/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
index 9c189ce,d9db03f..f51b185
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
@@@ -241,29 -242,15 +242,15 @@@ public class WXStyle implements Map<Str
public WXStyle(){
- map = new ArrayMap<>();
+ mStyles = new ArrayMap<>();
}
- public int getBlur() {
- try {
- if(get(Constants.Name.FILTER) == null) {
- return 0;
- }
- String value = get(Constants.Name.FILTER).toString().trim();
- int start = value.indexOf("blur(");
- int end = value.indexOf("px)");
- if(end == -1) {
- end = value.indexOf(")");
- }
- if(start == 0 && start < end) {
- int blur = Integer.parseInt(value.substring(5,end));
- //unlike css blur filter(https://developer.mozilla.org/en-US/docs/Web/CSS/filter),in weex
- //we specify the blur radius in [0,10] to improve performance and avoid potential oom issue.
- return Math.min(10,Math.max(0,blur));
- }
- }catch (NumberFormatException e) {
+ @Nullable
+ public String getBlur() {
+ if(get(Constants.Name.FILTER) == null) {
+ return null;
}
- return 0;
+ return get(Constants.Name.FILTER).toString().trim();
}
/*
[5/5] incubator-weex git commit: Merge branch '0.11-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Posted by so...@apache.org.
Merge branch '0.11-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.11-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/de623bed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/de623bed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/de623bed
Branch: refs/heads/0.11-dev
Commit: de623bed5633a5cbce69adbdc44999ff5dedf996
Parents: 9598679 8b23f71
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 14 11:59:38 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 14 11:59:38 2017 +0800
----------------------------------------------------------------------
package.json | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------