diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java index 5f6854cd3e..0dc3538584 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java @@ -26,6 +26,9 @@ import com.mogo.module.v2x.voice.V2XVoiceManager; import com.mogo.utils.logger.Logger; import com.mogo.utils.network.utils.GsonUtil; +import java.util.logging.Handler; +import java.util.logging.LogRecord; + import static com.mogo.module.v2x.V2XConst.MODULE_NAME; /** @@ -142,6 +145,10 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder { mExploreWay.getPoiType(), 3); } - delayedCloseWindow(); + if (!V2XServiceManager.getMoGoStatusManager().isVrMode()) { + delayedCloseWindow(); + } else { + mIIllegalParkingUnLike.setClickable(false); + } } } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java index a39d5056bc..7777ae5c59 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java @@ -3,6 +3,7 @@ package com.mogo.module.v2x.scenario.scene.test; import android.content.Context; import android.content.Intent; import android.util.AttributeSet; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.widget.Button; @@ -257,6 +258,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout { }); mBtnTriggerParkEvent.setOnClickListener(v -> { + Log.d("触发违章停车事件", "00"); V2XMessageEntity> v2XMessageEntity = TestOnLineCarUtils.getV2XIllegalParkData(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java index b361791431..9d7d45c720 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java @@ -5,7 +5,10 @@ import android.animation.AnimatorInflater; import android.animation.AnimatorSet; import android.content.Context; import android.util.AttributeSet; +import android.util.Log; import android.view.View; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import android.widget.ImageView; import android.widget.LinearLayout; @@ -26,6 +29,7 @@ public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorLi private AnimatorSet mAnimatorSet; private OnClickCallListener mOnClickCallListener; private boolean isAnimator = false; + private ImageView animationImageView; public HeartUnLikeView(Context context) { this(context, null); @@ -39,7 +43,7 @@ public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorLi super(context, attrs, defStyleAttr); inflate(context, V2XServiceManager.getMoGoStatusManager().isVrMode() ? R.layout.view_heart_unlike_vr : R.layout.view_heart_unlike, this); mIllegalParkingUnLike = findViewById(R.id.ivIllegalParkingUnLike); - + animationImageView = findViewById(R.id.animationImage); setOnClickListener(v -> { if (!isAnimator) { isAnimator = true; @@ -53,6 +57,12 @@ public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorLi } mAnimatorSet.start(); } + if (V2XServiceManager.getMoGoStatusManager().isVrMode()) { + animationImageView.setVisibility(View.VISIBLE); + Animation animation = AnimationUtils.loadAnimation(getContext(), R.anim.v2x_unlike_heart_scale_ani_vr); + animationImageView.startAnimation(animation); + animationImageView.setVisibility(View.GONE); + } }); } diff --git a/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml b/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml new file mode 100644 index 0000000000..383effa7da --- /dev/null +++ b/modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_unlike_animation_vr.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_unlike_animation_vr.png index e14d0188cb..41390407d8 100644 Binary files a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_unlike_animation_vr.png and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_unlike_animation_vr.png differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml index 837cf017c1..d3d819a99e 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml @@ -9,13 +9,13 @@ android:paddingEnd="@dimen/dp_62"> + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="@+id/leftImageView" /> - - + + +