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:52 UTC
[1/6] incubator-weex git commit: * [android] update modify
linear-gradline default value
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev d876e670c -> 668e0e93c
* [android] update modify linear-gradline default value
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9fb9fbf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9fb9fbf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9fb9fbf7
Branch: refs/heads/0.11-dev
Commit: 9fb9fbf74f2e9110d11c328bb5e8fe74b28b6057
Parents: 59dee77
Author: xkli <56...@qq.com>
Authored: Thu Mar 9 11:35:52 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Thu Mar 9 11:35:52 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXComponent.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9fb9fbf7/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 8586b60..a63b77a 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
@@ -1103,7 +1103,10 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
public void setBackgroundImage(String bgImage) {
- if (!TextUtils.isEmpty(bgImage) && mHost != null) {
+
+ if ("".equals(bgImage) && mHost != null) {
+ getOrCreateBorder().setImage(null);
+ } else if (null != bgImage && mHost != null) {
Shader shader = WXResourceUtils.getShader(bgImage, mDomObj.getLayoutWidth(), mDomObj.getLayoutHeight());
getOrCreateBorder().setImage(shader);
}
[5/6] incubator-weex git commit: * [android] update formate code
Posted by so...@apache.org.
* [android] update formate 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/12309adf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/12309adf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/12309adf
Branch: refs/heads/0.11-dev
Commit: 12309adf191347ae10fdf47045afb566cab60094
Parents: 9991b9f
Author: xkli <56...@qq.com>
Authored: Mon Mar 13 18:50:58 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Mon Mar 13 18:50:58 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/ui/view/border/BorderDrawable.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/12309adf/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java
index 5dd1b2e..c17ff85 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderDrawable.java
@@ -450,8 +450,8 @@ public class BorderDrawable extends Drawable {
invalidateSelf();
}
- public void setImage(Shader shader){
- mShader=shader;
+ public void setImage(Shader shader) {
+ mShader = shader;
invalidateSelf();
}
[6/6] incubator-weex git commit: Merge branch '0.11-dev-image' of
github.com:xkli/incubator-weex into 0.11-dev This closes #74
Posted by so...@apache.org.
Merge branch '0.11-dev-image' of github.com:xkli/incubator-weex into 0.11-dev
This closes #74
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/668e0e93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/668e0e93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/668e0e93
Branch: refs/heads/0.11-dev
Commit: 668e0e93cb7f2eebc64621eb55ec9f70a38a7201
Parents: d876e67 12309ad
Author: sospartan <so...@gmail.com>
Authored: Tue Mar 14 09:47:12 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Tue Mar 14 09:47:12 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 10 ++++++----
.../com/taobao/weex/ui/view/border/BorderDrawable.java | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/668e0e93/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
[4/6] incubator-weex git commit: * [android] update code add
annotation
Posted by so...@apache.org.
* [android] update code add annotation
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9991b9f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9991b9f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9991b9f3
Branch: refs/heads/0.11-dev
Commit: 9991b9f3bac332e2c9fd704e9c9b919e335e9536
Parents: c87a203
Author: xkli <56...@qq.com>
Authored: Fri Mar 10 17:43:09 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Fri Mar 10 17:43:09 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXComponent.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9991b9f3/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 9423d67..93415e2 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
@@ -1102,8 +1102,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
}
- @NonNull
- public void setBackgroundImage(String bgImage) {
+ public void setBackgroundImage(@NonNull String bgImage) {
if ("".equals(bgImage.trim())) {
getOrCreateBorder().setImage(null);
} else {
[2/6] incubator-weex git commit: * [android] update judge multiple
space
Posted by so...@apache.org.
* [android] update judge multiple space
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/54792a6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/54792a6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/54792a6e
Branch: refs/heads/0.11-dev
Commit: 54792a6e34fefc0af91f268c4e3b5b08346fc50a
Parents: 9fb9fbf
Author: xkli <56...@qq.com>
Authored: Fri Mar 10 17:22:10 2017 +0800
Committer: xkli <56...@qq.com>
Committed: Fri Mar 10 17:22:10 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/54792a6e/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 a63b77a..5bec416 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
@@ -1104,7 +1104,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
public void setBackgroundImage(String bgImage) {
- if ("".equals(bgImage) && mHost != null) {
+ if ("".equals(bgImage.trim()) && mHost != null) {
getOrCreateBorder().setImage(null);
} else if (null != bgImage && mHost != null) {
Shader shader = WXResourceUtils.getShader(bgImage, mDomObj.getLayoutWidth(), mDomObj.getLayoutHeight());
[3/6] incubator-weex git commit: * [android] update code
Posted by so...@apache.org.
* [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);
}