You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/08/28 05:22:53 UTC
[1/5] incubator-weex git commit: sticky true
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev 58abd2236 -> b7c18e93d
sticky true
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d1dafdbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d1dafdbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d1dafdbf
Branch: refs/heads/0.16-dev
Commit: d1dafdbfa91efa57b6170ca20cd7c7d4f57b5d20
Parents: d921e00
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Aug 28 09:45:24 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Aug 28 09:45:24 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/component/list/BasicListComponent.java | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d1dafdbf/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 c8411d6..9aa85f6 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
@@ -581,6 +581,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
RecyclerView.LayoutManager layoutManager;
boolean beforeFirstVisibleItem = false;
+ boolean removeOldSticky = false;
layoutManager = getHostView().getInnerView().getLayoutManager();
if (layoutManager instanceof LinearLayoutManager || layoutManager instanceof GridLayoutManager) {
int fVisible = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
@@ -593,6 +594,10 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
currentStickyPos = pos;
}
}
+
+ if(pos > fVisible){
+ removeOldSticky = true;
+ }
} else if(layoutManager instanceof StaggeredGridLayoutManager){
int [] firstItems= new int[3];
int fVisible = ((StaggeredGridLayoutManager) layoutManager).findFirstVisibleItemPositions(firstItems)[0];
@@ -601,6 +606,10 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
if (pos <= fVisible) {
beforeFirstVisibleItem = true;
}
+
+ if(pos > fVisible){
+ removeOldSticky = true;
+ }
}
int[] location = new int[2];
[4/5] incubator-weex git commit: when child height is zero,
appear not fired
Posted by zs...@apache.org.
when child height is zero, appear not fired
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f0cfa85e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f0cfa85e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f0cfa85e
Branch: refs/heads/0.16-dev
Commit: f0cfa85ee39344b994f384894f999230829e19fb
Parents: 9e547a4
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Aug 28 10:12:46 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Aug 28 10:12:46 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/AppearanceHelper.java | 10 ++++++----
.../java/com/taobao/weex/ui/component/WXScroller.java | 2 +-
.../taobao/weex/ui/component/list/BasicListComponent.java | 2 +-
3 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f0cfa85e/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java
index b4da122..c3772d1 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java
@@ -97,11 +97,13 @@ public class AppearanceHelper {
return RESULT_NO_CHANGE;
}
- public boolean isViewVisible() {
+ public boolean isViewVisible(boolean isList) {
View view = mAwareChild.getHostView();
- if(view.getVisibility() == View.VISIBLE){
- if(view.getMeasuredHeight() == 0){
- return true;
+ if(isList){
+ if(view.getVisibility() == View.VISIBLE){
+ if(view.getMeasuredHeight() == 0){
+ return true;
+ }
}
}
return view != null && view.getLocalVisibleRect(mVisibleRect);
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f0cfa85e/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
index 627776f..6cf784f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXScroller.java
@@ -657,7 +657,7 @@ public class WXScroller extends WXVContainer<ViewGroup> implements WXScrollViewL
if (!helper.isWatch()) {
continue;
}
- boolean visible = helper.isViewVisible();
+ boolean visible = helper.isViewVisible(false);
int result = helper.setAppearStatus(visible);
if (result != AppearanceHelper.RESULT_NO_CHANGE) {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f0cfa85e/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 12487e8..4a89581 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
@@ -1235,7 +1235,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
continue;
}
- boolean visible = (!outOfVisibleRange) && item.isViewVisible();
+ boolean visible = (!outOfVisibleRange) && item.isViewVisible(true);
int result = item.setAppearStatus(visible);
if (WXEnvironment.isApkDebugable()) {
[2/5] incubator-weex git commit: fix sticky bug
Posted by zs...@apache.org.
fix sticky bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5de82f39
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5de82f39
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5de82f39
Branch: refs/heads/0.16-dev
Commit: 5de82f390c9668ad6798d9db6978930c3a371a36
Parents: d1dafdb
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Aug 28 09:46:07 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Aug 28 09:46:07 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/list/BasicListComponent.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5de82f39/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 9aa85f6..12487e8 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
@@ -623,7 +623,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
boolean removeSticky = cell.getLocationFromStart() <= 0 && top > 0 && dy <= 0;
if (showSticky) {
bounceRecyclerView.notifyStickyShow(cell);
- } else if (removeSticky) {
+ } else if (removeSticky || removeOldSticky) {
bounceRecyclerView.notifyStickyRemove(cell);
}
cell.setLocationFromStart(top);
[3/5] incubator-weex git commit: when child height is 0,
appear event will not be fired bug fix
Posted by zs...@apache.org.
when child height is 0, appear event will not be fired bug fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9e547a49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9e547a49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9e547a49
Branch: refs/heads/0.16-dev
Commit: 9e547a49b7734bffb161a8181b33470f726328ec
Parents: 5de82f3
Author: jianbai.gbj <ji...@alibaba-inc.com>
Authored: Mon Aug 28 10:02:45 2017 +0800
Committer: jianbai.gbj <ji...@alibaba-inc.com>
Committed: Mon Aug 28 10:02:45 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/ui/component/AppearanceHelper.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9e547a49/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java
index a9ea9fd..b4da122 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/AppearanceHelper.java
@@ -99,6 +99,11 @@ public class AppearanceHelper {
public boolean isViewVisible() {
View view = mAwareChild.getHostView();
+ if(view.getVisibility() == View.VISIBLE){
+ if(view.getMeasuredHeight() == 0){
+ return true;
+ }
+ }
return view != null && view.getLocalVisibleRect(mVisibleRect);
}
[5/5] incubator-weex git commit: Merge branch '0.16-dev-fix-sticky'
into 0.16-dev
Posted by zs...@apache.org.
Merge branch '0.16-dev-fix-sticky' into 0.16-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/b7c18e93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7c18e93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7c18e93
Branch: refs/heads/0.16-dev
Commit: b7c18e93dd0d7963d7546a0e53712719301550f6
Parents: 58abd22 f0cfa85
Author: zshshr <zh...@gmail.com>
Authored: Mon Aug 28 13:22:30 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Mon Aug 28 13:22:30 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/AppearanceHelper.java | 9 ++++++++-
.../java/com/taobao/weex/ui/component/WXScroller.java | 2 +-
.../weex/ui/component/list/BasicListComponent.java | 13 +++++++++++--
3 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7c18e93/android/sdk/src/main/java/com/taobao/weex/ui/component/list/BasicListComponent.java
----------------------------------------------------------------------