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/06/28 02:26:34 UTC
[1/5] incubator-weex git commit: * [android] revert dom interface for
fix crash
Repository: incubator-weex
Updated Branches:
refs/heads/0.14-dev 9e57917b9 -> 24fbad2f0
* [android] revert dom interface for fix crash
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9f087ec3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9f087ec3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9f087ec3
Branch: refs/heads/0.14-dev
Commit: 9f087ec3aea4a431eaa53b8f4de8e2e604ad066c
Parents: 7b26ee5
Author: zshshr <zh...@gmail.com>
Authored: Thu Jun 22 14:08:39 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Jun 22 14:08:39 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7575352 -> 7570504 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12130116 -> 12121924 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f087ec3/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/armeabi/libweexjsc.so b/android/sdk/libs/armeabi/libweexjsc.so
index a180660..41b1ee8 100755
Binary files a/android/sdk/libs/armeabi/libweexjsc.so and b/android/sdk/libs/armeabi/libweexjsc.so differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f087ec3/android/sdk/libs/x86/libweexjsc.so
----------------------------------------------------------------------
diff --git a/android/sdk/libs/x86/libweexjsc.so b/android/sdk/libs/x86/libweexjsc.so
index 9626c3c..c45672a 100755
Binary files a/android/sdk/libs/x86/libweexjsc.so and b/android/sdk/libs/x86/libweexjsc.so differ
[4/5] incubator-weex git commit: Merge branch
'0.14-dev-component-observer' into 0.14-dev
Posted by so...@apache.org.
Merge branch '0.14-dev-component-observer' into 0.14-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/5d75a6f2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5d75a6f2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5d75a6f2
Branch: refs/heads/0.14-dev
Commit: 5d75a6f237552b227934e18b0da23d51a7b688c6
Parents: 9e57917 a891e2d
Author: sospartan <so...@apache.org>
Authored: Wed Jun 28 10:23:38 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Jun 28 10:23:38 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ComponentObserver.java | 50 ++++++++++++++++++++
.../java/com/taobao/weex/WXSDKInstance.java | 16 +++++++
.../taobao/weex/ui/component/WXComponent.java | 14 ++++++
3 files changed, 80 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5d75a6f2/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --cc android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 5533843,47b7f30..a8d8a60
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@@ -141,8 -141,9 +141,9 @@@ public class WXSDKInstance implements I
private LayoutFinishListener mLayoutFinishListener;
+ private boolean mCurrentGround = false;
+ private ComponentObserver mComponentObserver;
-
/**
* If anchor is created manually(etc. define a layout xml resource ),
* be aware do not add it to twice when {@link IWXRenderListener#onViewCreated(WXSDKInstance, View)}.
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5d75a6f2/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
[2/5] incubator-weex git commit: * [andriod] catch
ConcurrentModificationException
Posted by so...@apache.org.
* [andriod] catch 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/25a6dbd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/25a6dbd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/25a6dbd1
Branch: refs/heads/0.14-dev
Commit: 25a6dbd17822b5f2cd97ff8bf67cca0b455a06c5
Parents: 9f087ec
Author: zshshr <zh...@gmail.com>
Authored: Thu Jun 22 22:53:39 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Jun 22 22:53:39 2017 +0800
----------------------------------------------------------------------
.../weex/ui/component/list/BasicListComponent.java | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/25a6dbd1/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 4f897f3..306be55 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
@@ -330,16 +330,20 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
super.onScrolled(recyclerView, dx, dy);
List<OnWXScrollListener> listeners = getInstance().getWXScrollListeners();
if (listeners != null && listeners.size() > 0) {
- for (OnWXScrollListener listener : listeners) {
- if (listener != null) {
- if(listener instanceof ICheckBindingScroller){
- if(((ICheckBindingScroller) listener).isNeedScroller(getRef(),null)){
+ try {
+ for (OnWXScrollListener listener : listeners) {
+ if (listener != null) {
+ if (listener instanceof ICheckBindingScroller) {
+ if (((ICheckBindingScroller) listener).isNeedScroller(getRef(), null)) {
+ listener.onScrolled(recyclerView, dx, dy);
+ }
+ } else {
listener.onScrolled(recyclerView, dx, dy);
}
- }else {
- listener.onScrolled(recyclerView, dx, dy);
}
}
+ } catch (Exception e) {
+ e.printStackTrace();
}
}
}
[5/5] incubator-weex git commit: Merge branch '0.14-dev' of
gitlab.alibaba-inc.com:weex/weex into 0.14-dev
Posted by so...@apache.org.
Merge branch '0.14-dev' of gitlab.alibaba-inc.com:weex/weex into 0.14-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/24fbad2f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/24fbad2f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/24fbad2f
Branch: refs/heads/0.14-dev
Commit: 24fbad2f0e0735427c1cb2bf87f68f2a50c094ad
Parents: 5d75a6f 25a6dbd
Author: sospartan <so...@apache.org>
Authored: Wed Jun 28 10:24:00 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Jun 28 10:24:00 2017 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7575352 -> 7570504 bytes
android/sdk/libs/x86/libweexjsc.so | Bin 12130116 -> 12121924 bytes
.../ui/component/list/BasicListComponent.java | 16 ++++++++++------
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-weex git commit: * [android] add observer for
component
Posted by so...@apache.org.
* [android] add observer for component
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a891e2d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a891e2d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a891e2d4
Branch: refs/heads/0.14-dev
Commit: a891e2d4696444e6cca23a051f611743a28b5e0b
Parents: d26c46f
Author: sospartan <so...@apache.org>
Authored: Wed Jun 14 17:04:28 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Jun 28 10:18:15 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ComponentObserver.java | 50 ++++++++++++++++++++
.../java/com/taobao/weex/WXSDKInstance.java | 17 +++++++
.../taobao/weex/ui/component/WXComponent.java | 14 ++++++
3 files changed, 81 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a891e2d4/android/sdk/src/main/java/com/taobao/weex/ComponentObserver.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ComponentObserver.java b/android/sdk/src/main/java/com/taobao/weex/ComponentObserver.java
new file mode 100644
index 0000000..a2bcd09
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/ComponentObserver.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package com.taobao.weex;
+
+import android.view.View;
+
+import com.taobao.weex.ui.component.WXComponent;
+
+/**
+ * Created by sospartan on 14/06/2017.
+ */
+
+public interface ComponentObserver {
+
+ /**
+ * Called after component is create.
+ * Notice: View is not created at this moment.
+ * @param component
+ */
+ void onCreate(WXComponent component);
+
+ /**
+ * Called before component destroy.
+ * @param component
+ */
+ void onPreDestory(WXComponent component);
+
+ /**
+ * Called when component's view is created
+ * @param component
+ * @param view
+ */
+ void onViewCreated(WXComponent component,View view);
+}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a891e2d4/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
index 2db6fb3..47b7f30 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
@@ -141,6 +141,8 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
private LayoutFinishListener mLayoutFinishListener;
+ private ComponentObserver mComponentObserver;
+
/**
* If anchor is created manually(etc. define a layout xml resource ),
@@ -275,6 +277,21 @@ public class WXSDKInstance implements IWXActivityStateListener,DomContext, View.
mUserTrackAdapter=WXSDKManager.getInstance().getIWXUserTrackAdapter();
}
+ /**
+ * Set a Observer for component.
+ * This observer will be called in each component, should not doing
+ * anything will impact render performance.
+ *
+ * @param observer
+ */
+ public void setComponentObserver(ComponentObserver observer){
+ mComponentObserver = observer;
+ }
+
+ public ComponentObserver getComponentObserver(){
+ return mComponentObserver;
+ }
+
public NativeInvokeHelper getNativeInvokeHelper() {
return mNativeInvokeHelper;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a891e2d4/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 c0d7c7a..54f822b 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
@@ -41,6 +41,7 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.taobao.weex.ComponentObserver;
import com.taobao.weex.IWXActivityStateListener;
import com.taobao.weex.WXEnvironment;
import com.taobao.weex.WXSDKInstance;
@@ -225,6 +226,10 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
mGestureType = new HashSet<>();
++mComponentNum;
onCreate();
+ ComponentObserver observer;
+ if ((observer = getInstance().getComponentObserver()) != null) {
+ observer.onCreate(this);
+ }
}
protected void onCreate(){
@@ -902,6 +907,10 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
if(mHost != null){
mHost.setId(WXViewUtils.generateViewId());
+ ComponentObserver observer;
+ if ((observer = getInstance().getComponentObserver()) != null) {
+ observer.onViewCreated(this, mHost);
+ }
}
onHostViewInitialized(mHost);
}else{
@@ -1273,6 +1282,11 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
public void destroy() {
+ ComponentObserver observer;
+ if ((observer = getInstance().getComponentObserver()) != null) {
+ observer.onPreDestory(this);
+ }
+
if (WXEnvironment.isApkDebugable() && !WXUtils.isUiThread()) {
throw new WXRuntimeException("[WXComponent] destroy can only be called in main thread");
}