Merge branch 'kk' into dev_merge_shunyi_vr_map

This commit is contained in:
liujing
2020-12-13 11:22:26 +08:00
4 changed files with 12 additions and 2 deletions

View File

@@ -55,7 +55,7 @@ public class HeartLikeView extends LinearLayout implements Animator.AnimatorList
isAnimator = true;
if (mAnimatorSet == null) {
mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
R.anim.v2x_like_heart_animation);
V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.anim.v2x_like_heart_animation_vr : R.anim.v2x_like_heart_animation);
mAnimatorSet.setTarget(mIllegalParkingLike);
mAnimatorSet.addListener(this);
}

View File

@@ -45,7 +45,9 @@ public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorLi
isAnimator = true;
if (mAnimatorSet == null) {
mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(), R.anim.v2x_unlike_heart_animation);
mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
V2XServiceManager.getMoGoStatusManager().isVrMode() ?
R.anim.v2x_unlike_heart_animation_vr : R.anim.v2x_unlike_heart_animation);
mAnimatorSet.setTarget(mIllegalParkingUnLike);
mAnimatorSet.addListener(this);
}

View File

@@ -0,0 +1,4 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:ordering="sequentially">
</set>

View File

@@ -0,0 +1,4 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:ordering="sequentially">
</set>