修复部分bug

luobl · luobl · commit 3601bab5ac6e · 2014-09-11T12:59:33.000+08:00
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
@@ -11,6 +11,7 @@
         android:id="@+id/cardView1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:clipChildren="false"
         >
     </com.chiemy.cardview.view.CardView>
 	
diff --git a/src/com/chiemy/cardview/MainActivity.java b/src/com/chiemy/cardview/MainActivity.java
@@ -20,7 +20,6 @@
 public class MainActivity extends FragmentActivity implements OnCardClickListener{
 	List<String> list;
 	private TestFragment frag;
-	private View contentView;
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -37,7 +36,6 @@ private void initUI() {
 		adapter.addAll(initData());
 		cardView.setAdapter(adapter);
 		
-		contentView = findViewById(R.id.contentView);
 		FragmentManager manager = getSupportFragmentManager();
 		frag = new TestFragment();
 		manager.beginTransaction().add(R.id.contentView, frag).commit();
@@ -85,7 +83,6 @@ protected View getCardView(int position,
 			}
 			TextView tv = (TextView) convertView.findViewById(R.id.textView1);
 			String text = getItem(position%list.size());
-			System.out.println(">>>" + text);
 			tv.setText(text);
 			return convertView;
 		}
diff --git a/src/com/chiemy/cardview/TestFragment.java b/src/com/chiemy/cardview/TestFragment.java
@@ -30,7 +30,10 @@ public View onCreateView(LayoutInflater inflater,
 	
 	private void initUI(final View root) {
 		root.setClickable(true);
-		root.setOnClickListener(null);
+		root.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View v) {}
+		});
 		tv = (TextView) root.findViewById(R.id.textView);
 		root.findViewById(R.id.button).setOnClickListener(new OnClickListener() {
 			@Override
@@ -43,18 +46,18 @@ public void onClick(View v) {
 					public void onAnimationEnd(Animator animation) {
 						root.clearAnimation();
 						root.setVisibility(View.INVISIBLE);
-						view.setClickable(true);
+						view.setEnabled(true);
 					}
 				});
 			}
 		});
 	}
 	
 	public void show(final View view,Bundle bundle){
+		view.setEnabled(false);
 		this.view = view;
 		String text = bundle.getString("text");
 		tv.setText(text);
-		view.setClickable(false);
 		ViewHelper.setRotationY(view, 0);
 		ViewHelper.setRotationY(root, -90);
 		root.setVisibility(View.VISIBLE);
@@ -63,6 +66,7 @@ public void show(final View view,Bundle bundle){
 		.setDuration(300).setListener(null)
 		.setInterpolator(new AccelerateInterpolator());
 		
+		
 		ViewPropertyAnimator.animate(root)
 		.rotationY(0).setDuration(200).setStartDelay(300)
 		.setListener(new AnimatorListenerAdapter() {
diff --git a/src/com/chiemy/cardview/view/CardView.java b/src/com/chiemy/cardview/view/CardView.java
@@ -187,7 +187,7 @@ public boolean onTouchEvent(MotionEvent event) {
 	 */
 	private boolean goDown() {
 		final View topView = getChildAt(getChildCount() - 1);
-		if(!topView.isClickable()){
+		if(!topView.isEnabled()){
 			return false;
 		}
 		// topView.getHitRect(topRect); 在4.3以前有bug，用以下方法代替
@@ -196,7 +196,7 @@ private boolean goDown() {
 		if (!topRect.contains((int) downX, (int) downY)) {
 			return false;
 		}
-		topView.setClickable(false);
+		topView.setEnabled(false);
 		ViewPropertyAnimator anim = ViewPropertyAnimator
 				.animate(topView)
 				.translationY(
@@ -206,7 +206,7 @@ private boolean goDown() {
 		anim.setListener(new AnimatorListenerAdapter() {
 			@Override
 			public void onAnimationEnd(Animator animation) {
-				topView.setClickable(true);
+				topView.setEnabled(true);
 				removeView(topView);
 				ensureFull();
 				final int count = getChildCount();
@@ -248,12 +248,7 @@ private void bringToTop(final View view) {
 		float tranlateY = ViewHelper.getTranslationY(view) + itemSpace;
 		ViewPropertyAnimator.animate(view).translationY(tranlateY)
 				.scaleX(scaleX).setDuration(200).alpha(1)
-				.setInterpolator(new AccelerateInterpolator())
-				.setListener(null).setListener(new AnimatorListenerAdapter() {
-					public void onAnimationEnd(Animator animation) {
-						
-					}
-				});
+				.setInterpolator(new AccelerateInterpolator());
 	}
 
 	@Override

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`android:id="@+id/cardView1"`
`12`	`12`	`android:layout_width="match_parent"`
`13`	`13`	`android:layout_height="wrap_content"`
	`14`	`+ android:clipChildren="false"`
`14`	`15`	`>`
`15`	`16`	`</com.chiemy.cardview.view.CardView>`
`16`	`17`