Skip to content

Commit c2d53a9

Browse files
committed
1 parent 35f56dd commit c2d53a9

1 file changed

Lines changed: 0 additions & 53 deletions

File tree

library/WheelPicker/src/main/java/cn/qqtheme/framework/picker/WheelPicker.java

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
package cn.qqtheme.framework.picker;
22

3-
import android.animation.Animator;
4-
import android.animation.AnimatorSet;
5-
import android.animation.ObjectAnimator;
63
import android.app.Activity;
74
import android.support.annotation.ColorInt;
85
import android.support.annotation.FloatRange;
96
import android.support.annotation.IntRange;
107
import android.support.annotation.Nullable;
118
import android.view.View;
129
import android.view.ViewGroup;
13-
import android.view.animation.AccelerateInterpolator;
1410
import android.widget.TextView;
1511

1612
import cn.qqtheme.framework.popup.ConfirmPopup;
@@ -23,7 +19,6 @@
2319
* @since 2015/12/22
2420
*/
2521
public abstract class WheelPicker extends ConfirmPopup<View> {
26-
protected static final int DURATION = 500;//动画延时,单位为毫秒
2722
protected float lineSpaceMultiplier = WheelView.LINE_SPACE_MULTIPLIER;
2823
protected int padding = WheelView.TEXT_PADDING;
2924
protected int textSize = WheelView.TEXT_SIZE;
@@ -216,52 +211,4 @@ protected TextView createLabelView() {
216211
return labelView;
217212
}
218213

219-
@Override
220-
protected void showAfter() {
221-
super.showAfter();
222-
View view = getRootView();
223-
//使用透明渐变位移动画,缓解选中项显示跳动问题
224-
ObjectAnimator alpha = ObjectAnimator.ofFloat(view, "alpha", 0, 1);
225-
ObjectAnimator translation = ObjectAnimator.ofFloat(view, "translationY", 300, 0);
226-
AnimatorSet animatorSet = new AnimatorSet();
227-
animatorSet.playTogether(alpha, translation);
228-
animatorSet.setDuration(DURATION);
229-
animatorSet.setInterpolator(new AccelerateInterpolator());
230-
animatorSet.start();
231-
}
232-
233-
234-
@Override
235-
public void dismiss() {
236-
View view = getRootView();
237-
AnimatorSet animatorSet = new AnimatorSet();
238-
ObjectAnimator alpha = ObjectAnimator.ofFloat(view, "alpha", 1, 0);
239-
ObjectAnimator translation = ObjectAnimator.ofFloat(view, "translationY", 0, 300);
240-
animatorSet.playTogether(alpha, translation);
241-
animatorSet.setDuration(DURATION);
242-
animatorSet.setInterpolator(new AccelerateInterpolator());
243-
animatorSet.addListener(new Animator.AnimatorListener() {
244-
@Override
245-
public void onAnimationStart(Animator animation) {
246-
247-
}
248-
249-
@Override
250-
public void onAnimationEnd(Animator animation) {
251-
dismissImmediately();
252-
}
253-
254-
@Override
255-
public void onAnimationCancel(Animator animation) {
256-
257-
}
258-
259-
@Override
260-
public void onAnimationRepeat(Animator animation) {
261-
262-
}
263-
});
264-
animatorSet.start();
265-
}
266-
267214
}

0 commit comments

Comments
 (0)