Merge remote-tracking branch 'origin/dev_merge_shunyi_vr_map' into dev_merge_shunyi_vr_map

# Conflicts:
#	modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java

modules/mogo-module-common/src/main/res/drawable/module_common_like_vr.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/module_common_icon_like_vr" android:state_pressed="true" />
+    <item android:drawable="@drawable/module_common_icon_like_selected_vr" android:state_selected="true" />
+    <item android:drawable="@drawable/module_common_icon_like_vr" android:state_pressed="false" />
+    <item android:drawable="@drawable/module_common_icon_like_vr" />
+</selector>

modules/mogo-module-common/src/main/res/drawable/module_common_unlike_vr.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/module_common_icon_unlike_vr" android:state_pressed="false" />
+    <item android:drawable="@drawable/module_common_icon_unlike_vr" />
+
+</selector>

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

@@ -1,10 +1,13 @@
 package com.mogo.module.v2x.adapter.holder;
 
+import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XHistoryScenarioData;
@@ -95,11 +98,17 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder<V2XEventShowEntity> {
         mIlIllegalParkingLike.setOnClickCallListener(v -> {
             Logger.d(V2XConst.MODULE_NAME, "反馈有用");
             roadReportTrue();
+            if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+                mIlIllegalParkingLike.mIllegalParkingLike.setImageResource(R.drawable.module_common_icon_like_selected_vr);
+            }
         });
 
         mIIllegalParkingUnLike.setOnClickCallListener(v -> {
             Logger.d(V2XConst.MODULE_NAME, "反馈无用");
             roadReportErr();
+            if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
+                mIIllegalParkingUnLike.mIllegalParkingUnLike.setImageResource(R.drawable.module_common_icon_unlike_selected_vr);
+            }
         });
     }
 

modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java

@@ -24,7 +24,7 @@ import static com.mogo.module.v2x.V2XConst.VR_MODE;
  */
 public class HeartLikeView extends LinearLayout implements Animator.AnimatorListener {
 
-    private ImageView mIllegalParkingLike;
+    public ImageView mIllegalParkingLike;
     private AnimatorSet mAnimatorSet;
     private OnClickCallListener mOnClickCallListener;
 

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

@@ -23,7 +23,7 @@ import static com.mogo.module.v2x.V2XConst.VR_MODE;
  */
 public class HeartUnLikeView extends LinearLayout implements Animator.AnimatorListener {
 
-    private ImageView mIllegalParkingUnLike;
+    public ImageView mIllegalParkingUnLike;
     private AnimatorSet mAnimatorSet;
     private OnClickCallListener mOnClickCallListener;
     private boolean isAnimator = false;

modules/mogo-module-v2x/src/main/res/layout/view_heart_like_vr.xml

@@ -9,5 +9,5 @@
         android:id="@+id/ivIllegalParkingLike"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/v2x_event_icon_no_parking_like" />
+        android:src="@drawable/module_common_like_vr" />
 </LinearLayout>

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

@@ -9,6 +9,6 @@
         android:id="@+id/ivIllegalParkingUnLike"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/v2x_event_icon_no_parking_unlike" />
+        android:src="@drawable/module_common_unlike_vr" />
 </LinearLayout>