Skip to content

Commit

Permalink
ExtendedPropertyAnimator.setTag和ExtendedPropertyAnimator.getTag方法改为se…
Browse files Browse the repository at this point in the history 
…tDesc和getDesc
  • Loading branch information
@zj565061763
zj565061763 committed May 29, 2018
1 parent caccca9 commit be3e563
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 42 deletions.
28 changes: 14 additions & 14 deletions app/src/main/java/com/fanwe/www/animator/CarDemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,35 +74,35 @@ public void onclickStart(View v)

mAnimatorChain.currentNode()
.rotation(-360).setRepeatCount(-1).setDuration(1000)
.addListener(new OnEndReset(), new OnEndInvisible()).setTag("下-前轮旋转")
.addListener(new OnEndReset(), new OnEndInvisible()).setDesc("下-前轮旋转")
.withClone().setTarget(iv_down_car_back_tyre)
.addListener(new OnEndReset(), new OnEndInvisible()).setTag("下-后轮旋转")
.addListener(new OnEndReset(), new OnEndInvisible()).setDesc("下-后轮旋转")

.with().setTarget(fl_down_car).moveToX(carDownX1, carDownX2)
.setDuration(1500).setInterpolator(new DecelerateInterpolator()).setTag("X右上角移动到屏幕中央")
.withClone().moveToY(carDownY1, carDownY2).setTag("Y右上角移动到屏幕中央")
.setDuration(1500).setInterpolator(new DecelerateInterpolator()).setDesc("X右上角移动到屏幕中央")
.withClone().moveToY(carDownY1, carDownY2).setDesc("Y右上角移动到屏幕中央")

.next().setDuration(500).setTag("屏幕中央停止500毫秒")
.next().setDuration(500).setDesc("屏幕中央停止500毫秒")

.next().moveToX(carDownX2, carDownX3)
.setDuration(1500).setInterpolator(new AccelerateInterpolator()).setTag("X屏幕中央移动到左下角")
.setDuration(1500).setInterpolator(new AccelerateInterpolator()).setDesc("X屏幕中央移动到左下角")
.withClone().moveToY(carDownY2, carDownY3)
.addListener(new OnEndInvisible(), new OnEndReset()).setTag("Y屏幕中央移动到左下角")
.addListener(new OnEndInvisible(), new OnEndReset()).setDesc("Y屏幕中央移动到左下角")

.next().setTarget(iv_up_car_front_tyre).rotation(360).setRepeatCount(-1).setDuration(1000)
.addListener(new OnEndReset(), new OnEndInvisible()).setTag("上-前轮旋转")
.addListener(new OnEndReset(), new OnEndInvisible()).setDesc("上-前轮旋转")
.withClone().setTarget(iv_up_car_back_tyre)
.addListener(new OnEndReset(), new OnEndInvisible()).setTag("上-后轮旋转")
.addListener(new OnEndReset(), new OnEndInvisible()).setDesc("上-后轮旋转")

.with().setTarget(fl_up_car).moveToX(carUpX1, carUpX2)
.setDuration(1500).setInterpolator(new DecelerateInterpolator()).setTag("X左下角移动到屏幕中央")
.withClone().moveToY(carUpY1, carUpY2).setTag("Y左下角移动到屏幕中央")
.setDuration(1500).setInterpolator(new DecelerateInterpolator()).setDesc("X左下角移动到屏幕中央")
.withClone().moveToY(carUpY1, carUpY2).setDesc("Y左下角移动到屏幕中央")

.next().setDuration(500).setTag("屏幕中央停止500毫秒")
.next().setDuration(500).setDesc("屏幕中央停止500毫秒")

.next().moveToX(carUpX2, carUpX3)
.setDuration(1500).setInterpolator(new AccelerateInterpolator()).setTag("X屏幕中央移动到右上角")
.withClone().moveToY(carUpY2, carUpY3).setTag("Y屏幕中央移动到右上角")
.setDuration(1500).setInterpolator(new AccelerateInterpolator()).setDesc("X屏幕中央移动到右上角")
.withClone().moveToY(carUpY2, carUpY3).setDesc("Y屏幕中央移动到右上角")
.addListener(new OnEndInvisible(fl_up_car), new OnEndReset(fl_up_car), new FAnimatorListener()
{
@Override
Expand Down
16 changes: 8 additions & 8 deletions app/src/main/java/com/fanwe/www/animator/RocketDemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public void onclickStart(View v)
return;
}
/**
* true-调试模式，会输出整个动画链的结构，方便开发调试，可以给每个节点动画设置tag，来加强描述
* true-调试模式，会输出整个动画链的结构，方便开发调试，可以给每个节点动画设置描述
*
* 过滤tag：AnimatorChain，demo中的日志输入如下：
*
Expand All @@ -64,10 +64,10 @@ public void onclickStart(View v)
mAnimatorChain = new FNodeAnimator(fl_rocket_root).chain().setDebug(true);

mAnimatorChain.currentNode()
.alpha(0, 1f).setDuration(500).setTag("火箭淡入")
.next().setDuration(500).setTag("延迟500毫秒")
.next().setTarget(tv_number).scaleX(1f, 0f).setRepeatCount(2).setDuration(1000).setTag("开始数字缩放X")
.withClone().scaleY(1f, 0f).setTag("开始数字缩放Y")
.alpha(0, 1f).setDuration(500).setDesc("火箭淡入")
.next().setDuration(500).setDesc("延迟500毫秒")
.next().setTarget(tv_number).scaleX(1f, 0f).setRepeatCount(2).setDuration(1000).setDesc("开始数字缩放X")
.withClone().scaleY(1f, 0f).setDesc("开始数字缩放Y")
.addListener(new FAnimatorListener()
{
@Override
Expand All @@ -93,7 +93,7 @@ public void onAnimationRepeat(Animator animation)
tv_number.setText(String.valueOf(mNumber));
}
})
.next().setTarget(fl_rocket_root).translationY(0, -getResources().getDisplayMetrics().heightPixels).setTag("火箭起飞")
.next().setTarget(fl_rocket_root).translationY(0, -getResources().getDisplayMetrics().heightPixels).setDesc("火箭起飞")
.setDuration(3000).setInterpolator(new AccelerateInterpolator())
.addListener(new OnEndInvisible(), new OnEndReset()) //动画结束隐藏，重置fl_rocket_root
.addListener(new FAnimatorListener()
Expand All @@ -114,8 +114,8 @@ public void onAnimationEnd(Animator animation)
animationDrawable.stop(); //停止火箭喷火动画
}
})
.with().setTarget(iv_rocket_smoke).alpha(0, 1f).setDuration(3000).setStartDelay(500).setTag("烟雾淡入")
.next().alpha(1f, 0).setDuration(500).setTag("烟雾淡出")
.with().setTarget(iv_rocket_smoke).alpha(0, 1f).setDuration(3000).setStartDelay(500).setDesc("烟雾淡入")
.next().alpha(1f, 0).setDuration(500).setDesc("烟雾淡出")
.addListener(new OnEndInvisible()) //动画结束隐藏烟雾
.chain().start();
}
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/com/fanwe/www/animator/SimpleDemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,11 @@ public void onClickBtnAnim(View v)
public void onClickBtnAnimInside(View v)
{
new FNodeAnimator(v)
.moveToX(new XCenterAligner(), v, view_target_1, view_target_2, view_target_3).setDuration(1500).setTag("x移动")
.withClone().moveToY(new YCenterAligner(), v, view_target_1, view_target_2, view_target_3).setTag("y移动")
.with().scaleX(v, view_target_1, view_target_2, view_target_3).setDuration(1500).setTag("x缩放")
.withClone().scaleY(v, view_target_1, view_target_2, view_target_3).setTag("y缩放")
.next().setDuration(500).setTag("延迟500毫秒")
.moveToX(new XCenterAligner(), v, view_target_1, view_target_2, view_target_3).setDuration(1500).setDesc("x移动")
.withClone().moveToY(new YCenterAligner(), v, view_target_1, view_target_2, view_target_3).setDesc("y移动")
.with().scaleX(v, view_target_1, view_target_2, view_target_3).setDuration(1500).setDesc("x缩放")
.withClone().scaleY(v, view_target_1, view_target_2, view_target_3).setDesc("y缩放")
.next().setDuration(500).setDesc("延迟500毫秒")
.addListener(new OnEndRemoveView()) //动画完成后移除view
.chain().setDebug(true).startAsPop(true);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/src/main/java/com/fanwe/lib/animator/AnimatorChain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public interface AnimatorChain extends Animator<AnimatorChain>
/**
* 设置是否调试模式
*
* @param debug true-调试模式，会输出整个动画链的结构，方便开发调试，可以给每个节点动画设置tag，来加强描述
* @param debug true-调试模式，会输出整个动画链的结构，方便开发调试
* @return
*/
AnimatorChain setDebug(boolean debug);
Expand Down
14 changes: 7 additions & 7 deletions lib/src/main/java/com/fanwe/lib/animator/BaseAnimator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
abstract class BaseAnimator<T extends ExtendedPropertyAnimator> implements ExtendedPropertyAnimator<T>
{
private ObjectAnimator mObjectAnimator = new ObjectAnimator();
private String mTag;
private String mDesc;

public BaseAnimator()
{
Expand Down Expand Up @@ -377,18 +377,18 @@ public T scaleY(View... views)
}

@Override
public T setTag(String tag)
public T setDesc(String desc)
{
mTag = tag;
mDesc = desc;
return (T) this;
}

@Override
public String getTag()
public String getDesc()
{
if (mTag == null)
mTag = "";
return mTag;
if (mDesc == null)
mDesc = "";
return mDesc;
}

private int[] mTargetLocation;
Expand Down
10 changes: 5 additions & 5 deletions lib/src/main/java/com/fanwe/lib/animator/ExtendedPropertyAnimator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,19 +70,19 @@ public interface ExtendedPropertyAnimator<T extends ExtendedPropertyAnimator> ex
T scaleY(View... views);

/**
* 设置tag
* 设置描述
*
* @param tag
* @param desc
* @return
*/
T setTag(String tag);
T setDesc(String desc);

/**
* 返回设置的tag{@link #setTag(String)}
* 返回设置的描述{@link #setDesc(String)}
*
* @return
*/
String getTag();
String getDesc();

interface Aligner
{
Expand Down
4 changes: 2 additions & 2 deletions lib/src/main/java/com/fanwe/lib/animator/SimpleAnimatorChain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ private void logIfNeed()

sb.append("(");

if (!TextUtils.isEmpty(item.getTag()))
sb.append(item.getTag()).append(" ");
if (!TextUtils.isEmpty(item.getDesc()))
sb.append(item.getDesc()).append(" ");

sb.append(item.getPropertyName()).append(":").append(String.valueOf(item.getDuration()));

Expand Down

0 comments on commit be3e563

Please sign in to comment.