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/03 05:50:37 UTC
[1/2] incubator-weex git commit: 0.11 dev bugfix fix loading npe
(#2826)
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev a910602a6 -> 5c1ded048
0.11 dev bugfix fix loading npe (#2826)
* * [android] fix loading NPE when use dom object
* * [android] fix loading NPE when use dom object
* * [android] annotate ImmutableDomObject's method
* * [android] remove unnecessary null detect
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/36992dc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/36992dc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/36992dc0
Branch: refs/heads/0.11-dev
Commit: 36992dc0e16039b87daf4427f9d39e5cd7a6e835
Parents: 33a6c1e
Author: sospartan zheng <so...@apache.org>
Authored: Fri Mar 3 13:47:52 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Fri Mar 3 13:47:52 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/dom/ImmutableDomObject.java | 14 ++++++++------
.../main/java/com/taobao/weex/dom/flex/CSSNode.java | 8 +++++---
.../java/com/taobao/weex/ui/component/WXLoading.java | 7 +++++--
3 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/36992dc0/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java b/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java
index 41ce73b..045a0b6 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/ImmutableDomObject.java
@@ -204,6 +204,8 @@
*/
package com.taobao.weex.dom;
+import android.support.annotation.NonNull;
+
import com.taobao.weex.dom.flex.Spacing;
/**
@@ -212,17 +214,17 @@ import com.taobao.weex.dom.flex.Spacing;
public interface ImmutableDomObject {
String getRef();
- Spacing getMargin();
+ @NonNull Spacing getMargin();
float getLayoutWidth();
float getLayoutHeight();
float getLayoutX();
float getLayoutY();
boolean isFixed();
- WXStyle getStyles();
- WXEvent getEvents();
- WXAttr getAttrs();
- Spacing getPadding();
- Spacing getBorder();
+ @NonNull WXStyle getStyles();
+ @NonNull WXEvent getEvents();
+ @NonNull WXAttr getAttrs();
+ @NonNull Spacing getPadding();
+ @NonNull Spacing getBorder();
Object getExtra();
String getType();
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/36992dc0/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
index bfb378b..3f55245 100755
--- a/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/flex/CSSNode.java
@@ -7,6 +7,8 @@ package com.taobao.weex.dom.flex;
//import javax.annotation.Nullable;
+import android.support.annotation.NonNull;
+
import java.util.ArrayList;
import static com.taobao.weex.dom.flex.CSSLayout.DIMENSION_HEIGHT;
@@ -339,7 +341,7 @@ public class CSSNode {
/**
* Get this node's margin, as defined by cssstyle + default margin.
*/
- public Spacing getMargin() {
+ public @NonNull Spacing getMargin() {
return cssstyle.margin;
}
@@ -380,7 +382,7 @@ public class CSSNode {
/**
* Get this node's padding, as defined by cssstyle + default padding.
*/
- public Spacing getPadding() {
+ public @NonNull Spacing getPadding() {
return cssstyle.padding;
}
@@ -393,7 +395,7 @@ public class CSSNode {
/**
* Get this node's border, as defined by cssstyle.
*/
- public Spacing getBorder() {
+ public @NonNull Spacing getBorder() {
return cssstyle.border;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/36992dc0/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java
index 64e6d40..a83d95f 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXLoading.java
@@ -211,6 +211,7 @@ import android.text.TextUtils;
import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.annotation.Component;
import com.taobao.weex.common.Constants;
+import com.taobao.weex.dom.ImmutableDomObject;
import com.taobao.weex.dom.WXDomObject;
import com.taobao.weex.ui.component.list.WXListComponent;
import com.taobao.weex.ui.view.WXFrameLayout;
@@ -241,14 +242,16 @@ public class WXLoading extends WXBaseRefresh implements WXSwipeLayout.WXOnLoadin
@Override
public void onLoading() {
- if (getDomObject().getEvents().contains(Constants.Event.ONLOADING)) {
+ ImmutableDomObject domObject = getDomObject();
+ if (domObject != null && domObject.getEvents().contains(Constants.Event.ONLOADING)) {
fireEvent(Constants.Event.ONLOADING);
}
}
@Override
public void onPullingUp(float dy, int pullOutDistance, float viewHeight) {
- if (getDomObject().getEvents() != null && getDomObject().getEvents().contains(Constants.Event.ONPULLING_UP)) {
+ ImmutableDomObject domObject = getDomObject();
+ if (domObject != null && domObject.getEvents().contains(Constants.Event.ONPULLING_UP)) {
Map<String, Object> data = new HashMap<>();
data.put(Constants.Name.DISTANCE_Y, dy);
data.put(Constants.Name.PULLING_DISTANCE, pullOutDistance);
[2/2] incubator-weex git commit: Merge branch '0.11-dev' of
github.com:alibaba/weex into 0.11-dev
Posted by so...@apache.org.
Merge branch '0.11-dev' of github.com:alibaba/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/5c1ded04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5c1ded04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5c1ded04
Branch: refs/heads/0.11-dev
Commit: 5c1ded048dd1c4e0485fe48a37109be23bee1e37
Parents: a910602 36992dc
Author: sospartan <so...@gmail.com>
Authored: Fri Mar 3 13:50:06 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Fri Mar 3 13:50:06 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/dom/ImmutableDomObject.java | 14 ++++++++------
.../main/java/com/taobao/weex/dom/flex/CSSNode.java | 8 +++++---
.../java/com/taobao/weex/ui/component/WXLoading.java | 7 +++++--
3 files changed, 18 insertions(+), 11 deletions(-)
----------------------------------------------------------------------