You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2017/08/24 02:27:10 UTC
[1/2] incubator-weex git commit: * [android] fix crash caused by
invalid position
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev bade86257 -> 365332e97
* [android] fix crash caused by invalid position
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c05cfcb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c05cfcb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c05cfcb8
Branch: refs/heads/0.16-dev
Commit: c05cfcb84e8d57139e51895a76cd5d880a407f61
Parents: 6b782f6
Author: misakuo <mi...@apache.org>
Authored: Tue Aug 22 15:29:35 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Tue Aug 22 15:29:35 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/dom/action/TraceableAction.java | 1 +
.../com/taobao/weex/ui/component/list/BasicListComponent.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c05cfcb8/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java b/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java
index 5bd2689..c4cc59a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/action/TraceableAction.java
@@ -67,6 +67,7 @@ public class TraceableAction {
mBeginEvent.name = type;
mBeginEvent.payload = payload;
mBeginEvent.parseJsonTime = Stopwatch.nanosToMillis(mParseJsonNanos);
+ mBeginEvent.tname = "JSThread";
mBeginEvent.submit();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c05cfcb8/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
index c7c0bb6..7833cbf 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
@@ -520,6 +520,11 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
if (cell != null) {
final int pos = mChildren.indexOf(cell);
+ if (pos == -1) {
+ //Invalid position
+ return;
+ }
+
final WXRecyclerView view = bounceRecyclerView.getInnerView();
if (!smooth) {
[2/2] incubator-weex git commit: Merge remote-tracking branch
'upstream/pr631' into apache-0.16-dev
Posted by mi...@apache.org.
Merge remote-tracking branch 'upstream/pr631' into apache-0.16-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/365332e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/365332e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/365332e9
Branch: refs/heads/0.16-dev
Commit: 365332e9728f17703ea0a0f1a59a9fe4b16fd42a
Parents: bade862 c05cfcb
Author: misakuo <mi...@apache.org>
Authored: Thu Aug 24 10:27:42 2017 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Aug 24 10:27:42 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/dom/action/TraceableAction.java | 1 +
.../com/taobao/weex/ui/component/list/BasicListComponent.java | 5 +++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------