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/03/08 03:32:36 UTC
[1/8] incubator-weex git commit: * [android] support to update
recycle attr
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev cf92b99df -> f80d0f7fa
* [android] support to update recycle attr
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5ece42f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5ece42f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5ece42f3
Branch: refs/heads/0.11-dev
Commit: 5ece42f3b2666973892c167ea2cfc169515e8fed
Parents: 54f62a8
Author: zshshr <zh...@gmail.com>
Authored: Tue Mar 7 19:05:48 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Tue Mar 7 19:05:48 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXComponent.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5ece42f3/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 03f5157..37d29c9 100755
--- 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
@@ -226,7 +226,6 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
private WXAnimationModule.AnimationHolder mAnimationHolder;
private PesudoStatus mPesudoStatus = new PesudoStatus();
private boolean mIsDestroyed = false;
- private boolean mCanRecycled = true;
//Holding the animation bean when component is uninitialized
public void postAnimation(WXAnimationModule.AnimationHolder holder) {
@@ -320,7 +319,6 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
mParent = parent;
mDomObj = dom.clone();
mCurrentRef = mDomObj.getRef();
- mCanRecycled = dom.canRecycled();
mGestureType = new HashSet<>();
++mComponentNum;
onCreate();
@@ -1483,7 +1481,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
}
public boolean canRecycled(){
- return mCanRecycled;
+ return mDomObj.getAttrs().canRecycled();
}
/**
[3/8] incubator-weex git commit: * [Android] Fix NPE in Animation
Posted by so...@apache.org.
* [Android] Fix NPE in Animation
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0e759415
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0e759415
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0e759415
Branch: refs/heads/0.11-dev
Commit: 0e759415c9bbd1b906308420b6444e65edb1f82e
Parents: cf92b99
Author: YorkShen <sh...@gmail.com>
Authored: Wed Mar 8 11:15:37 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Mar 8 11:15:37 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/ui/animation/WXAnimationModule.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0e759415/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java b/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
index f3b03e1..5969f1c 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
@@ -247,7 +247,7 @@ public class WXAnimationModule extends WXModule {
@JSMethod
public void transition(@Nullable String ref, @Nullable String animation, @Nullable String callBack) {
- if(!TextUtils.isEmpty(ref)&&!TextUtils.isEmpty(animation)) {
+ if(!TextUtils.isEmpty(ref)&&!TextUtils.isEmpty(animation) && mWXSDKInstance!=null) {
Message msg = Message.obtain();
WXDomTask task = new WXDomTask();
task.instanceId = mWXSDKInstance.getInstanceId();
[6/8] incubator-weex git commit: Merge branch
'0.11-dev-supportUpdateRecycler' of github.com:zshshr/incubator-weex into
0.11-dev This closes #65
Posted by so...@apache.org.
Merge branch '0.11-dev-supportUpdateRecycler' of github.com:zshshr/incubator-weex into 0.11-dev
This closes #65
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/778f546f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/778f546f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/778f546f
Branch: refs/heads/0.11-dev
Commit: 778f546fcd1ce2117657b71cb42e4d9ca8e017b5
Parents: cf92b99 56d0daf
Author: sospartan <so...@gmail.com>
Authored: Wed Mar 8 11:31:08 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Wed Mar 8 11:31:08 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 6 +++---
.../com/taobao/weex/ui/component/WXVContainer.java | 3 ++-
.../weex/ui/component/list/BasicListComponent.java | 13 ++++++++++++-
3 files changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[4/8] incubator-weex git commit: * [android] move back
super.recycled() call
Posted by so...@apache.org.
* [android] move back super.recycled() call
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/521273a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/521273a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/521273a2
Branch: refs/heads/0.11-dev
Commit: 521273a23c145ef8d5a3809617ec5a56e183cb47
Parents: 00151bc
Author: zshshr <zh...@gmail.com>
Authored: Wed Mar 8 11:16:18 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed Mar 8 11:16:18 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXVContainer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/521273a2/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 4db4b7d..fceea7e 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -374,13 +374,13 @@ public abstract class WXVContainer<T extends ViewGroup> extends WXComponent<T> {
* recycle component resources
*/
public void recycled() {
- super.recycled();
if (mChildren != null && !mDomObj.isFixed() && mDomObj.getAttrs().canRecycled()) {
int count = mChildren.size();
for (int i = 0; i < count; ++i) {
mChildren.get(i).recycled();
}
}
+ super.recycled();
}
[2/8] incubator-weex git commit: * [android] bugFix for fixed
component being recycled
Posted by so...@apache.org.
* [android] bugFix for fixed component being recycled
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/00151bce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/00151bce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/00151bce
Branch: refs/heads/0.11-dev
Commit: 00151bce372d26c35ade7a9dc65bdcf6692702f8
Parents: 5ece42f
Author: zshshr <zh...@gmail.com>
Authored: Wed Mar 8 11:00:43 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed Mar 8 11:00:43 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/WXComponent.java | 4 +++-
.../com/taobao/weex/ui/component/WXVContainer.java | 5 +++--
.../weex/ui/component/list/BasicListComponent.java | 13 ++++++++++++-
3 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/00151bce/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 37d29c9..ac921ad 100755
--- 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
@@ -202,7 +202,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
/** package **/ T mHost;
private volatile WXVContainer mParent;
- private volatile ImmutableDomObject mDomObj;
+ protected volatile ImmutableDomObject mDomObj;
private WXSDKInstance mInstance;
private Context mContext;
@@ -1302,6 +1302,8 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
* end hook Activity life cycle callback
********************************************************/
public void recycled() {
+ if(mDomObj.isFixed())
+ return;
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/00151bce/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index 6ba7dc7..4db4b7d 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -374,13 +374,14 @@ public abstract class WXVContainer<T extends ViewGroup> extends WXComponent<T> {
* recycle component resources
*/
public void recycled() {
- if (mChildren != null) {
+ super.recycled();
+ if (mChildren != null && !mDomObj.isFixed() && mDomObj.getAttrs().canRecycled()) {
int count = mChildren.size();
for (int i = 0; i < count; ++i) {
mChildren.get(i).recycled();
}
}
- super.recycled();
+
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/00151bce/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 fbbb5b7..804c03e 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
@@ -230,7 +230,6 @@ import com.taobao.weex.WXSDKInstance;
import com.taobao.weex.annotation.JSMethod;
import com.taobao.weex.common.Constants;
import com.taobao.weex.common.OnWXScrollListener;
-import com.taobao.weex.common.WXRuntimeException;
import com.taobao.weex.dom.ImmutableDomObject;
import com.taobao.weex.dom.WXDomObject;
import com.taobao.weex.ui.component.AppearanceHelper;
@@ -910,6 +909,18 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
@Override
public void onViewRecycled(ListBaseViewHolder holder) {
long begin = System.currentTimeMillis();
+ WXComponent component = holder.getComponent();
+ if (component == null
+ || (component instanceof WXRefresh)
+ || (component instanceof WXLoading)
+ || (component.getDomObject() != null && component.getDomObject().isFixed())
+ ) {
+ if (WXEnvironment.isApkDebugable()) {
+ WXLogUtils.d(TAG, "Bind WXRefresh & WXLoading " + holder);
+ }
+ return;
+ }
+
holder.setComponentUsing(false);
if(holder.canRecycled()) {
recycleViewList.add(holder);
[5/8] incubator-weex git commit: * [android] use getDomObject()
Posted by so...@apache.org.
* [android] use getDomObject()
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/56d0daf7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/56d0daf7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/56d0daf7
Branch: refs/heads/0.11-dev
Commit: 56d0daf7df72eb7f10ca9bef23fc90393797406b
Parents: 521273a
Author: zshshr <zh...@gmail.com>
Authored: Wed Mar 8 11:21:17 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Wed Mar 8 11:21:17 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/ui/component/WXComponent.java | 2 +-
.../src/main/java/com/taobao/weex/ui/component/WXVContainer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56d0daf7/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 ac921ad..d1bf68d 100755
--- 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
@@ -202,7 +202,7 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
/** package **/ T mHost;
private volatile WXVContainer mParent;
- protected volatile ImmutableDomObject mDomObj;
+ private volatile ImmutableDomObject mDomObj;
private WXSDKInstance mInstance;
private Context mContext;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/56d0daf7/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
index fceea7e..afdfd55 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXVContainer.java
@@ -374,7 +374,7 @@ public abstract class WXVContainer<T extends ViewGroup> extends WXComponent<T> {
* recycle component resources
*/
public void recycled() {
- if (mChildren != null && !mDomObj.isFixed() && mDomObj.getAttrs().canRecycled()) {
+ if (mChildren != null && !getDomObject().isFixed() && getDomObject().getAttrs().canRecycled()) {
int count = mChildren.size();
for (int i = 0; i < count; ++i) {
mChildren.get(i).recycled();
[8/8] incubator-weex git commit: Merge branch 'android-animation-NPE'
of github.com:YorkShen/incubator-weex into 0.11-dev This closes #66
Posted by so...@apache.org.
Merge branch 'android-animation-NPE' of github.com:YorkShen/incubator-weex into 0.11-dev
This closes #66
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f80d0f7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f80d0f7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f80d0f7f
Branch: refs/heads/0.11-dev
Commit: f80d0f7fa1b7fb84d8d57baeb98561edef97ccac
Parents: 778f546 cc26308
Author: sospartan <so...@gmail.com>
Authored: Wed Mar 8 11:32:08 2017 +0800
Committer: sospartan <so...@gmail.com>
Committed: Wed Mar 8 11:32:08 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/animation/WXAnimationModule.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[7/8] incubator-weex git commit: * [android] Rename variable name
from mWXSDKInstance to instance.
Posted by so...@apache.org.
* [android] Rename variable name from mWXSDKInstance to instance.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/cc263086
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cc263086
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cc263086
Branch: refs/heads/0.11-dev
Commit: cc26308656c158321fe4c59636e1151ac7299899
Parents: 0e75941
Author: YorkShen <sh...@gmail.com>
Authored: Wed Mar 8 11:31:25 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Mar 8 11:31:25 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/animation/WXAnimationModule.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/cc263086/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java b/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
index 5969f1c..e974633 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/animation/WXAnimationModule.java
@@ -263,7 +263,7 @@ public class WXAnimationModule extends WXModule {
}
}
- public static void startAnimation(WXSDKInstance mWXSDKInstance, WXComponent component,
+ public static void startAnimation(WXSDKInstance instance, WXComponent component,
@NonNull WXAnimationBean animationBean, @Nullable String callback) {
if(component == null){
return;
@@ -274,9 +274,9 @@ public class WXAnimationModule extends WXModule {
return;
}
try {
- Animator animator = createAnimator(animationBean, component.getHostView(),mWXSDKInstance.getViewPortWidth());
+ Animator animator = createAnimator(animationBean, component.getHostView(),instance.getViewPortWidth());
if (animator != null) {
- Animator.AnimatorListener animatorCallback = createAnimatorListener(mWXSDKInstance, callback);
+ Animator.AnimatorListener animatorCallback = createAnimatorListener(instance, callback);
if(Build.VERSION.SDK_INT<Build.VERSION_CODES.JELLY_BEAN_MR2) {
component.getHostView().setLayerType(View.LAYER_TYPE_HARDWARE, null);
}
@@ -349,15 +349,15 @@ public class WXAnimationModule extends WXModule {
public static
@Nullable
- Animator.AnimatorListener createAnimatorListener(final WXSDKInstance mWXSDKInstance, @Nullable final String callBack) {
+ Animator.AnimatorListener createAnimatorListener(final WXSDKInstance instance, @Nullable final String callBack) {
if (!TextUtils.isEmpty(callBack)) {
return new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
- if (mWXSDKInstance == null) {
- WXLogUtils.e("WXRenderStatement-onAnimationEnd mWXSDKInstance == null NPE");
+ if (instance == null) {
+ WXLogUtils.e("WXRenderStatement-onAnimationEnd WXSDKInstance == null NPE");
} else {
- WXSDKManager.getInstance().callback(mWXSDKInstance.getInstanceId(),
+ WXSDKManager.getInstance().callback(instance.getInstanceId(),
callBack,
new HashMap<String, Object>());
}