From 956da85cbb806cf80e5639ea2cf92d999a35d7ff 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 15:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86Vr=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=B3=E4=B8=8A=E8=A7=92=E5=BC=B9=E7=AA=97=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/values/dimens.xml                     |  2 +-
 .../scenario/scene/livecar/V2XPushLiveCarScenario.java | 10 +++++-----
 .../scenario/scene/livecar/V2XPushLiveCarWindow.java   |  2 +-
 .../scenario/scene/livecar/V2XRoadLiveCarScenario.java | 10 +++++-----
 .../res/layout/item_v2x_road_live_car_detail_vr.xml    |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

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 d5dfbd26b9..9cc9dc544b 100644
--- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml
+++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml
@@ -89,7 +89,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">822px</dimen>
-    <dimen name="module_ext_top_view_no_link_width_in_vr_mode">700px</dimen>
+    <dimen name="module_ext_top_view_no_link_width_in_vr_mode">615px</dimen>
     <dimen name="module_ext_navi_info_panel_width">544px</dimen>
     <dimen name="module_ext_navi_info_panel_height">117px</dimen>
     <dimen name="module_ext_navi_info_panel_small_height">80px</dimen>
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
index 68d8db9e04..812f088cdd 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarScenario.java
@@ -60,11 +60,11 @@ public class V2XPushLiveCarScenario extends AbsV2XScenario<V2XPushMessageEntity>
     @Override
     public void showWindow() {
         if (getV2XWindow() != null) {
-            ViewGroup.LayoutParams layoutParams =
-                    new ViewGroup.LayoutParams(
-                            ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources()
-                                    .getDimension(R.dimen.v2x_video_window_height));
+            int width = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+                    R.dimen.module_v2x_event_window_width_vr : R.dimen.module_v2x_event_window_width);
+            int height = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+                    R.dimen.module_v2x_event_see_live_window_height_vr : R.dimen.module_v2x_event_see_live_window_height);
+            ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(width, height);
             V2XServiceManager
                     .getMogoTopViewManager()
                     .addViewNoLinkage(getV2XWindow().getView(), layoutParams, this);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java
index 92e7004ef9..5c1675c924 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java
@@ -142,7 +142,7 @@ public class V2XPushLiveCarWindow extends V2XBasWindow implements IV2XWindow<V2X
         if (runnableV2XEvent == null) {
             runnableV2XEvent = () -> {
                 //Logger.d(MODULE_NAME, "V2X=== Window 30秒倒计时结束。。。");
-                // 移出Window详细信息
+                //移出Window详细信息
                 //移除窗体
                 V2XServiceManager
                         .getMogoTopViewManager()
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
index 87c3408f56..a42a33ca8f 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarScenario.java
@@ -73,11 +73,11 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
     public void showWindow() {
         Log.d(TAG, getV2XWindow().toString());
         if (getV2XWindow() != null) {
-            ViewGroup.LayoutParams layoutParams =
-                    new ViewGroup.LayoutParams(
-                            ViewGroup.LayoutParams.MATCH_PARENT,
-                            (int) V2XUtils.getApp().getResources()
-                                    .getDimension(R.dimen.v2x_video_window_height));
+            int width = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+                    R.dimen.module_v2x_event_window_width_vr : R.dimen.module_v2x_event_window_width);
+            int height = (int) V2XUtils.getApp().getResources().getDimension(V2XServiceManager.getMoGoStatusManager().isVrMode() ?
+                    R.dimen.module_v2x_event_see_live_window_height_vr : R.dimen.module_v2x_event_see_live_window_height);
+            ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(width, height);
             V2XServiceManager
                     .getMogoTopViewManager()
                     .addViewNoLinkage(getV2XWindow().getView(), layoutParams, this);
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail_vr.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail_vr.xml
index bc9ead60e0..a0ee2aa753 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail_vr.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail_vr.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rlRoadEventDetail"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_394"
+    android:layout_height="@dimen/dp_366"
     android:clipToPadding="false">
 
     <androidx.recyclerview.widget.RecyclerView