diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index 473a491c0a..c655a5d009 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -190,6 +190,11 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     private TextView tvEnterVrMode;
     private TextView tvExitVrMode;
 
+    /**
+     * 内部变量标识是否在vrMode，用于方法执行过滤，避免重复或异常调用
+     */
+    private boolean localIsVrMode = false;
+
     private final Runnable mLockCarRunnable = new Runnable() {
         @Override
         public void run() {
@@ -330,6 +335,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         // 检查是否在vr模式
         if (mStatusManager.isVrMode()) {
             enterVrMode();
+            localIsVrMode = true;
         }
         etTimes = findViewById(R.id.etTimes);
         findViewById(R.id.btnFix).setOnClickListener(clickListener);
@@ -347,40 +353,47 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     private Group groupFix;
 
     private void enterVrMode() {
+        if(!localIsVrMode) {
 //        tvEnterVrMode.setVisibility(View.GONE);
-        mMove2CurrentLocation.setVisibility(View.GONE);
-        mUploadRoadCondition.setVisibility(View.GONE);
-        mWeatherContainer.setVisibility(View.GONE);
-        mMsgContainer.setVisibility(View.GONE);
-        groupUserHead.setVisibility(View.GONE);
+            mMove2CurrentLocation.setVisibility(View.GONE);
+            mUploadRoadCondition.setVisibility(View.GONE);
+            mWeatherContainer.setVisibility(View.GONE);
+            mMsgContainer.setVisibility(View.GONE);
+            groupUserHead.setVisibility(View.GONE);
 
 //        tvExitVrMode.setVisibility(View.VISIBLE);
-        TopViewAnimHelper.getInstance().enterVrMode();
-        TopViewNoLinkageAnimHelper.getInstance().enterVrMode();
-        mNaviInfo = vrModeNavInfoView;
-        adasNoticeHelper.enterVrMode();
-        mCameraLiveNoticeHelper.enterVrMode();
+            TopViewAnimHelper.getInstance().enterVrMode();
+            TopViewNoLinkageAnimHelper.getInstance().enterVrMode();
+            mNaviInfo = vrModeNavInfoView;
+            adasNoticeHelper.enterVrMode();
+            mCameraLiveNoticeHelper.enterVrMode();
 
-        MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoLocationListener(TAG, this);
+            MogoApisHandler.getInstance().getApis().getRegisterCenterApi().registerMogoLocationListener(TAG, this);
+
+            localIsVrMode = true;
+        }
     }
 
     private void exitVrMode() {
-        EntranceViewHolder.getInstance().forceHideNoticeView();
+        if(localIsVrMode) {
+            EntranceViewHolder.getInstance().forceHideNoticeView();
 //        tvEnterVrMode.setVisibility(View.VISIBLE);
-        mMove2CurrentLocation.setVisibility(View.VISIBLE);
-        mUploadRoadCondition.setVisibility(View.VISIBLE);
-        groupUserHead.setVisibility(View.VISIBLE);
+            mMove2CurrentLocation.setVisibility(View.VISIBLE);
+            mUploadRoadCondition.setVisibility(View.VISIBLE);
+            groupUserHead.setVisibility(View.VISIBLE);
 //        mWeatherContainer.setVisibility(View.VISIBLE);
 //        mMsgContainer.setVisibility(View.VISIBLE);
 
 //        tvExitVrMode.setVisibility(View.GONE);
-        TopViewAnimHelper.getInstance().exitVrMode();
-        TopViewNoLinkageAnimHelper.getInstance().exitVrMode();
-        mNaviInfo = animNavInfoView;
-        adasNoticeHelper.exitVrMode();
-        mCameraLiveNoticeHelper.exitVrMode();
+            TopViewAnimHelper.getInstance().exitVrMode();
+            TopViewNoLinkageAnimHelper.getInstance().exitVrMode();
+            mNaviInfo = animNavInfoView;
+            adasNoticeHelper.exitVrMode();
+            mCameraLiveNoticeHelper.exitVrMode();
 
-        MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoLocationListener(TAG);
+            MogoApisHandler.getInstance().getApis().getRegisterCenterApi().unregisterMogoLocationListener(TAG);
+            localIsVrMode = false;
+        }
     }
 
     private void debugCrashWarn() {
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
index fff8ed9203..3aeb34605d 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/live/PushCameraLiveWindow.java
@@ -28,9 +28,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
     private MogoImageView mIvReportHead;
     private ImageView pushVideoClose;
 
-    // 弹窗状态监听
-//    private CameraLiveWindowStatusListener mWindowStatusListener;
-
     // 直播30秒自动关闭
     private static Handler handlerV2XEvent = new Handler();
     private static Runnable runnableV2XEvent;
@@ -84,9 +81,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
             }
 
             countDownV2XEvent(entity);
-//            if (mWindowStatusListener != null) {
-//                mWindowStatusListener.onViewShow();
-//            }
         }
     }
 
@@ -97,16 +91,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
 
     @Override
     public void close() {
-        // 修改地图比例
-//        V2XServiceManager.getMoGoStatusManager().setUserInteractionStatus(MODULE_NAME, true, false);
-        // 锁车就是将地图视图移植中心点，因为行驶中的车和地图要相对的跟随
-//        MarkerUtils.resetMapZoom(16);
-
-        // 如果窗体处于展示的时候
-//        if (mWindowStatusListener != null) {
-//            mWindowStatusListener.onViewClose();
-//        }
-
         // 停止倒计时
         if (handlerV2XEvent != null && runnableV2XEvent != null) {
             handlerV2XEvent.removeCallbacks(runnableV2XEvent);
@@ -119,12 +103,6 @@ public class PushCameraLiveWindow extends RelativeLayout implements ICameraWindo
                 .removeView(this);
     }
 
-
-//    @Override
-//    public void setWindowStatusListener(CameraLiveWindowStatusListener listener) {
-//        this.mWindowStatusListener = listener;
-//    }
-
     /**
      * 窗体倒计时 TODO
      */
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
index 2374b039fa..c116e42b25 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/CameraLiveNoticeHelper.java
@@ -25,10 +25,10 @@ import com.mogo.utils.logger.Logger;
 
 
 /**
- * vr模式下，红绿灯消息 AdasNoticeHelper
+ * vr模式下，摄像头消息 AdasNoticeHelper
  */
 public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<MogoSnapshotSetData> {
-    private static final String TAG = "liyz";
+    private static final String TAG = "CameraLiveNoticeHelper";
     private Context mContext;
     private static IMogoMarker mMogoMarker;
     private CloudRoadData mCloudRoadData;
@@ -84,22 +84,23 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
      */
     private void addVrCameraMarker(CloudRoadData roadData) {
         Logger.d(TAG, "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        Log.d("lixp", "addVrCameraMarker --lat = " + roadData.getLat() + "--lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        removeCameraMarker();
-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .object(roadData)
-                .latitude(roadData.getLat())
-                .longitude(roadData.getLon());
-        options.anchor(0.5f, 0.5f);
+        if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
+            removeCameraMarker();
+            MogoMarkerOptions options = new MogoMarkerOptions()
+                    .object(roadData)
+                    .latitude(roadData.getLat())
+                    .longitude(roadData.getLon());
+            options.anchor(0.5f, 0.5f);
 
-        Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon_space, null);
-        options.icon(bitmap);
-        mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
-                .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-        if (mMogoMarker != null) {
-            mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), options));
-            mMogoMarker.showInfoWindow();
-            mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.icon_space, null);
+            options.icon(bitmap);
+            mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
+                    .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
+            if (mMogoMarker != null) {
+                mMogoMarker.setInfoWindowAdapter(new CameraWindow3DAdapter(AbsMogoApplication.getApp(), options));
+                mMogoMarker.showInfoWindow();
+                mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            }
         }
     }
 
@@ -110,22 +111,22 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
      */
     private void addNormalCameraMarker(CloudRoadData roadData) {
         Logger.d(TAG, "addNormalCameraMarker  --lat = " + roadData.getLat() + " --lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        Log.d("lixp", "addNormalCameraMarker  --lat = " + roadData.getLat() + " --lon =" + roadData.getLon() + "--uuid = " + roadData.getUuid() + "---rtmpUrl =" + roadData.getRtmpUrl());
-        removeCameraMarker();
-        mMogoMarker.hideInfoWindow();
+        if (!TextUtils.isEmpty(roadData.getRtmpUrl())) {
+            removeCameraMarker();
+            mMogoMarker.hideInfoWindow();
+            MogoMarkerOptions options = new MogoMarkerOptions()
+                    .object(roadData)
+                    .latitude(roadData.getLat())
+                    .longitude(roadData.getLon());
+            options.anchor(0.5f, 0.5f);
 
-        MogoMarkerOptions options = new MogoMarkerOptions()
-                .object(roadData)
-                .latitude(roadData.getLat())
-                .longitude(roadData.getLon());
-        options.anchor(0.5f, 0.5f);
-
-        Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_normal_traffic, null);
-        options.icon(bitmap);
-        mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
-                .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
-        if (mMogoMarker != null) {
-            mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            Bitmap bitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.module_camera_normal_traffic, null);
+            options.icon(bitmap);
+            mMogoMarker = ExtensionServiceManager.getMapService().getMarkerManager(mContext)
+                    .addMarker(PushDataType.TYPE_PUSH_CAMERA_DATA, options);
+            if (mMogoMarker != null) {
+                mMogoMarker.setOwner(PushDataType.TYPE_PUSH_CAMERA_DATA);
+            }
         }
     }
 
@@ -154,26 +155,30 @@ public class CameraLiveNoticeHelper implements IMogoOnWebSocketMessageListener<M
         if (obj != null) {
             mCloudRoadData = obj.getCamera();
             if (mCloudRoadData != null) {
-                Logger.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
+                Log.d(TAG, "onMsgReceived getRtmpUrl = " + mCloudRoadData.getRtmpUrl() + "--- isVrMode = " + isVrMode + ">>>>mCurrentUuid = " + mCurrentUuid + ">>>mCloudRoadData.getUuid() = " + mCloudRoadData.getUuid());
                 if (TextUtils.equals(mCurrentUuid, mCloudRoadData.getUuid())) {
                     if (isVrMode == isVrModeMarker) {
                         // do nothing.
+                        Log.e(TAG, "-------------1------------");
                     } else {
                         if (isVrMode) {
                             addVrCameraMarker(mCloudRoadData);
                             isVrModeMarker = true;
+                            Log.d(TAG, "-------------2------------");
                         } else {
                             addNormalCameraMarker(mCloudRoadData);
+                            Log.d(TAG, "-------------3------------");
                             isVrModeMarker = false;
                         }
                     }
                 } else {
-                    Logger.d(TAG, "mCurrentUuid  !=   ----------");
                     mCurrentUuid = mCloudRoadData.getUuid();
                     if (isVrMode) {
+                        Log.d(TAG, "-------------4------------");
                         addVrCameraMarker(mCloudRoadData);
                         isVrModeMarker = true;
                     } else {
+                        Log.d(TAG, "-------------5------------");
                         addNormalCameraMarker(mCloudRoadData);
                         isVrModeMarker = false;
                     }
diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
index ea9ab4a5eb..0b834a7848 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -88,7 +88,7 @@
 
     <!--    module_map_layout_navi_info_panel.xml-->
     <dimen name="module_ext_top_view_width">1058px</dimen>
-    <dimen name="module_ext_top_view_width_in_vr_mode">760px</dimen>
+    <dimen name="module_ext_top_view_width_in_vr_mode">822px</dimen>
     <dimen name="module_ext_top_view_no_link_width_in_vr_mode">700px</dimen>
     <dimen name="module_ext_navi_info_panel_width">544px</dimen>
     <dimen name="module_ext_navi_info_panel_height">117px</dimen>
diff --git a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
index 6acb0415ac..084475dd0d 100644
--- a/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
+++ b/modules/mogo-module-media/src/main/java/com/mogo/module/media/window/MediaWindow2.java
@@ -150,7 +150,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
                 mPauseImage = mWindowView.findViewById(R.id.window_play_pause_new);
 
                 if (mPauseImage != null) {
-                    mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause);
+                    mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new);
                 }
 
                 int yPos =
@@ -294,7 +294,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
                 if( mMediaInfoData.getPlayState() == MusicConstant.PLAY_STATE_PLAYING) {
                     // kw音乐做的容错
                     if (mPauseImage != null) {
-                        mPauseImage.setImageResource(R.drawable.module_media_window_pop_play);
+                        mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new);
                     }
                     if (mAnimCircleImageView != null) {
                         mAnimCircleImageView.startAnim();
@@ -314,7 +314,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
 //                GlideApp.with(mContext).applyDefaultRequestOptions(options).load(mMediaInfoData.getMediaImg()).into(new SkinAbleBitmapTarget(mCircleImg, options));
                 }else{
                     Logger.e(TAG, "mMediaInfoData == null  ");
-                    mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img);
+                    mAnimCircleImageView.setImageResource(R.drawable.module_media_default_music_img_new);
                 }
             }
         } else {
@@ -371,7 +371,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
         updateWindowUI(false);
         if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
             if (mPauseImage != null) {
-                mPauseImage.setImageResource(R.drawable.module_media_window_pop_play);
+                mPauseImage.setImageResource(R.drawable.module_media_window_pop_play_new);
             }
 
             if (mAnimCircleImageView != null) {
@@ -396,7 +396,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
         Log.d(TAG, "onMusicPause: ===" + mMediaInfoData);
         if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
             if (mPauseImage != null) {
-                mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause);
+                mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new);
             }
 
             if (mAnimCircleImageView != null) {
@@ -421,7 +421,7 @@ public class MediaWindow2 implements IMusicView , IMogoStatusChangedListener {
         Log.d(TAG, "onMusicStopped===" + mMediaInfoData);
         if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) {
             if (mPauseImage != null) {
-                mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause);
+                mPauseImage.setImageResource(R.drawable.module_media_window_pop_pause_new);
             }
 
             if (mAnimCircleImageView != null) {
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png
new file mode 100644
index 0000000000..fcc9015490
Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_default_music_img_new.png differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png
new file mode 100644
index 0000000000..86f936f702
Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_pause_new.png differ
diff --git a/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png
new file mode 100644
index 0000000000..78e5680e91
Binary files /dev/null and b/modules/mogo-module-media/src/main/res/drawable-xhdpi/module_media_window_pop_play_new.png differ
diff --git a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
index d36414c4b7..606fb00f07 100644
--- a/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
+++ b/modules/mogo-module-media/src/main/res/layout/module_media_music_window_alert_layout_new.xml
@@ -32,7 +32,8 @@
         android:id="@+id/window_circle_img_new"
         android:layout_width="@dimen/module_media_pop_window_anim_img_size_new"
         android:layout_height="@dimen/module_media_pop_window_anim_img_size_new"
-        android:src="@drawable/module_media_default_music_img"
+        android:src="@drawable/module_media_default_music_img_new"
+        android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -43,7 +44,7 @@
         android:layout_width="@dimen/module_media_pop_window_pause"
         android:layout_height="@dimen/module_media_pop_window_pause"
         android:background="@drawable/module_media_play_bg_selector"
-        android:src="@drawable/module_media_window_pop_play"
+        android:src="@drawable/module_media_window_pop_play_new"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
diff --git a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
index f9fba40b16..75bfb5e9d1 100644
--- a/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-media/src/main/res/values-xhdpi/dimens.xml
@@ -71,7 +71,7 @@
     <dimen name="module_media_pop_window_anim_img_size">80px</dimen>
     <dimen name="module_media_pop_window_anim_img_size_new">101px</dimen>
     <dimen name="module_media_pop_window_pause">60px</dimen>
-    <dimen name="module_media_pop_window_size">116px</dimen>
+    <dimen name="module_media_pop_window_size">115px</dimen>
     <dimen name="module_media_pop_window_text_width">230px</dimen>
     <dimen name="module_media_pop_window_text_margin">14px</dimen>
     <dimen name="module_media_pop_window_text_top_size">35px</dimen>
diff --git a/modules/mogo-module-media/src/main/res/values/colors.xml b/modules/mogo-module-media/src/main/res/values/colors.xml
index b6ca26aca2..7c39678a81 100644
--- a/modules/mogo-module-media/src/main/res/values/colors.xml
+++ b/modules/mogo-module-media/src/main/res/values/colors.xml
@@ -3,5 +3,7 @@
     <color name="modules_media_music_title_text_color">#fff</color>
     <color name="modules_media_music_time_text_color">#7affffff</color>
     <color name="modules_media_music_bg_color">#444E6E</color>
-    <color name="modules_media_music_circle_color">#80ffffff</color>
+    <color name="modules_media_music_circle_color">#f6ffffff</color>
+    <color name="modules_media_music_circle_color_start">#1Affffff</color>
+    <color name="modules_media_music_circle_color_end">#ffffff</color>
 </resources>
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
index 3c8676cefa..2fefdb0e72 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -3,7 +3,6 @@ package com.mogo.module.small.map;
 import android.content.Context;
 import android.graphics.BitmapFactory;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.animation.LinearInterpolator;
 import android.widget.ImageView;
@@ -15,21 +14,13 @@ import com.amap.api.location.AMapLocationClientOption;
 import com.amap.api.maps.AMap;
 import com.amap.api.maps.CameraUpdate;
 import com.amap.api.maps.CameraUpdateFactory;
-import com.amap.api.maps.TextureMapView;
 import com.amap.api.maps.UiSettings;
-import com.amap.api.maps.model.BitmapDescriptor;
-import com.amap.api.maps.model.BitmapDescriptorFactory;
 import com.amap.api.maps.model.CameraPosition;
-import com.amap.api.maps.model.CustomMapStyleOptions;
 import com.amap.api.maps.model.MyLocationStyle;
 import com.amap.api.navi.AMapNaviView;
 import com.amap.api.navi.AMapNaviViewOptions;
 import com.mogo.module.common.view.RoundLayout;
 import com.mogo.module.small.map.animation.DirectionRotateAnimation;
-import com.mogo.module.small.map.utils.MapAssetStyleUtils;
-
-import java.io.IOException;
-import java.io.InputStream;
 
 /**
  * 小地图的方向View
@@ -71,9 +62,20 @@ public class SmallMapDirectionView extends RoundLayout {
         mIvMapBorder = findViewById(R.id.ivMapBorder);
         mAMapNaviView = findViewById(R.id.aMapNaviView);
         mAMapNaviView.onCreate(null);
+
         // 车头朝上
         mAMapNaviView.setNaviMode(AMapNaviView.CAR_UP_MODE);
+        // 设置电子眼所在路线的可见性
+        mAMapNaviView.setRouteOverlayVisible(false);
         mAMap = mAMapNaviView.getMap();
+        // 关闭地图文字标注
+        mAMap.showMapText(false);
+        // 设置地图的样式
+        mUiSettings = mAMap.getUiSettings();
+        mUiSettings.setZoomControlsEnabled(false);// 地图缩放级别的交换按钮
+        mUiSettings.setAllGesturesEnabled(false);// 所有手势
+        mUiSettings.setMyLocationButtonEnabled(false); // 显示默认的定位按钮
+        mUiSettings.setLogoBottomMargin(-150); //设置Logo下边界距离屏幕底部的边距,设置为负值即可
 
         // 导航地图
         AMapNaviViewOptions options = mAMapNaviView.getViewOptions();
@@ -95,8 +97,6 @@ public class SmallMapDirectionView extends RoundLayout {
                     R.drawable.icon_module_small_map_four_corners));
             // 设置指南针图标否在导航界面显示，默认显示。true，显示；false，隐藏。
             options.setCompassEnabled(false);
-            // 黑夜模式
-            options.setNaviNight(true);
             //设置路况光柱条是否显示（只适用于驾车导航，需要联网）。
             options.setTrafficBarEnabled(false);
             // 设置[实时交通图层开关按钮]是否显示（只适用于驾车导航，需要联网）。
@@ -137,27 +137,17 @@ public class SmallMapDirectionView extends RoundLayout {
             //options.setPointToCenter(0.7D, 0.5D);
             // 2D模式
             options.setTilt(0);
+            // 黑夜模式
+            options.setNaviNight(true);
+            // 自定义地图样式
+//            options.setCustomMapStylePath("/mnt/sdcard/amap/style.data");
             mAMapNaviView.setViewOptions(options);
         }
-        // 设置电子眼所在路线的可见性
-        mAMapNaviView.setRouteOverlayVisible(false);
-        // 设置是否隐藏AMapNaviView上的CarOverlay，包括自车、罗盘
-        mAMapNaviView.setCarOverlayVisible(true);
-        mAMapNaviView.setViewOptions(options);
 
         //设置希望展示的地图缩放级别
         mCameraUpdate = CameraUpdateFactory.zoomTo(12);
         mAMap.moveCamera(mCameraUpdate);
 
-        // 设置当前位置的样式
-//        myLocationStyle = new MyLocationStyle();//初始化定位蓝点样式类
-//        myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE);//连续定位、且将视角移动到地图中心点，定位点依照设备方向旋转，并且会跟随设备移动。（1秒1次定位）如果不设置myLocationType，默认也会执行此种模式。
-//        myLocationStyle.interval(1000); //设置连续定位模式下的定位间隔，只在连续定位模式下生效，单次定位模式下不会生效。单位为毫秒。
-//        BitmapDescriptor location = BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_my_location_logo);
-//        myLocationStyle.myLocationIcon(location);
-//        mAMap.setMyLocationStyle(myLocationStyle);//设置定位蓝点的Style
-//        mAMap.setMyLocationEnabled(true);// 设置为true表示启动显示定位蓝点，false表示隐藏定位蓝点并不进行定位，默认是false。
-
         mAMap.setOnCameraChangeListener(new AMap.OnCameraChangeListener() {
             @Override
             public void onCameraChange(CameraPosition cameraPosition) {
@@ -173,22 +163,20 @@ public class SmallMapDirectionView extends RoundLayout {
             }
         });
 
-        // 关闭地图文字标注
-        mAMap.showMapText(false);
+//        CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions();
+//        customMapStyleOptions.setStyleData(MapAssetStyleUtils.getAssetsStyle(context));
+//        customMapStyleOptions.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(context));
+//        customMapStyleOptions.setEnable(true);
+//        mAMap.setCustomMapStyle(customMapStyleOptions);
 
-        // 设置地图的样式
-        mUiSettings = mAMap.getUiSettings();
-        mUiSettings.setZoomControlsEnabled(false);// 地图缩放级别的交换按钮
-        mUiSettings.setAllGesturesEnabled(false);// 所有手势
-        mUiSettings.setMyLocationButtonEnabled(false); // 显示默认的定位按钮
-        mUiSettings.setLogoBottomMargin(-150); //设置Logo下边界距离屏幕底部的边距,设置为负值即可
-
-
-        CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions();
-        customMapStyleOptions.setStyleData(MapAssetStyleUtils.getAssetsStyle(context));
-        customMapStyleOptions.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(context));
-        customMapStyleOptions.setEnable(true);
-        mAMap.setCustomMapStyle(customMapStyleOptions);
+        // 设置当前位置的样式
+//        myLocationStyle = new MyLocationStyle();//初始化定位蓝点样式类
+//        myLocationStyle.myLocationType(MyLocationStyle.LOCATION_TYPE_LOCATION_ROTATE);//连续定位、且将视角移动到地图中心点，定位点依照设备方向旋转，并且会跟随设备移动。（1秒1次定位）如果不设置myLocationType，默认也会执行此种模式。
+//        myLocationStyle.interval(1000); //设置连续定位模式下的定位间隔，只在连续定位模式下生效，单次定位模式下不会生效。单位为毫秒。
+//        BitmapDescriptor location = BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_my_location_logo);
+//        myLocationStyle.myLocationIcon(location);
+//        mAMap.setMyLocationStyle(myLocationStyle);//设置定位蓝点的Style
+//        mAMap.setMyLocationEnabled(true);// 设置为true表示启动显示定位蓝点，false表示隐藏定位蓝点并不进行定位，默认是false。
 
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
index b0c1ef448d..425e390239 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java
@@ -243,6 +243,11 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
             roadEventEntity.setLocation(markerLocation);
             roadEventEntity.setBindObj(v2XMarkerEntity);
 
+            MarkerShowEntity markerShowEntity = new MarkerShowEntity();
+            markerShowEntity.setBindObj(v2XMarkerEntity);
+            markerShowEntity.setChecked(false);
+            markerShowEntity.setMarkerLocation(markerLocation);
+
             // 重置告警信息
             V2XServiceManager.getV2XStatusManager().setAlarmInfo(roadEventEntity);
 
@@ -263,8 +268,14 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                     optionsRipple.icons(V2XMarkerAdapter.getV2XRoadEventViewGif(context, roadEventEntity));
                     optionsRipple.period(1);
                 }
-
-                mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
+                if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+                    mAlarmInfoMarker = MarkerDrawer.getInstance().drawMapMarkerImpl(markerShowEntity, MarkerDrawer.MARKER_Z_INDEX_HIGH, null);
+                    mAlarmInfoMarker.setInfoWindowAdapter(new RoadConditionInfoWindow3DAdapter(markerShowEntity, AbsMogoApplication.getApp(), mAlarmInfoMarker.getMogoMarkerOptions()));
+                    mAlarmInfoMarker.showInfoWindow();
+                } else{
+                    optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity));
+                    mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
+                }
                 // 当前Marker设置为最上面
                 mAlarmInfoMarker.setToTop();
                 // 绘制连接线
@@ -559,10 +570,9 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
                     mAlarmInfoMarker.showInfoWindow();
                 } else {
                     IMarkerView iMarkerView = MapMarkerAdapter.getMarkerView(context, markerShowEntity, optionsRipple);
-                    Bitmap bitmap = ViewUtils.fromView(iMarkerView.getView());
-                    optionsRipple.icon(bitmap);
-                    IMogoMarkerManager i = V2XServiceManager.getMarkerManager();
+                    optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity));
                     mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
+                    mAlarmInfoMarker.setMarkerIconView((IMogoMarkerIconViewCreator) iMarkerView);
                 }
                 // 当前Marker设置为最上面
                 mAlarmInfoMarker.setToTop();
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java
index a0e383bb30..a0a548676b 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkMarker.java
@@ -1,5 +1,6 @@
 package com.mogo.module.v2x.scenario.scene.park;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.view.animation.AccelerateInterpolator;
@@ -15,15 +16,20 @@ import com.mogo.module.common.drawer.marker.MapMarkerAdapter;
 import com.mogo.module.common.drawer.marker.RoadConditionInfoWindow3DAdapter;
 import com.mogo.module.common.entity.MarkerExploreWay;
 import com.mogo.module.common.entity.MarkerShowEntity;
+import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.service.ServiceConst;
 import com.mogo.module.v2x.V2XServiceManager;
+import com.mogo.module.v2x.marker.V2XMarkerAdapter;
 import com.mogo.module.v2x.scenario.view.IV2XMarker;
 import com.mogo.module.v2x.utils.MarkerUtils;
 import com.mogo.utils.ViewUtils;
 import com.mogo.utils.WorkThreadHandler;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
+import static com.mogo.module.v2x.V2XConst.V2X_EVENT_ALARM_POI;
 
 /**
  * author : donghongyu
@@ -66,6 +72,11 @@ public class V2XIllegalParkMarker implements IV2XMarker<List<MarkerExploreWay>>
                     markerShowEntity.setMarkerLocation(markerExploreWay.getLocation());
                     markerShowEntity.setMarkerType(ServiceConst.CARD_TYPE_NOVELTY);
 
+                    // 进行数据转换，用于Marker展示
+                    V2XRoadEventEntity roadEventEntity = new V2XRoadEventEntity();
+                    roadEventEntity.setLocation(markerExploreWay.getLocation());
+                    roadEventEntity.setBindObj(markerExploreWay);
+
                     WorkThreadHandler.getInstance().postDelayed(() -> {
                         IMogoMarker mogoMarker;
                         if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
@@ -76,7 +87,7 @@ public class V2XIllegalParkMarker implements IV2XMarker<List<MarkerExploreWay>>
                             IMarkerView markerView = MapMarkerAdapter.getMarkerView(AbsMogoApplication.getApp(), markerShowEntity, optionsRipple);
                             Bitmap bitmap = ViewUtils.fromView(markerView.getView());
                             optionsRipple.icon(bitmap);
-                            mogoMarker = V2XServiceManager.getIMogoMarkerService().drawMarker(markerShowEntity);
+                            mogoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple);
                         }
                         // 点击监听，天际弹窗展示详情
                         if (mogoMarker != null) {
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 7777ae5c59..9750889c69 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
@@ -57,6 +57,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
     private Button mBtnTriggerCallUserInfo;
     private Button mBtnTriggerEventUgc;
     private Button mBtnTriggerTrafficSearch;
+    private Button nBtnTriggerVR;
 
     private Button btnTriggerRearVIPCarTip,
             btnTriggerVehicleBrakes,
@@ -116,6 +117,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
         mBtnTriggerEventUgc = findViewById(R.id.btnTriggerEventUgc);
         mBtnTriggerCallUserInfo = findViewById(R.id.btnTriggerCallUserInfo);
         mBtnTriggerTrafficSearch = findViewById(R.id.btnTriggerTrafficSearch);
+        nBtnTriggerVR = findViewById(R.id.btnTriggerVR);
 
         switch (showType) {
             case 0:
@@ -130,6 +132,12 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
                 break;
         }
 
+        nBtnTriggerVR.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                V2XServiceManager.getMoGoStatusManager().setVrMode("nBtnTriggerVR", true);
+            }
+        });
 
         btnTriggerRearVIPCarTip = findViewById(R.id.btnTriggerRearVIPCarTip);
         btnTriggerVehicleBrakes = findViewById(R.id.btnTriggerVehicleBrakes);
@@ -167,7 +175,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
             mogoDriverInfo.setSn("12345678");
             mogoDriverInfo.setUserName("测试");
             mogoDriverInfo.setUserHead("https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1600872867592&di=994e371880ca6ae2814f553e0d0e4139&imgtype=0&src=http%3A%2F%2Fp3.ssl.cdn.btime.com%2Ft014c5d8a1e5cef12ba.jpg%3Fsize%3D506x543");
-            if ( V2XServiceManager.getCarsChattingProvider() != null ) {
+            if (V2XServiceManager.getCarsChattingProvider() != null) {
                 V2XServiceManager.getCarsChattingProvider().showUserWindow("CAR_CALL_USER_TO_" + V2XConst.MODULE_NAME, mogoDriverInfo, context);
             }
         });
@@ -267,7 +275,7 @@ public class V2XTestConsoleWindow extends ConstraintLayout {
             LocalBroadcastManager.getInstance(getContext()).sendBroadcast(intent);
         });
 
-        mBtnTriggerTrafficSearch.setOnClickListener(v-> V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus());
+        mBtnTriggerTrafficSearch.setOnClickListener(v -> V2XServiceManager.getIMogoTrafficUploadProvider().verifyCurrentTrafficStatus());
 
 
         /*
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_tip_bg.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_tip_bg.png
new file mode 100644
index 0000000000..22404daa42
Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_tip_bg.png differ
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
index 79822a5547..847361a586 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_vr.xml
@@ -2,20 +2,20 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_120"
-    android:background="@drawable/v2x_bg_pop_up"
-    android:clipChildren="true"
-    app:roundLayoutRadius="@dimen/dp_20">
+    android:layout_width="@dimen/dp_822"
+    android:layout_height="@dimen/dp_182"
+    android:background="@drawable/v2x_tip_bg"
+    android:clipChildren="true">
 
     <com.mogo.service.imageloader.MogoImageView
         android:id="@+id/ivEventImg"
-        android:layout_width="@dimen/dp_120"
-        android:layout_height="@dimen/dp_120"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginBottom="@dimen/dp_42"
         android:scaleType="fitXY"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:miv_failureHolder="@drawable/v2x_icon_live_logo"
         app:miv_overlayImageId="@drawable/v2x_icon_live_logo"
         app:miv_placeHolder="@drawable/v2x_icon_live_logo"
@@ -37,7 +37,8 @@
         android:id="@+id/tvEventTypeTitle"
         android:layout_width="@dimen/dp_120"
         android:layout_height="@dimen/dp_40"
-        android:layout_alignBottom="@+id/ivEventImg"
+        android:layout_marginStart="@dimen/dp_31"
+        android:layout_marginBottom="@dimen/dp_42"
         android:background="@drawable/bg_v2x_event_type_red_vr"
         android:gravity="center"
         android:paddingLeft="@dimen/dp_10"
@@ -108,11 +109,12 @@
         android:id="@+id/rightLinear"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginRight="@dimen/dp_30"
+        android:layout_marginRight="@dimen/dp_34"
+        android:layout_marginBottom="@dimen/dp_26"
         android:gravity="center"
-        android:orientation="horizontal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/tvEventAddress"
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
@@ -202,8 +204,10 @@
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/rightLinear"
+        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toEndOf="@+id/ivEventImg"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.363"
         tools:text="东城区北三环中路辅路小黄庄路口当前位置属于测试数据,看一下换行" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
index f4c376b7ad..df06979f90 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help_vr.xml
@@ -2,24 +2,26 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_120"
-    android:background="@drawable/v2x_bg_pop_up"
-    android:paddingEnd="@dimen/dp_30"
+    android:layout_width="@dimen/dp_822"
+    android:layout_height="@dimen/dp_182"
     android:layout_marginTop="@dimen/dp_8"
+    android:background="@drawable/v2x_tip_bg"
     tools:layout_height="wrap_content">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_15"
+        android:layout_marginBottom="@dimen/dp_34"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.mogo.service.imageloader.MogoImageView
             android:id="@+id/ivFaultHelpHead"
-            android:layout_width="@dimen/dp_120"
-            android:layout_height="@dimen/dp_120"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:layout_alignParentEnd="true"
             android:layout_alignParentBottom="true"
             android:layout_marginEnd="@dimen/dp_31"
@@ -27,6 +29,7 @@
             app:layout_constraintEnd_toEndOf="@+id/rlRoadEventList"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0"
             app:miv_failureHolder="@drawable/icon_default_user_head"
             app:miv_overlayImageId="@drawable/icon_default_user_head"
             app:miv_placeHolder="@drawable/icon_default_user_head" />
@@ -34,11 +37,11 @@
         <TextView
             android:id="@+id/tvImgTextContent"
             android:layout_width="@dimen/dp_120"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginTop="15dp"
             android:background="@drawable/bg_v2x_event_type_orange_vr"
             android:gravity="center"
-            android:paddingStart="@dimen/dp_23"
+            android:paddingStart="@dimen/dp_27"
             android:paddingTop="@dimen/dp_5"
             android:paddingEnd="@dimen/dp_23"
             android:paddingBottom="@dimen/dp_5"
@@ -46,7 +49,8 @@
             android:textColor="@android:color/white"
             android:textSize="@dimen/module_v2x_event_type_title_text_size"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="@+id/ivFaultHelpHead"
+            app:layout_constraintStart_toStartOf="@id/ivFaultHelpHead"
             app:layout_constraintVertical_chainStyle="packed" />
 
         <TextView
@@ -81,7 +85,7 @@
         android:id="@+id/tvFaultHelpDistance"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_40"
+        android:layout_marginEnd="@dimen/dp_42"
         android:gravity="center_vertical"
         android:textColor="@color/v2x_FFF_333"
         android:textSize="@dimen/dp_70"
@@ -89,18 +93,20 @@
         app:layout_constraintBottom_toBottomOf="@+id/ivFaultHelpEventCall"
         app:layout_constraintEnd_toStartOf="@+id/ivFaultHelpEventCall"
         app:layout_constraintTop_toTopOf="@+id/ivFaultHelpEventCall"
+        app:layout_constraintVertical_bias="0.466"
         tools:text="300M" />
 
     <ImageView
         android:id="@+id/ivFaultHelpEventCall"
         android:layout_width="@dimen/module_v2x_event_button_size_vr"
         android:layout_height="@dimen/module_v2x_event_button_size_vr"
-        android:layout_marginEnd="@dimen/dp_42"
+        android:layout_marginEnd="28dp"
         android:src="@drawable/selector_talk_btn"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/ivFaultHelpEventNavi"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.385"
         tools:visibility="visible" />
 
     <ImageView
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 d3d0683aab..008a6e19d4 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
@@ -3,16 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rlContent"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_120"
-    android:background="@drawable/v2x_bg_pop_up"
+    android:layout_width="@dimen/dp_822"
+    android:layout_height="@dimen/dp_182"
     android:layout_marginTop="@dimen/dp_8"
-    android:paddingEnd="@dimen/dp_62">
+    android:background="@drawable/v2x_tip_bg">
 
     <ImageView
         android:id="@+id/leftImageView"
-        android:layout_width="@dimen/dp_120"
-        android:layout_height="@dimen/dp_120"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginStart="@dimen/dp_30"
+        android:layout_marginTop="@dimen/dp_20"
+        android:layout_marginBottom="@dimen/dp_42"
         android:src="@drawable/bg_v2x_red_two_round_vr"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,7 +34,7 @@
         android:id="@+id/tagEventType"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginStart="8dp"
         android:gravity="center"
         android:paddingLeft="@dimen/dp_10"
         android:paddingTop="@dimen/dp_3"
@@ -44,7 +46,8 @@
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/leftImageView"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.409" />
 
     <TextView
         android:id="@+id/tvAddress"
@@ -85,14 +88,17 @@
         android:layout_marginEnd="@dimen/dp_40"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/llIllegalParkingUnLike"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.463" />
 
     <com.mogo.module.v2x.view.HeartUnLikeView
         android:id="@+id/llIllegalParkingUnLike"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/dp_60"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.463" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
index e3f3c2d6c6..4411a57baf 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_event_detail_vr.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_width="@dimen/dp_822"
+    android:layout_height="@dimen/dp_182"
     android:layout_marginTop="@dimen/dp_8">
 
     <androidx.recyclerview.widget.RecyclerView
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
index 2f384b8a3f..a7876cce9d 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_test_console.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
@@ -54,6 +55,20 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
+            <Button
+                android:id="@+id/btnTriggerVR"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="@dimen/dp_10"
+                android:layout_marginBottom="@dimen/dp_10"
+                android:background="#6BCF23"
+                android:padding="@dimen/dp_10"
+                android:text="开启VR模式"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/dp_22"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
         </com.google.android.flexbox.FlexboxLayout>
 
         <com.google.android.flexbox.FlexboxLayout
@@ -67,7 +82,8 @@
             app:alignItems="center"
             app:flexDirection="row"
             app:flexWrap="wrap"
-            app:justifyContent="flex_start">
+            app:justifyContent="flex_start"
+            tools:visibility="visible">
 
             <TextView
                 android:layout_width="match_parent"
@@ -207,7 +223,8 @@
             app:alignItems="center"
             app:flexDirection="row"
             app:flexWrap="wrap"
-            app:justifyContent="flex_start">
+            app:justifyContent="flex_start"
+            tools:visibility="visible">
 
 
             <TextView
@@ -276,7 +293,8 @@
             app:alignItems="center"
             app:flexDirection="row"
             app:flexWrap="wrap"
-            app:justifyContent="flex_start">
+            app:justifyContent="flex_start"
+            tools:visibility="visible">
 
             <TextView
                 android:layout_width="match_parent"
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json
index e825678c42..dbb73cdb82 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_fatigue_driving_data.json
@@ -14,11 +14,11 @@
   "zoom": true,
   "zoomScale": 15,
   "location": {
-    "lat":39.968738,
-    "lon":116.411288
+    "lat":39.969055,
+    "lon":116.410811
   },
-  "lat":39.968738,
-  "lon":116.411288,
+  "lat":39.969055,
+  "lon":116.410811,
   "userHead": "https://yycp-static-1255510688.cos.ap-beijing.myqcloud.com/defaultUserHeadImg/5.png",
   "msgImgUrl": "https://upload.jianshu.io/users/upload_avatars/7663825/7c28763e-002b-4e89-8dea-5b8da210ef2c.jpg"
 }
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json
index e9ab6a1b79..6e01a16ca1 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_road_event_data.json
@@ -5,8 +5,8 @@
   "location":{
     "address":"北三环环球贸易中心",
     "angle":270,
-    "lat":39.969057,
-    "lon":116.417831
+    "lat":39.969055,
+    "lon":116.410811
   },
   "noveltyInfo":{
     "addr":"北三环环球贸易中心",
@@ -27,8 +27,8 @@
     "location":{
       "address":"北三环环球贸易中心",
       "angle":270,
-      "lat":39.969057,
-      "lon":116.417831
+      "lat":39.969055,
+      "lon":116.410811
     },
     "poiType":"10003",
     "type":"CARD_TYPE_ROAD_CONDITION",
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
index f7316d824e..29fad1e867 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_seek_help.json
@@ -3,8 +3,8 @@
     {
       "createTime": 1593678359872,
       "distance": 1100,
-      "lat":39.969057,
-      "lon":116.417831,
+      "lat":39.969055,
+      "lon":116.410811,
       "sn": "ZD801B1932L00041",
       "targetId": 20007,
       "targetName": "故障车",
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 177dd99d41..4fb423afdc 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -87,7 +87,7 @@
 
     <!--适配 V2X 弹窗-VR-->
     <dimen name="module_v2x_event_button_size_detail_vr">80px</dimen>
-    <dimen name="module_v2x_event_window_height_vr">120px</dimen>
+    <dimen name="module_v2x_event_window_height_vr">182px</dimen>
     <dimen name="module_v2x_event_button_size_vr">64px</dimen>
     <dimen name="module_v2x_event_icon_size_vr">60px</dimen>