修正卡片排序问题

Author: bruce3x

…/cardstackview/AnimatorListenerImpl.java …rdstackview/AnimationCancelListener.javacardstackview/src/main/java/me/brucezz/cardstackview/AnimatorListenerImpl.java renamed to cardstackview/src/main/java/me/brucezz/cardstackview/AnimationCancelListener.java cardstackview/src/main/java/me/brucezz/cardstackview/AnimatorListenerImpl.java renamed to cardstackview/src/main/java/me/brucezz/cardstackview/AnimationCancelListener.java

@@ -8,11 +8,11 @@
  * Email: [email protected]
  */
 
-public class AnimatorListenerImpl implements Animator.AnimatorListener {
+public class AnimationCancelListener implements Animator.AnimatorListener {
     private CardHolder mRunning;
     private CardHolder mDragging;
 
-    public AnimatorListenerImpl(CardHolder running, CardHolder dragging) {
+    public AnimationCancelListener(CardHolder running, CardHolder dragging) {
         mRunning = running;
         mDragging = dragging;
     }

cardstackview/src/main/java/me/brucezz/cardstackview/CardAdapter.java

@@ -32,6 +32,16 @@ public abstract class CardAdapter {
      */
     public abstract int getMinCardSpan();
 
+    /**
+     * 获取卡片的排序位置
+     * 如 原始第 1 张卡片，现在要摆放在第 3 的位置
+     * 则 getOrder(1) return 3;
+     *
+     * @param position 原始卡片的位置
+     * @return 当前排序所处的位置
+     */
+    public abstract int getOrder(int position);
+
     private final DataSetObservable mObservable = new DataSetObservable();
 
     public final void notifyDataSetChanged() {

cardstackview/src/main/java/me/brucezz/cardstackview/CardFactory.java

@@ -4,6 +4,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -17,14 +18,23 @@ public class CardFactory {
     private ArrayList<CardHolder> mCardHolders = new ArrayList<>();
 
     private Options mOptions;
+    private ViewGroup mParent;
 
-    public CardFactory(ViewGroup parent, Options options) {
+    public CardFactory(ViewGroup parent, Options options, int count) {
+        mParent = parent;
         mOptions = options;
-        for (int i = 0; i < parent.getChildCount(); i++) {
-            mCardHolders.add(new CardHolder(parent, parent.getChildAt(i), i, mOptions));
+        for (int i = 0; i < count; i++) {
+            mCardHolders.add(null);// 添加 null 占位
         }
     }
 
+    public void add(int orderIndex, int childIndex, View child) {
+        if (mCardHolders.size() > orderIndex && mCardHolders.get(orderIndex) != null) {
+            throw new IllegalArgumentException("You have put a card to order #%d" + orderIndex);
+        }
+        mCardHolders.set(orderIndex, new CardHolder(mParent, child, childIndex, orderIndex, mOptions));
+    }
+
     public int size() {
         return mCardHolders.size();
     }
@@ -84,11 +94,12 @@ public void swapRealIndex(int one, int another) {
     }
 
     public List<Integer> getAllPosition() {
-        List<Integer> all = new ArrayList<>();
-        for (CardHolder holder : mCardHolders) {
-            all.add(holder.mChildIndex);
+        Integer[] orders = new Integer[mCardHolders.size()];
+        for (int i = 0; i < mCardHolders.size(); i++) {
+            int childIndex = mCardHolders.get(i).mChildIndex;
+            orders[childIndex] = i;
         }
 
-        return all;
+        return Arrays.asList(orders);
     }
 }

cardstackview/src/main/java/me/brucezz/cardstackview/CardHolder.java

@@ -43,12 +43,12 @@ public class CardHolder {
 
     public Options mOptions;
 
-    public CardHolder(ViewGroup parent, View view, int childIndex, Options options) {
+    public CardHolder(ViewGroup parent, View view, int childIndex, int realIndex, Options options) {
         this.mParent = parent;
         this.mView = view;
         this.mChildIndex = childIndex;
-        this.mRealIndex = childIndex;
-        this.mDrawOrder = childIndex;
+        this.mRealIndex = realIndex;
+        this.mDrawOrder = realIndex;
         this.mOptions = options;
     }
 
@@ -84,10 +84,8 @@ public void reset() {
         final int start = this.mView.getTop();
         final int end = getFixedTop();
 
-        //Log.d(TAG, String.format("reset: View %s reset to %d", this.mView.getTag(), this.mRealIndex));
-
         mRunningAnimator = ValueAnimator.ofFloat(0f, 1f).setDuration(mOptions.CARD_RESET_DURATION);
-        mRunningAnimator.addUpdateListener(new AnimatorUpdateListenerImpl(this, null, start, end, end));
+        mRunningAnimator.addUpdateListener(new ViewUpdateListener(this, null, start, end, end));
         mRunningAnimator.start();
     }
 
@@ -96,7 +94,6 @@ public void reset() {
      */
     private void checkIfAnimatorRunning() {
         if (isAnimating()) {
-            //Log.w(TAG, String.format("checkIfAnimatorRunning: card #%d is animating!", mRealIndex));
             mRunningAnimator.cancel();
         }
     }
@@ -156,11 +153,10 @@ public void onSwap(final CardHolder dragging) {
 
         mDrawOrderUpdated = false;
 
-        //Log.d(TAG, "onSwap: start=" + start + ", mid=" + mid + ", end=" + end);
         mRunningAnimator = ValueAnimator.ofFloat(0f, 1f);
         mRunningAnimator.setDuration(mOptions.CARD_SWAP_DURATION);
-        mRunningAnimator.addUpdateListener(new AnimatorUpdateListenerImpl(this, dragging, start, mid, end));
-        mRunningAnimator.addListener(new AnimatorListenerImpl(this, dragging));
+        mRunningAnimator.addUpdateListener(new ViewUpdateListener(this, dragging, start, mid, end));
+        mRunningAnimator.addListener(new AnimationCancelListener(this, dragging));
         mRunningAnimator.setInterpolator(new OvershootInterpolator(1f));
         mRunningAnimator.start();
     }
@@ -181,7 +177,7 @@ public void onSelect() {
         final int end = start - mOptions.CARD_FLOAT_UP;
 
         mRunningAnimator = ValueAnimator.ofFloat(0f, 1f).setDuration(mOptions.CARD_FLOAT_DURATION);
-        mRunningAnimator.addUpdateListener(new AnimatorUpdateListenerImpl(this, null, start, end, end));
+        mRunningAnimator.addUpdateListener(new ViewUpdateListener(this, null, start, end, end));
         mRunningAnimator.start();
     }
 }

cardstackview/src/main/java/me/brucezz/cardstackview/CardStackView.java

@@ -70,17 +70,17 @@ public CardStackView(Context context, AttributeSet attrs, int defStyleAttr) {
 
     private void initViews() {
         mOptions = new Options();
+        mCardFactory = new CardFactory(this, mOptions, mCardAdapter.getItemCount());
 
         for (int i = 0; i < mCardAdapter.getItemCount(); i++) {
-            addView(mCardAdapter.getView(null, i, this));
+            View child = mCardAdapter.getView(null, i, this);
+            this.addView(child);
+            mCardFactory.add(mCardAdapter.getOrder(i), i, child);
         }
 
         mSlidingResistanceCalculator = new SlidingResistanceCalculator(2000f, mOptions.CARD_SPAN_OFFSET);
 
         updateOptions();
-
-        mCardFactory = new CardFactory(this, mOptions);
-        //Log.d(TAG, "init: " + mCardAdapter.getItemCount());
     }
 
     private void initTouchCallback() {
@@ -122,8 +122,6 @@ public int getOrderedChildIndex(int index) {
             public void onViewPositionChanged(View changedView, int left, int top, int dx, int dy) {
                 if (changedView != mSelected.mView) return;
 
-                //Log.d(TAG, String.format("onViewPositionChanged: left=%d, top=%d, dx=%d, dy=%d", left, top, dx, dy));
-
                 CardHolder holder = mCardFactory.findByView(changedView);
                 if (holder == null) return;
 
@@ -344,6 +342,10 @@ public interface OnCardClickListener {
     }
 
     public interface OnPositionChangedListener {
+        /**
+         * @param position 原始卡片对应当前排序的位置
+         *                 如原始第 1 张卡片现在排在第 3 个，则 position.get(1) = 3
+         */
         void onPositionChanged(List<Integer> position);
     }
 

…tackview/AnimatorUpdateListenerImpl.java …zz/cardstackview/ViewUpdateListener.javacardstackview/src/main/java/me/brucezz/cardstackview/AnimatorUpdateListenerImpl.java renamed to cardstackview/src/main/java/me/brucezz/cardstackview/ViewUpdateListener.java cardstackview/src/main/java/me/brucezz/cardstackview/AnimatorUpdateListenerImpl.java renamed to cardstackview/src/main/java/me/brucezz/cardstackview/ViewUpdateListener.java

@@ -8,13 +8,13 @@
  * Email: [email protected]
  */
 
-public class AnimatorUpdateListenerImpl implements ValueAnimator.AnimatorUpdateListener {
+public class ViewUpdateListener implements ValueAnimator.AnimatorUpdateListener {
 
     private CardHolder mRunning;
     private CardHolder mDragging;
     private int mStart, mMid, mEnd;
 
-    public AnimatorUpdateListenerImpl(CardHolder running, CardHolder dragging, int start, int mid, int end) {
+    public ViewUpdateListener(CardHolder running, CardHolder dragging, int start, int mid, int end) {
         mRunning = running;
         mDragging = dragging;
         mStart = start;

sample/src/main/java/me/brucezz/sample/MainActivity.java

@@ -4,12 +4,15 @@
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.ColorInt;
+import android.support.v4.util.Pair;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.CardView;
 import android.support.v7.widget.Toolbar;
-import android.util.Log;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -26,9 +29,10 @@ public class MainActivity extends AppCompatActivity {
 
     CardStackView mCardStackView;
     SimpleCardAdapter mCardAdapter;
-    private List<Card> mCards;
+    private List<Pair<Integer, Card>> mCards;
 
     private AnimationHelper mHelper;
+    private SharedPreferences mPreferences;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -51,19 +55,40 @@ public void onPositionChanged(List<Integer> position) {
                 for (Integer integer : position) {
                     sb.append(integer).append(" ");
                 }
-                Log.d("TAG", "onPositionChanged: " + sb.toString());
+                mPreferences.edit().putString("order", sb.toString()).apply();
             }
         });
 
-        mCards = fakeCards();
+        mPreferences = PreferenceManager.getDefaultSharedPreferences(MainActivity.this);
+        String order = mPreferences.getString("order", "");
+        int[] orders;
+        if (TextUtils.isEmpty(order)) {
+            orders = new int[] { 0, 1, 2, 3 };
+        } else {
+            String[] ordersArr = order.trim().split(" ");
+            orders = new int[ordersArr.length];
+            for (int i = 0; i < ordersArr.length; i++) {
+                orders[i] = Integer.valueOf(ordersArr[i]);
+            }
+        }
+        mCards = initCards(orders);
         mCardAdapter = new SimpleCardAdapter(this, mCards);
 
         mCardStackView.setAdapter(mCardAdapter);
+
+        mToolbar.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                System.out.println(mPreferences.getString("order", ""));
+            }
+        });
     }
 
-    private List<Card> fakeCards() {
-        return Arrays.asList(new Card(0xFF2196F3, R.drawable.post, "动态"), new Card(0xFF17B084, R.drawable.task, "任务"),
-            new Card(0xFFE85D72, R.drawable.calendar, "日程"), new Card(0xFF00BACF, R.drawable.knowledge, "知识"));
+    private List<Pair<Integer, Card>> initCards(int... orders) {
+        return Arrays.asList(Pair.create(orders[0], new Card(0xFF00BACF, R.drawable.knowledge, "知识")),
+            Pair.create(orders[1], new Card(0xFFE85D72, R.drawable.calendar, "日程")),
+            Pair.create(orders[2], new Card(0xFF17B084, R.drawable.task, "任务")),
+            Pair.create(orders[3], new Card(0xFF2196F3, R.drawable.post, "动态")));
     }
 
     private void toggleAnimation(final View view, final int index) {
@@ -129,7 +154,7 @@ public AnimationHelper(View view, int index) {
             endRadius = 1f;// radius 减到 0 会自动产生透明度变化
 
             startColor = getResources().getColor(R.color.colorPrimaryDark);
-            endColor = mCards.get(mIndex).mBgColor;
+            endColor = mCards.get(mIndex).second.mBgColor;
 
             startElevation = mCardView.getMaxCardElevation();
             endElevation = 0f;
@@ -186,7 +211,7 @@ public void onAnimationEnd(Animator animation) {
                         mFoo.animate().alpha(1f).setDuration(ANIMATION_DURATION_ALPHA).start();
                     } else {
                         Intent intent = new Intent(MainActivity.this, DetailActivity.class);
-                        intent.putExtra("card", mCards.get(mIndex));
+                        intent.putExtra("card", mCards.get(mIndex).second);
                         startActivityForResult(intent, REQ_DETAIL);
                         overridePendingTransition(0, 0);
                     }

sample/src/main/java/me/brucezz/sample/SimpleCardAdapter.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.os.Build;
+import android.support.v4.util.Pair;
 import android.support.v7.widget.CardView;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,16 +21,16 @@
 public class SimpleCardAdapter extends CardAdapter {
 
     private Context mContext;
-    private List<Card> mCards;
+    private List<Pair<Integer, Card>> mCards;
 
-    public SimpleCardAdapter(Context context, List<Card> cards) {
+    public SimpleCardAdapter(Context context, List<Pair<Integer, Card>> cards) {
         mContext = context;
         mCards = cards;
     }
 
     @Override
     public View getView(View oldView, int position, ViewGroup parent) {
-        Card card = mCards.get(position);
+        Card card = mCards.get(position).second;
 
         ViewHolder holder;
         View view;
@@ -70,6 +71,11 @@ public int getMinCardSpan() {
         return mContext.getResources().getDimensionPixelSize(R.dimen.card_span_min);
     }
 
+    @Override
+    public int getOrder(int position) {
+        return mCards.get(position).first;
+    }
+
     private static class ViewHolder {
         CardView mCardView;
         TextView mTextView;