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 01:56:54 UTC
[3/6] incubator-weex git commit: * [android] update code
* [android] update code
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c87a2035
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c87a2035
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c87a2035
Branch: refs/heads/0.11-dev
Commit: c87a20351d3ac54a38e437a38968d3547b18bf30
Parents: 54792a6
Author: xkli <56...@qq.com>
Authored: Fri Mar 10 17:39:22 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Fri Mar 10 17:39:22 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c87a2035/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 5bec416..9423d67 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -687,8 +687,8 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
setBackgroundColor(bgColor);
return true;
case Constants.Name.BACKGROUND_IMAGE:
- String bgImage = WXUtils.getString(param,null);
- if(bgImage!=null){
+ String bgImage = WXUtils.getString(param, null);
+ if (bgImage != null && mHost != null) {
setBackgroundImage(bgImage);
}
return true;
@@ -1102,11 +1102,11 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
}
+ @NonNull
public void setBackgroundImage(String bgImage) {
-
- if ("".equals(bgImage.trim()) && mHost != null) {
+ if ("".equals(bgImage.trim())) {
getOrCreateBorder().setImage(null);
- } else if (null != bgImage && mHost != null) {
+ } else {
Shader shader = WXResourceUtils.getShader(bgImage, mDomObj.getLayoutWidth(), mDomObj.getLayoutHeight());
getOrCreateBorder().setImage(shader);
}