You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/06/14 04:05:39 UTC
[1/3] incubator-weex git commit: [WEEX-342][android]
ava.util.ConcurrentModificationException at
java.util.ArrayList$ArrayListIterator.next(ArrayList.java:573)at
com.taobao.weex.ui.component.WXComponent.applyEvents(WXComponent.java:290)
Repository: incubator-weex
Updated Branches:
refs/heads/master 38f43eccd -> 0935d64e5
[WEEX-342][android] ava.util.ConcurrentModificationException at java.util.ArrayList$ArrayListIterator.next(ArrayList.java:573)at com.taobao.weex.ui.component.WXComponent.applyEvents(WXComponent.java:290)
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a0dacda5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a0dacda5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a0dacda5
Branch: refs/heads/master
Commit: a0dacda5b0c8901b4798710aea0597a66850bd84
Parents: a13225f
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Thu Jun 14 10:56:48 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Thu Jun 14 10:56:48 2018 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 10 ++++------
.../java/com/taobao/weex/ui/view/gesture/WXGesture.java | 3 ++-
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a0dacda5/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 cba19d3..9572986 100644
--- 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
@@ -290,11 +290,7 @@ public abstract class WXComponent<T extends View> extends WXBasicComponent imple
if (getEvents() == null || getEvents().isEmpty())
return;
WXEvent event = getEvents();
- int size = event.size();
- for(int i=0; i<size; i++){
- if(i >= event.size()){
- break;
- }
+ for(int i=0; i<event.size(); i++){
String type = event.get(i);
addEvent(type);
}
@@ -1450,7 +1446,9 @@ public abstract class WXComponent<T extends View> extends WXBasicComponent imple
if (getEvents().size() < 1) {
return;
}
- for (String event : getEvents()) {
+ WXEvent events = getEvents();
+ for (int i=0; i<events.size(); i++) {
+ String event = events.get(i);
if (event == null) {
continue;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a0dacda5/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
index a27090b..be114a9 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/gesture/WXGesture.java
@@ -140,7 +140,8 @@ public class WXGesture extends GestureDetector.SimpleOnGestureListener implement
if(event == null){
return false;
}
- for(String type : event){
+ for(int i=0; i<event.size(); i++){
+ String type = event.get(i);
if(isStopPropagation(type)){
return true;
}
[2/3] incubator-weex git commit: [WEEX-342][android] update release
build tool, use right package name
Posted by ky...@apache.org.
[WEEX-342][android] update release build tool, use right package name
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/c60016f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c60016f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c60016f3
Branch: refs/heads/master
Commit: c60016f358109f1d7f48b900891ae6646b06528a
Parents: a0dacda
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Thu Jun 14 11:26:00 2018 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Thu Jun 14 11:26:00 2018 +0800
----------------------------------------------------------------------
scripts/generate_apache_release.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/c60016f3/scripts/generate_apache_release.sh
----------------------------------------------------------------------
diff --git a/scripts/generate_apache_release.sh b/scripts/generate_apache_release.sh
index 3d9f02f..61d6531 100755
--- a/scripts/generate_apache_release.sh
+++ b/scripts/generate_apache_release.sh
@@ -13,6 +13,7 @@ rsync -rvv --include-from=scripts/release_files.rules ./ $dest
#repackage
find $dest/android/sdk/src -type f -name '*.java' -exec sed -i '' 's/com\.taobao\.weex/org\.apache\.weex/g' {} \;
+find $dest/android/sdk/src -type f -name 'AndroidManifest.xml' -exec sed -i '' 's/com\.taobao\.weex/org\.apache\.weex/g' {} \;
mkdir -p $dest/android/sdk/src/main/java/org
mkdir -p $dest/android/sdk/src/main/java/org/apache
[3/3] incubator-weex git commit: Merge branch 'release0.19-bugfix' of
https://github.com/gubaojian/incubator-weex
Posted by ky...@apache.org.
Merge branch 'release0.19-bugfix' of https://github.com/gubaojian/incubator-weex
This closes #1268
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0935d64e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0935d64e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0935d64e
Branch: refs/heads/master
Commit: 0935d64e503a6e129545cd7323c874a989b4f7d2
Parents: 38f43ec c60016f
Author: YorkShen <sh...@gmail.com>
Authored: Thu Jun 14 12:04:05 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Jun 14 12:04:05 2018 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 10 ++++------
.../java/com/taobao/weex/ui/view/gesture/WXGesture.java | 3 ++-
scripts/generate_apache_release.sh | 1 +
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------