From e47736afd9a4d4c16066c4ef51e6f423fd19b092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Thu, 1 Apr 2021 18:39:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9F=BA=E7=A1=80=E7=9A=84?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E7=BB=98=E5=88=B6=E7=BA=BF=E7=9A=84=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                              |   1 +
 .../res/layout/module_main_activity_main.xml  |  21 +++---
 .../v2x/scenario/impl/V2XScenarioManager.java |   6 +-
 .../scene/road/V2XRoadEventButton.java        |  11 +---
 .../scene/road/V2XRoadEventMarker.java        |  11 +---
 .../V2XOptimalRouteVREventMarker.java}        |   6 +-
 .../V2XOptimalRouteVREventScenario.java}      |  13 ++--
 .../V2XOptimalRouteVREventWindow.java}        |  16 ++---
 .../v2x_optimal_route_warning.png             | Bin 0 -> 4010 bytes
 .../main/res/layout/vr_window_top_tips.xml    |  38 +++++++++++
 .../main/res/layout/window_test_console.xml   |   2 +-
 ...ario_push_vr_event_data_yongdu_gongsi.json |  60 ++++--------------
 12 files changed, 88 insertions(+), 97 deletions(-)
 rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/{pushVR/V2XPushVREventMarker.java => route/V2XOptimalRouteVREventMarker.java} (92%)
 rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/{pushVR/V2XPushVREventScenario.java => route/V2XOptimalRouteVREventScenario.java} (92%)
 rename modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/{pushVR/V2XPushVREventWindow.java => route/V2XOptimalRouteVREventWindow.java} (81%)
 create mode 100644 modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_optimal_route_warning.png
 create mode 100644 modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 83405b8de1..4ff10f68a5 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -91,6 +91,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index d3e106ad3c..4a05e4e99e 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/module_main_window_background_color"
     android:orientation="vertical">
 
-    <!-- 地图-->
+    <!-- 地图 -->
     <FrameLayout
         android:id="@+id/module_main_id_map_fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <!-- 天气动画层 -->
     <androidx.constraintlayout.widget.ConstraintLayout
-       android:id="@+id/cl_special_effect"
+        android:id="@+id/cl_special_effect"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:visibility="gone">
@@ -23,20 +24,21 @@
             android:id="@+id/iv_wu1"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:src="@drawable/wu1"
             android:alpha="0"
+            android:src="@drawable/wu1"
             app:layout_constraintStart_toStartOf="parent" />
 
         <ImageView
             android:id="@+id/iv_wu2"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:src="@drawable/wu2"
             android:alpha="0"
+            android:src="@drawable/wu2"
             app:layout_constraintEnd_toEndOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
+    <!--四个方向，碰撞预警-->
     <ImageView
         android:id="@+id/warning_top"
         android:layout_width="match_parent"
@@ -67,6 +69,7 @@
         android:background="@drawable/module_main_warning_bkg_bottom"
         android:visibility="gone" />
 
+    <!-- 左侧阴影背景 -->
     <FrameLayout
         android:id="@+id/module_main_id_map_left_shadow_frame"
         android:layout_width="@dimen/module_main_map_left_shadow_frame_width"
@@ -75,7 +78,7 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
-    <!-- 左边按钮 -->
+    <!-- 左边快捷按钮 -->
     <FrameLayout
         android:id="@+id/module_main_id_apps_fragment_container"
         android:layout_width="@dimen/module_main_apps_fragment_container_width"
@@ -85,13 +88,13 @@
         android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
         android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
 
-    <!--  左侧浮层,布局位置目前只考虑了1+16独立app情况  -->
+    <!-- 左侧浮层,布局位置目前只考虑了1+16独立app情况 -->
     <FrameLayout
         android:id="@+id/module_main_id_left_panel_fragment_container"
         android:layout_width="@dimen/module_main_id_left_panel_fragment_container_width"
         android:layout_height="match_parent" />
 
-    <!--快捷操作浮层-->
+    <!-- 快捷操作浮层 -->
     <FrameLayout
         android:id="@+id/module_main_id_entrance_fragment_container"
         android:layout_width="match_parent"
@@ -108,6 +111,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <!-- 右边事件面板 -->
     <FrameLayout
         android:id="@+id/module_main_id_event_panel_fragment_container"
         android:layout_width="match_parent"
@@ -118,6 +122,7 @@
         android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight"
         android:paddingBottom="@dimen/module_main_event_panel_fragment_paddingBottom" />
 
+    <!-- 目的地车友 -->
     <FrameLayout
         android:id="@+id/module_main_id_message_history_fragment_container"
         android:layout_width="match_parent"
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
index 285d808e28..5ed3162f4d 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/impl/V2XScenarioManager.java
@@ -16,7 +16,7 @@ import com.mogo.module.v2x.scenario.scene.livecar.V2XPushLiveCarScenario;
 import com.mogo.module.v2x.scenario.scene.livecar.V2XVoiceCallLiveScenario;
 import com.mogo.module.v2x.scenario.scene.park.V2XIllegalParkScenario;
 import com.mogo.module.v2x.scenario.scene.push.V2XPushEventScenario;
-import com.mogo.module.v2x.scenario.scene.pushVR.V2XPushVREventScenario;
+import com.mogo.module.v2x.scenario.scene.route.V2XOptimalRouteVREventScenario;
 import com.mogo.module.v2x.scenario.scene.road.V2XRoadEventScenario;
 import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpScenario;
 import com.mogo.module.v2x.scenario.scene.ugc.V2XEventUgcScenario;
@@ -104,7 +104,9 @@ public class V2XScenarioManager implements IV2XScenarioManager {
                                 mV2XScenario = new V2XRecommendRouteScenario();
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_VR_SHOW:
-                                mV2XScenario = new V2XPushVREventScenario();
+                                if (V2XServiceManager.getMoGoStatusManager().isVrMode()) {
+                                    mV2XScenario = new V2XOptimalRouteVREventScenario();
+                                }
                                 break;
                             case V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_TOP:
                             case V2XMessageEntity.V2XTypeEnum.ALERT_THE_FRONT_CRASH_WARNING_LEFT:
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventButton.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventButton.java
index 7f195de836..0297e1dd17 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventButton.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventButton.java
@@ -14,16 +14,7 @@ import com.mogo.module.v2x.voice.V2XVoiceManager;
 import com.mogo.service.entrance.ButtonIndex;
 
 /**
- * @ProjectName: MoGoModulSafeDriving
- * @Package: com.mogo.module.v2x.scenario.view
- * @ClassName: V2XRoadEventButton
- * @Description: 道路实况按钮
- * @Author: fenghl
- * @CreateDate: 2020/5/18 10:46
- * @UpdateUser: 更新者：
- * @UpdateDate: 2020/5/18 10:46
- * @UpdateRemark: 更新说明：
- * @Version: 1.0
+ * 道路实况按钮
  */
 public class V2XRoadEventButton implements IV2XButton {
     private TextView tv;
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventMarker.java
index b92946c2f9..423f0083e3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadEventMarker.java
@@ -6,16 +6,7 @@ import com.mogo.module.v2x.scenario.view.IV2XMarker;
 import com.mogo.module.v2x.utils.MarkerUtils;
 
 /**
- * @ProjectName: MoGoModulSafeDriving
- * @Package: com.mogo.module.v2x.scenario.view
- * @ClassName: V2XRoadEventMarker
- * @Description: java类作用描述
- * @Author: fenghl
- * @CreateDate: 2020/5/18 10:48
- * @UpdateUser: 更新者：
- * @UpdateDate: 2020/5/18 10:48
- * @UpdateRemark: 更新说明：
- * @Version: 1.0
+ * 道路V2X事件的Marker
  */
 public class V2XRoadEventMarker implements IV2XMarker<V2XRoadEventEntity> {
     @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
similarity index 92%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
index 120088508a..0702296ea3 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventMarker.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventMarker.java
@@ -1,4 +1,4 @@
-package com.mogo.module.v2x.scenario.scene.pushVR;
+package com.mogo.module.v2x.scenario.scene.route;
 
 import com.mogo.map.overlay.IMogoPolyline;
 import com.mogo.map.overlay.MogoPolylineOptions;
@@ -19,7 +19,7 @@ import java.util.List;
  * desc   : 推送VR场景
  * version: 1.0
  */
-public class V2XPushVREventMarker implements IV2XMarker<V2XPushMessageEntity> {
+public class V2XOptimalRouteVREventMarker implements IV2XMarker<V2XPushMessageEntity> {
     private final String TAG = "V2XPushVREventMarker";
 
     private static IMogoPolyline mMogoPolyline;
@@ -59,7 +59,7 @@ public class V2XPushVREventMarker implements IV2XMarker<V2XPushMessageEntity> {
         colors.add(0xFFCB253A);
 
         // 线条粗细，渐变，渐变色值
-        options.width(15).useGradient(true).color(0xFFF95959);
+        options.width(30).useGradient(true).colorValues(colors);
 
         for (double[] doubles : entity.getRecommendPolyline()) {
             options.add(doubles[0], doubles[1]);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java
similarity index 92%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventScenario.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java
index 59c29c99ff..ac5971f613 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventScenario.java
@@ -1,4 +1,4 @@
-package com.mogo.module.v2x.scenario.scene.pushVR;
+package com.mogo.module.v2x.scenario.scene.route;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,17 +20,18 @@ import com.mogo.utils.network.utils.GsonUtil;
  * author : donghongyu
  * e-mail : 1358506549@qq.com
  * date   : 2020/5/15 5:37 PM
- * desc   : 推送VR场景控制
+ * desc   : 最优车道选择
  * version: 1.0
+ * wiki   : http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=52829799
  */
-public class V2XPushVREventScenario
+public class V2XOptimalRouteVREventScenario
         extends AbsV2XScenario<V2XPushMessageEntity>
         implements IMogoTopViewStatusListener {
     private String TAG = "V2XPushVREventWindow";
 
-    public V2XPushVREventScenario() {
-        setV2XMarker(new V2XPushVREventMarker());
-        setV2XWindow(new V2XPushVREventWindow());
+    public V2XOptimalRouteVREventScenario() {
+        setV2XMarker(new V2XOptimalRouteVREventMarker());
+        setV2XWindow(new V2XOptimalRouteVREventWindow());
     }
 
     @Override
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventWindow.java
similarity index 81%
rename from modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventWindow.java
rename to modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventWindow.java
index d41e60a714..e63b0d96ae 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/pushVR/V2XPushVREventWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/route/V2XOptimalRouteVREventWindow.java
@@ -1,4 +1,4 @@
-package com.mogo.module.v2x.scenario.scene.pushVR;
+package com.mogo.module.v2x.scenario.scene.route;
 
 import android.content.Context;
 import android.os.Handler;
@@ -24,7 +24,7 @@ import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
  * TODO 只有VR演示场景使用
  * version: 1.0
  */
-public class V2XPushVREventWindow extends V2XBasWindow implements IV2XWindow<V2XPushMessageEntity> {
+public class V2XOptimalRouteVREventWindow extends V2XBasWindow implements IV2XWindow<V2XPushMessageEntity> {
     private String TAG = "V2XPushVREventWindow";
 
     // 处理道路事件，30秒倒计时
@@ -32,24 +32,22 @@ public class V2XPushVREventWindow extends V2XBasWindow implements IV2XWindow<V2X
     private Runnable runnableV2XEvent;
     private int mExpireTime = 30000;
 
-    public V2XPushVREventWindow() {
+    public V2XOptimalRouteVREventWindow() {
         this(V2XServiceManager.getContext());
     }
 
-    public V2XPushVREventWindow(Context context) {
+    public V2XOptimalRouteVREventWindow(Context context) {
         this(context, null);
     }
 
-    public V2XPushVREventWindow(Context context, AttributeSet attrs) {
+    public V2XOptimalRouteVREventWindow(Context context, AttributeSet attrs) {
         this(V2XServiceManager.getContext(), null, 0);
     }
 
-    public V2XPushVREventWindow(Context context, AttributeSet attrs, int defStyleAttr) {
+    public V2XOptimalRouteVREventWindow(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         // 填充布局
-        LayoutInflater.from(context).inflate(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
-                R.layout.window_road_event_detail_vr : R.layout.window_road_event_detail, this);
-
+        LayoutInflater.from(context).inflate(R.layout.vr_window_top_tips, this);
     }
 
     /**
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_optimal_route_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_optimal_route_warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..b358c39eaf2f243080aae67679f1485ee0e19371
GIT binary patch
literal 4010
zcmV;b4^{AqP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91WS|281ONa40RR91WB>pF057}VK>z>`6iGxuRCodHU3+j;)fxZJ&5MLA
z0U<n6F(Cm1)(6O|TB-7=m8l)9w%B$Ag=9MY$47NWEn3uQMVVGx>BEjhDpKp%ai&;1
zb{rnIJ}Lr=R)iH0!XvzekdPP2-hRKk-EepJoV$DXK6XR)n@RTG^Z3p=-*?YB-}%mW
z&L=3tVZeK@oTqm-SBJW(Iz&`0_)jMqCUgquf&#`bQ2@>0xMmJ(=CJTD(P2&-)bN)>
zL6IK_p1N}GmzmsTZbN24(L42JqFv0;g+7CcIh}O9!qplIv4<PIUg%<--cMiGdR0xM
ztN0xv%Ls-9*40;c6V2Ckx``Q3?XXSuvI`Luf?mxbTG>3KCTK6S`>E5$kido)26we|
z|4>k99y4N!`%SZtks0%WPTGsP#W{azo_gzX`xu<(@SP!r>sOsGLLK+=a8%2^q0o5~
zJis7C8xv-^t`#h8n|{lF4@yv?^o=1UYyVVrhPv+8buphv&sWwcqasA75c<kI%6+0~
z=54$DsG8>t8S+kjpsj=ILOR{fjNqZVH-hNa1T8BppvA|os%iGJ1)egbc+K)3u&DYJ
z4^Jb!Y=mF91&KzD^m|%n)xPXinVv9Y;M(Qo9VF^`j+p6H#nXych_wZz*PNVL+u(LR
zTxUqpy65MR9$LYY(;&Ain@RXsB0E7sThKaV;c7SQ<r+gKZrYT$y=lvnJXieG%?f5Z
zE}mPS9$Pa0zRi;+opGbCt}vwknwN&@qHVRV>r>sRRByu}gxDbT!a1jB{phgMx;th_
z$=lCYc6Nr|B%P|9R;E|y7qlxsU%R$x+QKiKw8IfY`mbLxUJr%d;GQwuNhQveyxda`
z2~C@QdisJbskVs~p{YS&&5CJycj#YPW}KxTXaSmlHfKZaJ*Ct`jGh5zkUqd(aeX5-
zuUAfq9PR2<dW!8Hf;qz&rn1aXeqH!bK_k#gnMe^~tA{|E3W?Tt`}_p1AZA=JPxP8z
z^mRMZSJFKM>kNptS!TqMT^+!ZCuj!RsS`!VB+ZcRO&>4qtLuztlG%F$&9GojHdj(Z
z7Stg;CjKp1q}g=w6ku`qhGf(%2^j)KVJFc?=elkxo`mj(K=;L)Kob%vBohu<(As91
z;hZ_3p`ig!fXb2~*v~j;Rp<!_<4H7cM;J7<K&~9Ju+!Jtt_RPR%_R#O_!`9oKUmaH
zRI7F#b5*s$wreIZV{l#pZM||X4ajxA4S%YulP-Gq75cKPL)C20!$DKfmJ5<@Q%Hv_
z7$k)Ez&)>D!U7hJy4)3Jpdc{yzER^7mg#i@&=xe7l_O;ctV1%vAfd7_K(${PE30?P
zVLv{99F6Q(oN|75GU_>D8pmUcV+ib~!lpX$iTw_Fbo6A()8eY=s2T-q<oj^tL`OK>
z$P5~T*0H$aS_>n#Ot71pGN6>cJ9JcReO-CKd3Y6FT%7JLe?31;>*yv$F$CtFJn7U%
zCrQuSk}=-x25Y=Zdu(+2tye*7(A-SnC@BlJwwYkwIj6Lot{6DXT+gWIXZHS=8roW-
z!elSi{Ra}}3>jQI_<Z`tpb_-%69;9{{)Dk9twD35-$n|IVu;Z7`OLMnLJohubv$>d
z;De?kbpMVIRMAo4z;z81{X%Ap3?8kTOjmDuO%~-_7>v!iupWl=3|Tl5z#A)SO88X8
znzFGprl>?&+M=DwF#`y?Szobu*Cr*d$t9(9qet_Uve1|auHqEXJ`&u+5S-751g7h^
zI46%5RZdVA|Jso~^xjE(mNu^)Z6Ne26+B!uk<gRU31-^&FoZdEQ#vb!vhOaxgofr9
zN~_To3R!;b(oFvkd|>BBW%Ow7jSI_qK2T*kFC)yfHyDCrWIUOtwN@kYi|CFEE>X7o
z`Nkl9-rA&$w~Bc8<RN<F*j{ClpN*P8MOxH!s!Z!i1k>K&0V6jUf-`-d6l4SG&nqvd
zq8vF<TDs2A<GVk!fh|7i;+>l)#Gj%Jh8N&txL6kDTUdk#1_f}ylK0Bf2IE)?npZYP
zS^m>|KcOR??NRY#InPD?)r-5&PM@Idr%(3e*~;%P9ok8^jF6Xe7Y~=u9oR<4&!k83
zXz+k&RhS_}Y3(7u;6+-FFgj}w0V59wJ6h>C4WC9{dw%DXR?tH{A*<k#U7ML9TcV=t
zIPCkwDhcY7STGci731mN9UEe!e0k^oFdYSHI0w%2N4YPhN(#Z^?7AT%B{AWk$G-TG
zT0>pRcsmjMJ5JNH`#w`<!6Nd4bSWPB_&0c=;ZVM^hCW0*ZlS{1)^dVgX#CvOS}fhO
zg_?L@L<ad#JX-WRSspjTzzYpGB)Eyx4z9U8d|W<Yh%(EAEUt!Jp4?6_Gk&?}V`Z5)
z538a}i_cTWdl>;<XnY1REey%$IpdM4Ny_%U%{rzxj_*^(JBj$+zOB^A!<P)$f}NoD
zPX~Y(d;lmt4Ef2(i>RD8pk%<tWwa<seU&VKqOf-U6frlc;G3*?yqf1WzX7}ug=^~H
z<Nc2-{49JRZ>3_Nd=T%K%ixtmyXdy9Z^@#1!myC*uUNMr(dq6kOJP9ct7<lX?M8w|
zSO%L<9i?d-{Z>4R|DcEXzMpv?i<c^9bn@5xkcC1pLOe)bN6)k?{}M@Nn47E=j}v)=
z%x}dbc%k8nqevtD_{DxUhAS03yMG%sw700DT@C*`D;_sAsg;$O<NQ=Sf)^U@n{u_4
z36RxsBV`LSWIM^L<R^E3lmLUf(N>Dbs-gje?Et?3ywG@s=o>@E2L=;FT@@^4aTH>y
zp8$3KKaTEI7U`$r5xkIV^OV(d7O{jEfe<TYu#bnS-?KQHER13a&1xfS2Wy6Rw>2k)
zZt<>-G@G>r*lUl4VFiVBXZgjnWOuY0CN`a0@3~xsX6DRbw-BoEd<&xFd1b0-V<PX=
zSrShY=JEnAkuK{=UX>>U+gJ(t=Yu;~!Fi!H`CYs%@ZA3Gbc}@vF9E#3q@LVo<e(-H
zF(0#7Y;9>iMlZ9dn@*_XbxAvm$}$MBn0~(x7LVWsCUwsl0@eCgEz}W<cBpssWCZde
z>;M#x`_+m^SWuRGtat=3Jntcetgyr8lM3EEzMtMY(Wr{{H5@_(Bt02~6_09Fk1UVf
zuy7CIt5oe~w38m&vSkJRrCG3p_kf2g5^13pfhVDOZ1_Z(0uth7#okS~Jck^H*c(*V
zz+psbUO&TdL4{@&Po&t%%OrrLcc9%$@#tMI0WWfSpDviZY-5jfFzLaBD1$bhK<mEP
zEQ?Ai?2kO&|Mjq15cpCt^dv%VC?0wL{tx4(Nt4cEY4MstWu6SP;6*ME@j;h1<f0ld
zy3l%+yKL{LtO9S1%46pR!wderfEOEg(49QgV&7f{kQlGpxLOwFC=9&NaQ(I;EQ-w7
zQ^-{uB{<sIM!&Kcs}(4H3pNyw7Peg2RJ+Loi%0N6GwwncqQTA9PAwTqbB0zZQ7&P9
zRdcs17qBVIa2oMC+i|^bVI>L0W3FUnpK`f;1v+@a!<KQ0{koJ9Nise$Ms4c9lT{ka
z4{Vp@%Df;eJK{<x9$h@$#S+$fP{7b-85h%&zQ7HV+)!FUQ%lrG305E3Lz8%~ArTzl
z`33r|bi(^=6Z|@>=&$GF5i)?{5t1S{!<+(m032bvEcOyWE~shHh3iIJi-q@8Tt@gy
z1W)bxgdSw2p9&@hhR_rq8dU%T>&>i^QNirNBdJ2Mg>24)6}$>yhm6VpaTm4>;Hd%S
z7z}~ShQhV=L8tb;P%prE*$;sDnMk>4#gK(u*Ke0z;JB(`#p5<(=Q3qv?4cpzHp7@h
zfQUctS5rpF83TNj0A0ARL2+&#D;}M-+f4f&hOlwvN+-m;r~FbXRU9R7g10y1#mG?6
zFZF#sGwpjA0%s=7spO9*nJ87p*5kLQ*?Qbm9p4{ubo-GMEgnI0vm==vhM*O2W|B&4
z7W299LJO0eRB-mTJl|u*BetmRLM+Xrws7HDrmIC?YWE~AECH?d66{tI=?{0bS!QFo
zJ)^*|c;rK*-`Vod<m<(bV?c9rhPZYWt*w8CEeCHmC(1s1Ljh*uveub3cbKt94OxhQ
zn;(|BywTd3OYZZ}qBBhEXhOs>1U{GG<|jH?_RVbyfW|WaR&fkL!SK1ny`<aiN@Vdx
zC?LASG>*KV{gpDLi5+0E(eJXe$+AywQUJ6Cjb%8c3_(ITz~UMIpe$21EOiQirl73~
zgOVY*6ObeCR%OhFr$zzLRCV7XFvf|!vBj{`aSg9aX2ynR-&3FfI}>Z0Su@Kjr?Q7c
zGQk@eFYhzUG$c~FUi1qZf|iM@oRA^LP0T`DkO)yWJ^=-ohKX*q28M(TK_c8)&XU2?
zc+P@-3V?RW-1`p9NihTo;Tn#Y`summ02Sz^0Gfez$yPsUhQLoBT*I*#AeEn!EwE3e
zV_Jb`c6=Nr%@7b0o?_q{jwdKj?San)rg6_W1X|hgu7h^lVhA$8PoL0ou7l$%yk{Yv
z0)|sCcAuAuPea=bLGkcDmP6Y0S*FOD0otVEp$*s)E)3&~JR6dAEP0j|c)~E{)Ul)^
zhM*Ez*Q=lcgG;VgQyQ|uH3<L5I0@HqeOV+%+d+d=<_t3}@$8r(Kmti(T*+nA_*n6;
z@!ppJZARPeN>eHtIUcfN5oaCT$5O=JyDL4!TqINkd}e9_&v0wa;pfydw+(GfRvlue
z?XLF_bK!7+6(V|y&(4i7hxgWJCe}gzg70pbRr|76ZE(GZm@A5k!vR)!Zt2Z?^r9PW
zKwG?I259GL4>2<bK9}I;C+xjPm!AYRXUK?W(FyAi7$m6nz}>E<Zw!f49BzK#S%!zP
zTDumK5geZXvPB^iW;yJpWTrY^mhU@5B8`D(88|Zu`z+BXN5a$j%c`J_x)3X2-q}3$
z*5m1@OWGJ>Zfs!vim}~#XrAFEz;CAjd{~CH*RSG8fY}P&Tt7dbGlC)J2E$7LE~dv_
z=sc|Po%Al>y3Hq!xzX#4bCrCIEOK(mT!(Z%XB<OfiGl04apN;C8D<f>nk!t*J!v@q
z7UPaWT#LtyGfvBJSTing!L2$R*1})@A^r`rC>g||e4GO}j)BJ(l0onP1N{mR9Mj{x
Q=>Px#07*qoM6N<$f>=0#vH$=8

literal 0
HcmV?d00001

diff --git a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
new file mode 100644
index 0000000000..c4c5b9f5a3
--- /dev/null
+++ b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="wrap_content"
+    android:layout_marginStart="@dimen/dp_190"
+    android:layout_height="wrap_content"
+    android:background="@drawable/v2x_front_warning_bg"
+    android:paddingStart="@dimen/dp_28"
+    android:paddingTop="@dimen/dp_20"
+    android:paddingEnd="@dimen/dp_28"
+    android:paddingBottom="@dimen/dp_20">
+
+    <ImageView
+        android:id="@+id/warning_type_image"
+        android:layout_width="@dimen/dp_100"
+        android:layout_height="@dimen/dp_100"
+        android:src="@drawable/v2x_optimal_route_warning"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/warning_content_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_20"
+        android:text="为您推荐最优路线"
+        android:textColor="#FFFFFF"
+        android:textSize="@dimen/dp_32"
+        app:layout_constraintBottom_toBottomOf="@+id/warning_type_image"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/warning_type_image"
+        app:layout_constraintTop_toTopOf="@+id/warning_type_image" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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 8f79dc7c1e..98db0c3e37 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
@@ -455,7 +455,7 @@
                 android:layout_marginBottom="@dimen/dp_10"
                 android:background="#4CAF50"
                 android:padding="@dimen/dp_10"
-                android:text="拥堵路线推荐"
+                android:text="最优车道推荐"
                 android:textColor="#FFFFFF"
                 android:textSize="@dimen/dp_22"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json
index b466e96184..7eac88ddd5 100644
--- a/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json
+++ b/modules/mogo-module-v2x/src/main/res/raw/scenario_push_vr_event_data_yongdu_gongsi.json
@@ -18,78 +18,42 @@
   "lon":116.41808,
   "polyline": [
     [
-      116.408012,39.968598
+      116.417437,39.983323
     ],
     [
-      116.408784,39.968688
+      116.41924,39.983364
     ],
     [
-      116.409632,39.968688
+      116.421396,39.983397
     ],
     [
-      116.410168,39.968688
+      116.422984,39.983421
     ],
     [
-      116.410898,39.968795
+      116.423016,39.983405
     ],
     [
-      116.412143,39.968812
-    ],
-    [
-      116.414481,39.968919
-    ],
-    [
-      116.41681,39.969025
-    ],
-    [
-      116.417947,39.96905
-    ],
-    [
-      116.418011,39.968179
-    ],
-    [
-      116.418033,39.967644
-    ],
-    [
-      116.417947,39.967225
+      116.424272,39.983397
     ]
   ],
   "recommendPolyline": [
     [
-      116.408012,39.968598
+      116.417437,39.983323
     ],
     [
-      116.408784,39.968688
+      116.41924,39.983364
     ],
     [
-      116.409632,39.968688
+      116.421396,39.983397
     ],
     [
-      116.410168,39.968688
+      116.422984,39.983421
     ],
     [
-      116.410898,39.968795
+      116.423016,39.983405
     ],
     [
-      116.412143,39.968812
-    ],
-    [
-      116.414481,39.968919
-    ],
-    [
-      116.41681,39.969025
-    ],
-    [
-      116.417947,39.96905
-    ],
-    [
-      116.418011,39.968179
-    ],
-    [
-      116.418033,39.967644
-    ],
-    [
-      116.417947,39.967225
+      116.424272,39.983397
     ]
   ]
 }
\ No newline at end of file