Repository: incubator-weex
Updated Branches:
refs/heads/master af068c0a6 -> 2ace11d72
* [Android] Fix some ConcurrentModificationException
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2ace11d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2ace11d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2ace11d7
Branch: refs/heads/master
Commit: 2ace11d7243d7463998a82e47369ad32d9bbcf8f
Parents: af068c0
Author: miomin
Authored: Thu Jul 26 17:49:20 2018 +0800
Committer: YorkShen
Committed: Fri Jul 27 14:18:39 2018 +0800
--
.../weex/ui/component/list/BasicListComponent.java | 10 --
.../weex/ui/view/refresh/core/WXSwipeLayout.java | 13 +++--
2 files changed, 19 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2ace11d7/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 14dc743..c6adf80 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
@@ -289,8 +289,14 @@ public abstract class BasicListComponent listeners =
getInstance().getWXScrollListeners();
-if (listeners != null && listeners.size() > 0) {
- for (OnWXScrollListener listener : listeners) {
+int size;
+OnWXScrollListener listener;
+if (listeners != null && (size = listeners.size()) > 0) {
+ for (int i=0; i= listeners.size()){
+ break;
+}
+listener = listeners.get(i);
if (listener != null) {
View topView = recyclerView.getChildAt(0);
if (topView != null) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2ace11d7/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
--
diff --git
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
index e6818e1..9f66c03 100644
---
a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
+++
b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/core/WXSwipeLayout.java
@@ -767,8 +767,17 @@ public class WXSwipeLayout extends FrameLayout implements
NestedScrollingParent,
}
private void notifyOnRefreshOffsetChangedListener(int verticalOffset) {
-for(OnRefreshOffsetChangedListener listener :
mRefreshOffsetChangedListeners) {
- listener.onOffsetChanged(verticalOffset);
+int size = mRefreshOffsetChangedListeners.size();
+OnRefreshOffsetChangedListener listener;
+for (int i=0; i= mRefreshOffsetChangedListeners.size()){
+break;
+ }
+ listener = mRefreshOffsetChangedListeners.get(i);
+
+ if (listener != null) {
+listener.onOffsetChanged(verticalOffset);
+ }
}
}