修复4.3以下版本不能滑动的问题

luobl · luobl · commit b71b51109ab1 · 2014-09-05T13:36:36.000+08:00
diff --git a/readme.md b/readme.md
@@ -4,6 +4,8 @@
 3d卡片效果
 =======
 
+- 测试版本4.1.2，4.2.2，4.4.2可用
+
 ##使用
 
 
@@ -22,6 +24,6 @@
 ##问题
 
 - `CardView`高度设置为`wrap_content`卡片会显示不全。
-- `CardView`设置`padding`和`margin`，旋转动画会有被截断的效果。最后一张卡片距离顶部的距离时在CardView内部指定的，为固定值。
-- ……
+- `CardView`设置`padding`和`margin`，旋转动画会有被截断的效果。最后一张卡片距离顶部的距离是在CardView内部指定的，为固定值。
+- 测试2.3.2有严重bug（估计4.0版本之前都有此bug），不可用。
 
diff --git a/src/com/chiemy/cardview/TestFragment.java b/src/com/chiemy/cardview/TestFragment.java
@@ -18,6 +18,7 @@
 public class TestFragment extends Fragment{
 	private TextView tv;
 	private View root;
+	private View view;
 	
 	@Override
 	public View onCreateView(LayoutInflater inflater,
@@ -29,6 +30,7 @@ public View onCreateView(LayoutInflater inflater,
 	
 	private void initUI(final View root) {
 		root.setClickable(true);
+		root.setOnClickListener(null);
 		tv = (TextView) root.findViewById(R.id.textView);
 		root.findViewById(R.id.button).setOnClickListener(new OnClickListener() {
 			@Override
@@ -41,17 +43,19 @@ public void onClick(View v) {
 					public void onAnimationEnd(Animator animation) {
 						root.clearAnimation();
 						root.setVisibility(View.INVISIBLE);
+						view.setClickable(true);
 					}
 				});
 			}
 		});
 	}
 	
 	public void show(final View view,Bundle bundle){
+		this.view = view;
 		String text = bundle.getString("text");
 		tv.setText(text);
 		view.setClickable(false);
-		view.setRotationY(0);
+		ViewHelper.setRotationY(view, 0);
 		ViewHelper.setRotationY(root, -90);
 		root.setVisibility(View.VISIBLE);
 		
@@ -65,7 +69,6 @@ public void show(final View view,Bundle bundle){
 			@Override
 			public void onAnimationEnd(Animator animation) {
 				ViewHelper.setRotationY(view, 0);
-				view.setClickable(true);
 			}
 		});
 	}
diff --git a/src/com/chiemy/cardview/Utils.java b/src/com/chiemy/cardview/Utils.java
@@ -1,7 +1,9 @@
 package com.chiemy.cardview;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.util.DisplayMetrics;
+import android.view.View;
 
 public class Utils {
 	
@@ -36,5 +38,5 @@ public static float convertDpToPixel(Context context, float dp) {
 		float px = (float) (dp * (metrics.densityDpi / 160f));
 		return px;
 	}
-
+	
 }
diff --git a/src/com/chiemy/cardview/view/CardView.java b/src/com/chiemy/cardview/view/CardView.java
@@ -13,6 +13,7 @@
 import android.widget.FrameLayout;
 import android.widget.ListAdapter;
 
+import com.chiemy.cardview.Utils;
 import com.nineoldandroids.animation.Animator;
 import com.nineoldandroids.animation.AnimatorListenerAdapter;
 import com.nineoldandroids.view.ViewHelper;
@@ -25,7 +26,7 @@
 public class CardView extends FrameLayout{
 	private static final int ITEM_SPACE = 40;
 	private static final int DEF_MAX_VISIBLE = 4;
-	private static final int PADDING_TOP = 300;
+	private static final int PADDING_TOP = 20;
 	
 	private int mMaxVisible = DEF_MAX_VISIBLE;
 	private int itemSpace = ITEM_SPACE;
@@ -58,6 +59,7 @@ public CardView(Context context) {
 	}
 	
 	private void init() {
+		topRect = new Rect();
 		ViewConfiguration con = ViewConfiguration.get(getContext());
 		mTouchSlop = con.getScaledTouchSlop();
 	}
@@ -93,7 +95,6 @@ public void setAdapter(ListAdapter adapter) {
 		ensureFull();
 	}
 	
-	
 	public void setOnCardClickListener(OnCardClickListener listener) {
 		mListener = listener;
 	}
@@ -108,18 +109,17 @@ && getChildCount() < mMaxVisible) {
 			viewHolder.put(index, view);
 			
 			//添加剩余的View时，始终处在最后
-			if(mNextAdapterPosition >= mMaxVisible){
-				index = mMaxVisible - 1;
-			}
-			LayoutParams params = new LayoutParams(LayoutParams.MATCH_PARENT,LayoutParams.WRAP_CONTENT);
-			view.setLayoutParams(params);
+			index = Math.min(mNextAdapterPosition, mMaxVisible - 1);
 			ViewHelper.setScaleX(view, ((mMaxVisible - index - 1)/(float)mMaxVisible)*0.2f + 0.8f);
-			
 			int topMargin = (mMaxVisible - index - 1)*itemSpace + PADDING_TOP;
 			ViewHelper.setTranslationY(view, topMargin);
 			ViewHelper.setAlpha(view, mNextAdapterPosition == 0 ? 1 : 0.5f);
 			
-			addViewInLayout(view,0, params);
+			LayoutParams params = (LayoutParams) view.getLayoutParams();
+			if(params == null){
+				params = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+			}
+			addViewInLayout(view,0, params, true);
 			
 			mNextAdapterPosition += 1;
 		}
@@ -144,6 +144,7 @@ public boolean onTouchEvent(MotionEvent event) {
 		case MotionEvent.ACTION_MOVE:
 			if(!remove){
 				if(goDown()){
+					downY = -1;
 					remove = true;
 				}
 			}
@@ -157,10 +158,8 @@ public boolean onTouchEvent(MotionEvent event) {
 	 */
 	private boolean goDown() {
 		final View topView = getChildAt(getChildCount() - 1);
-		if(topRect == null){
-			topRect = new Rect();
-			topView.getHitRect(topRect);
-		}
+		//topView.getHitRect(topRect); 在4.3以前有bug，用以下方法代替
+		topRect = getHitRect(topRect, topView);
 		//如果按下的位置不在顶部视图上，则不移动
 		if(!topRect.contains((int)downX, (int)downY)){
 			return false;
@@ -237,6 +236,14 @@ public boolean onInterceptTouchEvent(MotionEvent ev) {
 		return super.onInterceptTouchEvent(ev);
 	}
 	
+	public static Rect getHitRect(Rect rect,View child){
+		rect.left = child.getLeft();
+		rect.right = child.getRight();
+		rect.top = (int) (child.getTop() + ViewHelper.getTranslationY(child));
+		rect.bottom = (int) (child.getBottom() + ViewHelper.getTranslationY(child));
+		return rect;
+	}
+	
 	private final DataSetObserver mDataSetObserver = new DataSetObserver() {
 		@Override
 		public void onChanged() {
@@ -253,7 +260,6 @@ public void onInvalidated() {
 		@Override
 		public void onClick(View v) {
 			if(mListener != null){
-				System.out.println(">>cardClick:" + topPosition);
 				mListener.onCardClick(v, topPosition);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,9 @@`
`1`	`1`	`package com.chiemy.cardview;`
`2`	`2`
`3`	`3`	`import android.content.Context;`
	`4`	`+import android.graphics.Rect;`
`4`	`5`	`import android.util.DisplayMetrics;`
	`6`	`+import android.view.View;`
`5`	`7`
`6`	`8`	`public class Utils {`
`7`	`9`
`@@ -36,5 +38,5 @@ public static float convertDpToPixel(Context context, float dp) {`
`36`	`38`	`float px = (float) (dp * (metrics.densityDpi / 160f));`
`37`	`39`	`return px;`
`38`	`40`	`}`
`39`		`-`
	`41`	`+`
`40`	`42`	`}`