Repository: incubator-weex Updated Branches: refs/heads/master 7ab6e7b23 -> 0da5171cd
[WEEX-212][android] When PlaceHolder is empty, should not use rewrite url, it will return bundle url Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/283b81ad Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/283b81ad Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/283b81ad Branch: refs/heads/master Commit: 283b81ad0791e9bc862df1624983fed9bdd499bf Parents: 7ab6e7b Author: jianbai.gbj <jianbai....@alibaba-inc.com> Authored: Thu Feb 8 17:57:49 2018 +0800 Committer: jianbai.gbj <jianbai....@alibaba-inc.com> Committed: Thu Feb 8 17:57:49 2018 +0800 ---------------------------------------------------------------------- .../src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java | 3 +++ .../sdk/src/main/java/com/taobao/weex/ui/component/WXImage.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/283b81ad/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java ---------------------------------------------------------------------- diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java b/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java index fed57ef..cd1510c 100644 --- a/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java +++ b/android/sdk/src/main/java/com/taobao/weex/adapter/DefaultUriAdapter.java @@ -47,6 +47,9 @@ public class DefaultUriAdapter implements URIAdapter { if (uri.isRelative()) { //When uri is empty, means use the base url instead. Web broswer behave this way. if(uri.getEncodedPath().length() == 0){ + if(TextUtils.isEmpty(uri.toString())){ + return uri; + } return base; } else { resultBuilder = buildRelativeURI(resultBuilder, base, uri); http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/283b81ad/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 f46cbce..f307d8a 100644 --- 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 @@ -332,7 +332,7 @@ public class WXImage extends WXComponent<ImageView> { }else if(getDomObject().getAttrs().containsKey(Constants.Name.PLACE_HOLDER)){ placeholder=(String)getDomObject().getAttrs().get(Constants.Name.PLACE_HOLDER); } - if(placeholder!=null){ + if(!TextUtils.isEmpty(placeholder)){ imageStrategy.placeHolder = getInstance().rewriteUri(Uri.parse(placeholder),URIAdapter.IMAGE).toString(); }
