yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hj' into dev_merge_shunyi_vr_map

Browse Source
This commit is contained in:
liujing
2020-12-14 14:46:05 +08:00
parent 9db6d9e821 dbf76f50b6
commit 9776b07182
7 changed files with 59 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
View File

@@ -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<V2XEventShowEntity> {
mExploreWay.getPoiType(),
3);
}
delayedCloseWindow();
if (!V2XServiceManager.getMoGoStatusManager().isVrMode()) {
delayedCloseWindow();
} else {
mIIllegalParkingUnLike.setClickable(false);
}
}
}

2
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/test/V2XTestConsoleWindow.java
View File

@@ -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<List<MarkerExploreWay>> v2XMessageEntity =
TestOnLineCarUtils.getV2XIllegalParkData();

12
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java
View File

@@ -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);
}
});
}

16
modules/mogo-module-v2x/src/main/res/anim/v2x_unlike_heart_scale_ani_vr.xml Normal file
View File

@@ -0,0 +1,16 @@
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="2000">
<scale
android:fromXScale="1.0"
android:fromYScale="1.0"
android:pivotX="50%"
android:pivotY="50%"
android:repeatCount="0"
android:toXScale="4"
android:toYScale="4"></scale>
<alpha
android:fromAlpha="1.4"
android:repeatCount="0"
android:toAlpha="0.0"></alpha>
</set>

BIN
modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_icon_unlike_animation_vr.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

10
modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking_vr.xml
View File

@@ -9,13 +9,13 @@
android:paddingEnd="@dimen/dp_62">
<ImageView
android:id="@+id/leftImageView"
android:layout_width="@dimen/dp_120"
android:layout_height="@dimen/dp_120"
android:id="@+id/leftImageView"
android:src="@drawable/bg_v2x_red_two_round_vr"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:src="@drawable/bg_v2x_red_two_round_vr"/>
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivIconP"
@@ -23,9 +23,9 @@
android:layout_height="@dimen/module_v2x_event_icon_size_vr"
android:src="@drawable/icon_illegal_parking"
app:layout_constraintBottom_toBottomOf="@+id/leftImageView"
app:layout_constraintEnd_toEndOf="@+id/leftImageView"
app:layout_constraintStart_toStartOf="@+id/leftImageView"
app:layout_constraintTop_toTopOf="@+id/leftImageView"
app:layout_constraintEnd_toEndOf="@+id/leftImageView"/>
app:layout_constraintTop_toTopOf="@+id/leftImageView" />
<TextView
android:id="@+id/tagEventType"

19
modules/mogo-module-v2x/src/main/res/layout/view_heart_unlike_vr.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/llIllegalParkingUnLike"
android:layout_width="@dimen/module_v2x_event_button_size"
android:layout_height="@dimen/module_v2x_event_button_size"
@@ -10,5 +10,20 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/module_common_unlike_vr" />
</LinearLayout>
<ImageView
android:id="@+id/animationImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/ivIllegalParkingUnpaLike"
android:layout_alignTop="@+id/ivIllegalParkingUnLike"
android:layout_alignEnd="@+id/ivIllegalParkingUnLike"
android:layout_alignBottom="@+id/ivIllegalParkingUnLike"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="9dp"
android:layout_marginBottom="10dp"
android:visibility="invisible"
android:src="@drawable/v2x_icon_unlike_animation_vr" />
</RelativeLayout>