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/07 02:52:09 UTC
[1/2] incubator-weex git commit: [WEEX-342][android] AndroidP only
return P without version. return right version
Repository: incubator-weex
Updated Branches:
refs/heads/master 785bc1990 -> 4a394a253
[WEEX-342][android] AndroidP only return P without version. return right version
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4a394a25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4a394a25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4a394a25
Branch: refs/heads/master
Commit: 4a394a2537a0914b519ea174b3e4a0c438219b7e
Parents: 39183d4
Author: jianbai.gbj <gu...@163.com>
Authored: Tue Jun 5 18:07:56 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Jun 7 10:51:53 2018 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4a394a25/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
index 5ff1c5e..758494e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXEnvironment.java
@@ -43,7 +43,12 @@ import java.util.Map;
public class WXEnvironment {
public static final String OS = "android";
- public static final String SYS_VERSION = android.os.Build.VERSION.RELEASE;
+ public static String SYS_VERSION = android.os.Build.VERSION.RELEASE;
+ static{
+ if(SYS_VERSION != null && SYS_VERSION.toUpperCase().equals("P")){
+ SYS_VERSION = "9.0.0";
+ }
+ }
public static final String SYS_MODEL = android.os.Build.MODEL;
public static final String ENVIRONMENT = "environment";
public static final String WEEX_CURRENT_KEY = "wx_current_url";
[2/2] 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)
Posted by ky...@apache.org.
[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/39183d43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/39183d43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/39183d43
Branch: refs/heads/master
Commit: 39183d435fc98ffaeb0d345b56bbcb826c835225
Parents: 785bc19
Author: jianbai.gbj <gu...@163.com>
Authored: Tue Jun 5 12:00:47 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Thu Jun 7 10:51:53 2018 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/ui/component/WXComponent.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/39183d43/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 3c15cd5..26fedbc 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
@@ -69,6 +69,7 @@ import com.taobao.weex.common.WXPerformance;
import com.taobao.weex.common.WXRuntimeException;
import com.taobao.weex.dom.CSSShorthand;
import com.taobao.weex.dom.CSSShorthand.CORNER;
+import com.taobao.weex.dom.WXEvent;
import com.taobao.weex.dom.WXStyle;
import com.taobao.weex.dom.transition.WXTransition;
import com.taobao.weex.layout.ContentBoxMeasurement;
@@ -287,7 +288,13 @@ public abstract class WXComponent<T extends View> extends WXBasicComponent imple
private void applyEvents() {
if (getEvents() == null || getEvents().isEmpty())
return;
- for (String type : getEvents()) {
+ WXEvent event = getEvents();
+ int size = event.size();
+ for(int i=0; i<size; i++){
+ if(i >= event.size()){
+ break;
+ }
+ String type = event.get(i);
addEvent(type);
}
setActiveTouchListener();