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/22 02:03:07 UTC
incubator-weex git commit: * [android] refactor sticky implementation
in list
Repository: incubator-weex
Updated Branches:
refs/heads/0.11-dev ad06ecccc -> dded7ab61
* [android] refactor sticky implementation in list
Use list instead of stack to store sticky components and views.
In list, use #updateSticyView(currentStickyPos) to find the current sticky component.
Interface 'ListComponentView' is modified, which is used internally,
should not cause any break changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/dded7ab6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/dded7ab6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/dded7ab6
Branch: refs/heads/0.11-dev
Commit: dded7ab61940fe461e975990669cac7e8eb50ab3
Parents: ad06ecc
Author: sospartan <so...@apache.org>
Authored: Fri Mar 17 15:07:04 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Mar 22 10:02:47 2017 +0800
----------------------------------------------------------------------
.../ui/component/list/BasicListComponent.java | 18 +-
.../ui/component/list/ListComponentView.java | 2 +-
.../ui/component/list/SimpleRecyclerView.java | 80 +----
.../ui/component/list/StickyHeaderHelper.java | 337 +++++++++++++++++++
.../taobao/weex/ui/component/list/WXCell.java | 11 +
.../refresh/wrapper/BounceRecyclerView.java | 118 +------
6 files changed, 381 insertions(+), 185 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dded7ab6/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 f0717ce..ab69505 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
@@ -664,6 +664,7 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
Iterator<Map.Entry<String, WXComponent>> iterator = stickyMap.entrySet().iterator();
Map.Entry<String, WXComponent> entry;
WXComponent stickyComponent;
+ int currentStickyPos = -1;
while (iterator.hasNext()) {
entry = iterator.next();
stickyComponent = entry.getValue();
@@ -676,21 +677,19 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
return;
}
- if (stickyComponent != null && stickyComponent.getDomObject() != null
- && stickyComponent instanceof WXCell) {
- if (stickyComponent.getHostView() == null) {
- return;
- }
-
RecyclerView.LayoutManager layoutManager;
boolean beforeFirstVisibleItem = false;
layoutManager = getHostView().getInnerView().getLayoutManager();
if (layoutManager instanceof LinearLayoutManager || layoutManager instanceof GridLayoutManager) {
int fVisible = ((LinearLayoutManager) layoutManager).findFirstVisibleItemPosition();
int pos = mChildren.indexOf(cell);
+ cell.setScrollPositon(pos);
if (pos <= fVisible) {
beforeFirstVisibleItem = true;
+ if(pos > currentStickyPos) {
+ currentStickyPos = pos;
+ }
}
} else if(layoutManager instanceof StaggeredGridLayoutManager){
int [] firstItems= new int[3];
@@ -715,12 +714,13 @@ public abstract class BasicListComponent<T extends ViewGroup & ListComponentView
bounceRecyclerView.notifyStickyShow(cell);
} else if (removeSticky) {
bounceRecyclerView.notifyStickyRemove(cell);
- }else{
- bounceRecyclerView.updateStickyView();
}
cell.setLocationFromStart(top);
}
- }
+ }
+
+ if(currentStickyPos>=0){
+ bounceRecyclerView.updateStickyView(currentStickyPos);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dded7ab6/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java
index 2c87fd5..ebce7b7 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/ListComponentView.java
@@ -216,6 +216,6 @@ public interface ListComponentView {
void setRecyclerViewBaseAdapter(RecyclerViewBaseAdapter adapter);
void notifyStickyShow(WXCell component);
void notifyStickyRemove(WXCell component);
- void updateStickyView();
+ void updateStickyView(int currentStickyPos);
RecyclerViewBaseAdapter getRecyclerViewBaseAdapter();
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dded7ab6/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleRecyclerView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleRecyclerView.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleRecyclerView.java
index 49f4eda..df68533 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleRecyclerView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/SimpleRecyclerView.java
@@ -216,13 +216,12 @@ import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter;
import java.util.Stack;
/**
+ * Simple list is used for specific occasion, NOT Support sticky,load more,bounce etc.
* Created by sospartan on 13/12/2016.
*/
class SimpleRecyclerView extends WXRecyclerView implements ListComponentView{
private RecyclerViewBaseAdapter mAdapter = null;
- private Stack<View> headerViewStack = new Stack<>();
- private Stack<WXCell> headComponentStack = new Stack<>();
public SimpleRecyclerView(Context context) {
super(context);
@@ -243,88 +242,19 @@ class SimpleRecyclerView extends WXRecyclerView implements ListComponentView{
* @param component
*/
public void notifyStickyShow(WXCell component) {
- if (component == null)
- return;
- if (!headComponentStack.isEmpty()) {
- WXCell oldCom = headComponentStack.pop();
- if (!oldCom.getRef().equals(component.getRef())) {
- headComponentStack.push(oldCom);
- headComponentStack.push(component);
- showSticky();
- } else {
- headComponentStack.push(oldCom);
- return;
- }
- } else {
- headComponentStack.push(component);
- showSticky();
- }
+ //Simple list is used for specific occasion, NOT Support sticky,load more,bounce etc.
}
/**
* @param component
*/
public void notifyStickyRemove(WXCell component) {
- if (component == null)
- return;
- if (!headComponentStack.isEmpty() && !headerViewStack.isEmpty()) {
- removeSticky(component);
- }
- }
-
- /**
- * Pop stickyView to stack
- */
- private void showSticky() {
- WXCell headComponent = headComponentStack.pop();
- headComponentStack.push(headComponent);
- final View headerView = headComponent.getRealView();
- if (headerView == null)
- return;
- headerViewStack.push(headerView);
- headComponent.removeSticky();
- final ViewGroup parent = (ViewGroup) getParent();
- if(parent != null){
- parent.post(WXThread.secure(new Runnable() {
- @Override
- public void run() {
- ViewGroup existedParent;
- if((existedParent = (ViewGroup)headerView.getParent())!= null){
- existedParent.removeView(headerView);
- }
- parent.addView(headerView);
- }
- }));
- }
- }
-
- /**
- * remove top stickyView
- * @param component
- */
- private void removeSticky(WXComponent component) {
- final WXCell headComponent = headComponentStack.pop();
- if (!component.getRef().equals(headComponent.getRef())) {
- headComponentStack.push(headComponent);
- return;
- }
- final View headerView = headerViewStack.pop();
- final ViewGroup parent = (ViewGroup) getParent();
- if(parent != null){
- parent.post(WXThread.secure(new Runnable() {
- @Override
- public void run() {
- parent.removeView(headerView);
- headComponent.recoverySticky();
- }
- }));
- }
-
+ //Simple list is used for specific occasion, NOT Support sticky,load more,bounce etc.
}
@Override
- public void updateStickyView() {
-
+ public void updateStickyView(int currentStickyPos) {
+ //Simple list is used for specific occasion, NOT Support sticky,load more,bounce etc.
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dded7ab6/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java
new file mode 100644
index 0000000..09cd0a2
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/StickyHeaderHelper.java
@@ -0,0 +1,337 @@
+/**
+ *
+ * Apache License
+ * Version 2.0, January 2004
+ * http://www.apache.org/licenses/
+ *
+ * TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ *
+ * 1. Definitions.
+ *
+ * "License" shall mean the terms and conditions for use, reproduction,
+ * and distribution as defined by Sections 1 through 9 of this document.
+ *
+ * "Licensor" shall mean the copyright owner or entity authorized by
+ * the copyright owner that is granting the License.
+ *
+ * "Legal Entity" shall mean the union of the acting entity and all
+ * other entities that control, are controlled by, or are under common
+ * control with that entity. For the purposes of this definition,
+ * "control" means (i) the power, direct or indirect, to cause the
+ * direction or management of such entity, whether by contract or
+ * otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ * outstanding shares, or (iii) beneficial ownership of such entity.
+ *
+ * "You" (or "Your") shall mean an individual or Legal Entity
+ * exercising permissions granted by this License.
+ *
+ * "Source" form shall mean the preferred form for making modifications,
+ * including but not limited to software source code, documentation
+ * source, and configuration files.
+ *
+ * "Object" form shall mean any form resulting from mechanical
+ * transformation or translation of a Source form, including but
+ * not limited to compiled object code, generated documentation,
+ * and conversions to other media types.
+ *
+ * "Work" shall mean the work of authorship, whether in Source or
+ * Object form, made available under the License, as indicated by a
+ * copyright notice that is included in or attached to the work
+ * (an example is provided in the Appendix below).
+ *
+ * "Derivative Works" shall mean any work, whether in Source or Object
+ * form, that is based on (or derived from) the Work and for which the
+ * editorial revisions, annotations, elaborations, or other modifications
+ * represent, as a whole, an original work of authorship. For the purposes
+ * of this License, Derivative Works shall not include works that remain
+ * separable from, or merely link (or bind by name) to the interfaces of,
+ * the Work and Derivative Works thereof.
+ *
+ * "Contribution" shall mean any work of authorship, including
+ * the original version of the Work and any modifications or additions
+ * to that Work or Derivative Works thereof, that is intentionally
+ * submitted to Licensor for inclusion in the Work by the copyright owner
+ * or by an individual or Legal Entity authorized to submit on behalf of
+ * the copyright owner. For the purposes of this definition, "submitted"
+ * means any form of electronic, verbal, or written communication sent
+ * to the Licensor or its representatives, including but not limited to
+ * communication on electronic mailing lists, source code control systems,
+ * and issue tracking systems that are managed by, or on behalf of, the
+ * Licensor for the purpose of discussing and improving the Work, but
+ * excluding communication that is conspicuously marked or otherwise
+ * designated in writing by the copyright owner as "Not a Contribution."
+ *
+ * "Contributor" shall mean Licensor and any individual or Legal Entity
+ * on behalf of whom a Contribution has been received by Licensor and
+ * subsequently incorporated within the Work.
+ *
+ * 2. Grant of Copyright License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * copyright license to reproduce, prepare Derivative Works of,
+ * publicly display, publicly perform, sublicense, and distribute the
+ * Work and such Derivative Works in Source or Object form.
+ *
+ * 3. Grant of Patent License. Subject to the terms and conditions of
+ * this License, each Contributor hereby grants to You a perpetual,
+ * worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ * (except as stated in this section) patent license to make, have made,
+ * use, offer to sell, sell, import, and otherwise transfer the Work,
+ * where such license applies only to those patent claims licensable
+ * by such Contributor that are necessarily infringed by their
+ * Contribution(s) alone or by combination of their Contribution(s)
+ * with the Work to which such Contribution(s) was submitted. If You
+ * institute patent litigation against any entity (including a
+ * cross-claim or counterclaim in a lawsuit) alleging that the Work
+ * or a Contribution incorporated within the Work constitutes direct
+ * or contributory patent infringement, then any patent licenses
+ * granted to You under this License for that Work shall terminate
+ * as of the date such litigation is filed.
+ *
+ * 4. Redistribution. You may reproduce and distribute copies of the
+ * Work or Derivative Works thereof in any medium, with or without
+ * modifications, and in Source or Object form, provided that You
+ * meet the following conditions:
+ *
+ * (a) You must give any other recipients of the Work or
+ * Derivative Works a copy of this License; and
+ *
+ * (b) You must cause any modified files to carry prominent notices
+ * stating that You changed the files; and
+ *
+ * (c) You must retain, in the Source form of any Derivative Works
+ * that You distribute, all copyright, patent, trademark, and
+ * attribution notices from the Source form of the Work,
+ * excluding those notices that do not pertain to any part of
+ * the Derivative Works; and
+ *
+ * (d) If the Work includes a "NOTICE" text file as part of its
+ * distribution, then any Derivative Works that You distribute must
+ * include a readable copy of the attribution notices contained
+ * within such NOTICE file, excluding those notices that do not
+ * pertain to any part of the Derivative Works, in at least one
+ * of the following places: within a NOTICE text file distributed
+ * as part of the Derivative Works; within the Source form or
+ * documentation, if provided along with the Derivative Works; or,
+ * within a display generated by the Derivative Works, if and
+ * wherever such third-party notices normally appear. The contents
+ * of the NOTICE file are for informational purposes only and
+ * do not modify the License. You may add Your own attribution
+ * notices within Derivative Works that You distribute, alongside
+ * or as an addendum to the NOTICE text from the Work, provided
+ * that such additional attribution notices cannot be construed
+ * as modifying the License.
+ *
+ * You may add Your own copyright statement to Your modifications and
+ * may provide additional or different license terms and conditions
+ * for use, reproduction, or distribution of Your modifications, or
+ * for any such Derivative Works as a whole, provided Your use,
+ * reproduction, and distribution of the Work otherwise complies with
+ * the conditions stated in this License.
+ *
+ * 5. Submission of Contributions. Unless You explicitly state otherwise,
+ * any Contribution intentionally submitted for inclusion in the Work
+ * by You to the Licensor shall be under the terms and conditions of
+ * this License, without any additional terms or conditions.
+ * Notwithstanding the above, nothing herein shall supersede or modify
+ * the terms of any separate license agreement you may have executed
+ * with Licensor regarding such Contributions.
+ *
+ * 6. Trademarks. This License does not grant permission to use the trade
+ * names, trademarks, service marks, or product names of the Licensor,
+ * except as required for reasonable and customary use in describing the
+ * origin of the Work and reproducing the content of the NOTICE file.
+ *
+ * 7. Disclaimer of Warranty. Unless required by applicable law or
+ * agreed to in writing, Licensor provides the Work (and each
+ * Contributor provides its Contributions) on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied, including, without limitation, any warranties or conditions
+ * of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ * PARTICULAR PURPOSE. You are solely responsible for determining the
+ * appropriateness of using or redistributing the Work and assume any
+ * risks associated with Your exercise of permissions under this License.
+ *
+ * 8. Limitation of Liability. In no event and under no legal theory,
+ * whether in tort (including negligence), contract, or otherwise,
+ * unless required by applicable law (such as deliberate and grossly
+ * negligent acts) or agreed to in writing, shall any Contributor be
+ * liable to You for damages, including any direct, indirect, special,
+ * incidental, or consequential damages of any character arising as a
+ * result of this License or out of the use or inability to use the
+ * Work (including but not limited to damages for loss of goodwill,
+ * work stoppage, computer failure or malfunction, or any and all
+ * other commercial damages or losses), even if such Contributor
+ * has been advised of the possibility of such damages.
+ *
+ * 9. Accepting Warranty or Additional Liability. While redistributing
+ * the Work or Derivative Works thereof, You may choose to offer,
+ * and charge a fee for, acceptance of support, warranty, indemnity,
+ * or other liability obligations and/or rights consistent with this
+ * License. However, in accepting such obligations, You may act only
+ * on Your own behalf and on Your sole responsibility, not on behalf
+ * of any other Contributor, and only if You agree to indemnify,
+ * defend, and hold each Contributor harmless for any liability
+ * incurred by, or claims asserted against, such Contributor by reason
+ * of your accepting any such warranty or additional liability.
+ *
+ * END OF TERMS AND CONDITIONS
+ *
+ * APPENDIX: How to apply the Apache License to your work.
+ *
+ * To apply the Apache License to your work, attach the following
+ * boilerplate notice, with the fields enclosed by brackets "[]"
+ * replaced with your own identifying information. (Don't include
+ * the brackets!) The text should be enclosed in the appropriate
+ * comment syntax for the file format. We also recommend that a
+ * file or class name and description of purpose be included on the
+ * same "printed page" as the copyright notice for easier
+ * identification within third-party archives.
+ *
+ * Copyright 2016 Alibaba Group
+ *
+ * Licensed 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.ui.component.list;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.taobao.weex.common.WXThread;
+import com.taobao.weex.utils.WXLogUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by sospartan on 17/03/2017.
+ */
+
+public class StickyHeaderHelper {
+ private final ViewGroup mParent;
+ private Map<String,View> mHeaderViews = new HashMap<>(); // map for <ref,view>
+ private Map<String,WXCell> mHeaderComps = new HashMap<>(); // map for <ref,comp>
+ private String mCurrentStickyRef = null;
+
+ public StickyHeaderHelper(ViewGroup parent){
+ this.mParent = parent;
+ }
+
+ /**
+ * @param component
+ */
+ public void notifyStickyShow(WXCell component) {
+ if (component == null)
+ return;
+ mHeaderComps.put(component.getRef(),component);
+ if(mCurrentStickyRef != null){
+ WXCell cell = mHeaderComps.get(mCurrentStickyRef);
+ if(component.getScrollPositon() > cell.getScrollPositon()){
+ mCurrentStickyRef = component.getRef();
+ }
+ }else{
+ mCurrentStickyRef = component.getRef();
+ }
+ showSticky();
+ }
+
+ /**
+ * Bring component with bigest pos to Front
+ */
+ private void showSticky() {
+ if(mCurrentStickyRef==null){
+ WXLogUtils.e("Current Sticky ref is null.");
+ return;
+ }
+
+ WXCell headComponent = mHeaderComps.get(mCurrentStickyRef);
+ final View headerView = headComponent.getRealView();
+ if (headerView == null) {
+ WXLogUtils.e("Sticky header's real view is null.");
+ return;
+ }
+ View header = mHeaderViews.get(headComponent.getRef());
+ if( header != null){
+ //already there
+ header.bringToFront();
+ }else {
+ mHeaderViews.put(headComponent.getRef(), headerView);
+ //record translation, it should not change after transformation
+ final float translationX = headerView.getTranslationX();
+ final float translationY = headerView.getTranslationY();
+ headComponent.removeSticky();
+ mParent.post(WXThread.secure(new Runnable() {
+ @Override
+ public void run() {
+ ViewGroup existedParent;
+ if ((existedParent = (ViewGroup) headerView.getParent()) != null) {
+ existedParent.removeView(headerView);
+ }
+ mParent.addView(headerView);
+ //recover translation, sometimes it will be changed on fling
+ headerView.setTranslationX(translationX);
+ headerView.setTranslationY(translationY);
+ }
+ }));
+ }
+ }
+
+ public void notifyStickyRemove(WXCell compToRemove) {
+ if (compToRemove == null)
+ return;
+ final WXCell component = mHeaderComps.remove(compToRemove.getRef());
+ final View headerView = mHeaderViews.remove(compToRemove.getRef());
+
+
+ if(component == null || headerView == null){
+ WXLogUtils.e(" sticky header to remove not found."+compToRemove.getRef());
+ return;
+ }
+ if(mCurrentStickyRef != null && mCurrentStickyRef.equals(compToRemove.getRef())){
+ mCurrentStickyRef = null;
+ }
+ mParent.post(WXThread.secure(new Runnable() {
+ @Override
+ public void run() {
+ mParent.removeView(headerView);
+ component.recoverySticky();
+ }
+ }));
+ }
+
+
+ public void updateStickyView(int currentStickyPos) {
+ Iterator<Map.Entry<String, WXCell>> iterator = mHeaderComps.entrySet().iterator();
+ List<WXCell> toRemove = new ArrayList<>();
+ while(iterator.hasNext()){
+ Map.Entry<String, WXCell> next = iterator.next();
+ WXCell cell = next.getValue();
+ int pos = cell.getScrollPositon();
+ if(pos > currentStickyPos){
+ toRemove.add(cell);
+ }else if(pos == currentStickyPos){
+ mCurrentStickyRef = cell.getRef();
+ View view = mHeaderViews.get(cell.getRef());
+ if(view != null){
+ view.bringToFront();
+ }
+ }
+ }
+ for(WXCell cell:toRemove){
+ notifyStickyRemove(cell);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dded7ab6/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
index cf9419d..325a220 100755
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/list/WXCell.java
@@ -230,6 +230,9 @@ public class WXCell extends WXVContainer<WXFrameLayout> {
private View mHeadView;
private boolean mLazy = true;
+ /** used in list sticky detect **/
+ private int mScrollPositon = -1;
+
@Deprecated
public WXCell(WXSDKInstance instance, WXDomObject dom, WXVContainer parent, String instanceId, boolean isLazy) {
@@ -274,6 +277,14 @@ public class WXCell extends WXVContainer<WXFrameLayout> {
mLastLocationY = l;
}
+ void setScrollPositon(int pos){
+ mScrollPositon = pos;
+ }
+
+ public int getScrollPositon() {
+ return mScrollPositon;
+ }
+
@Override
public ViewGroup getRealView() {
return mRealView;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dded7ab6/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java
index 1e6968c..48fba16 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/refresh/wrapper/BounceRecyclerView.java
@@ -207,29 +207,27 @@ package com.taobao.weex.ui.view.refresh.wrapper;
import android.content.Context;
import android.support.annotation.Nullable;
import android.view.MotionEvent;
-import android.view.View;
-import android.view.ViewGroup;
import com.taobao.weex.common.WXThread;
-import com.taobao.weex.ui.component.WXComponent;
import com.taobao.weex.ui.component.list.ListComponentView;
+import com.taobao.weex.ui.component.list.StickyHeaderHelper;
import com.taobao.weex.ui.component.list.WXCell;
import com.taobao.weex.ui.view.gesture.WXGesture;
import com.taobao.weex.ui.view.gesture.WXGestureObservable;
import com.taobao.weex.ui.view.listview.WXRecyclerView;
import com.taobao.weex.ui.view.listview.adapter.RecyclerViewBaseAdapter;
-import java.util.Stack;
-
public class BounceRecyclerView extends BaseBounceView<WXRecyclerView> implements ListComponentView,WXGestureObservable {
+ public static final int DEFAULT_COLUMN_COUNT = 1;
+ public static final int DEFAULT_COLUMN_GAP = 1;
private RecyclerViewBaseAdapter adapter = null;
- private Stack<View> headerViewStack = new Stack<>();
- private Stack<WXCell> headComponentStack = new Stack<>();
private WXGesture mGesture;
private int mLayoutType = WXRecyclerView.TYPE_LINEAR_LAYOUT;
- private int mColumnCount = 1;
- private float mColumnGap = 1;
+ private int mColumnCount = DEFAULT_COLUMN_COUNT;
+ private float mColumnGap = DEFAULT_COLUMN_GAP;
+ private StickyHeaderHelper mStickyHeaderHelper;
+
@Override
public boolean postDelayed(Runnable action, long delayMillis) {
@@ -242,11 +240,11 @@ public class BounceRecyclerView extends BaseBounceView<WXRecyclerView> implement
mColumnCount = columnCount;
mColumnGap = columnGap;
init(context);
+ mStickyHeaderHelper = new StickyHeaderHelper(this);
}
+
public BounceRecyclerView(Context context,int type,int orientation) {
- super(context, orientation);
- mLayoutType = type;
- init(context);
+ this(context,type, DEFAULT_COLUMN_COUNT, DEFAULT_COLUMN_GAP,orientation);
}
public void setRecyclerViewBaseAdapter(RecyclerViewBaseAdapter adapter) {
@@ -294,104 +292,24 @@ public class BounceRecyclerView extends BaseBounceView<WXRecyclerView> implement
* @param component
*/
public void notifyStickyShow(WXCell component) {
- if (component == null)
- return;
- if (!headComponentStack.isEmpty()) {
- WXCell oldCom = headComponentStack.pop();
- if (!oldCom.getRef().equals(component.getRef())) {
- headComponentStack.push(oldCom);
- headComponentStack.push(component);
- showSticky();
- } else {
- headComponentStack.push(oldCom);
- return;
- }
- } else {
- headComponentStack.push(component);
- showSticky();
- }
+ mStickyHeaderHelper.notifyStickyShow(component);
}
@Override
- public void updateStickyView() {
- if (!headComponentStack.isEmpty()) {
- WXCell header = headComponentStack.peek();
- header.getRealView().bringToFront();
- }
- }
-
- /**
- * @param component
- */
- public void notifyStickyRemove(WXCell component) {
- if (component == null)
- return;
- if (!headComponentStack.isEmpty() && !headerViewStack.isEmpty()) {
- removeSticky(component);
- }
+ public void updateStickyView(int currentStickyPos) {
+ mStickyHeaderHelper.updateStickyView(currentStickyPos);
}
/**
- * Pop stickyView to stack
+ *
+ * @param compToRemove
*/
- private void showSticky() {
- WXCell headComponent = headComponentStack.pop();
- headComponentStack.push(headComponent);
- final View headerView = headComponent.getRealView();
- if (headerView == null)
- return;
- headerViewStack.push(headerView);
- //record translation, it should not change after transformation
- final float translationX = headerView.getTranslationX();
- final float translationY = headerView.getTranslationY();
- headComponent.removeSticky();
- post(WXThread.secure(new Runnable() {
- @Override
- public void run() {
- ViewGroup existedParent;
- if((existedParent = (ViewGroup)headerView.getParent())!= null){
- existedParent.removeView(headerView);
- }
- addView(headerView,getChildCount()-1);
- //recover translation, sometimes it will be changed on fling
- headerView.setTranslationX(translationX);
- headerView.setTranslationY(translationY);
- }
- }));
+ @Override
+ public void notifyStickyRemove(WXCell compToRemove) {
+ mStickyHeaderHelper.notifyStickyRemove(compToRemove);
}
- /**
- * remove top stickyView
- * @param component
- */
- private void removeSticky(WXComponent component) {
- final WXCell headComponent = headComponentStack.pop();
- if (!component.getRef().equals(headComponent.getRef())) {
- headComponentStack.push(headComponent);
- return;
- }
- final View headerView = headerViewStack.pop();
- post(WXThread.secure(new Runnable() {
- @Override
- public void run() {
- removeView(headerView);
- headComponent.recoverySticky();
- }
- }));
- }
- /**
- * Clear All Sticky of stack
- */
- public void clearSticky() {
- int size = headComponentStack.size();
- while (size > 0 && headerViewStack.size() == size) {
- WXCell headComponent = headComponentStack.pop();
- View headerView = headerViewStack.pop();
- ((ViewGroup) getParent()).removeView(headerView);
- headComponent.recoverySticky();
- }
- }
@Override
public void registerGestureListener(@Nullable WXGesture wxGesture) {