From a8728174b134af06c231c203de47db5e7b99263e Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Thu, 29 Oct 2020 16:37:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E6=A1=86=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4,=E5=B1=82=E7=BA=A7=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scene/livecar/V2XRoadLiveCarScenario.java     |  9 +++++----
 .../scene/livecar/V2XRoadLiveCarWindow.java       | 11 ++++-------
 .../src/main/res/layout/item_v2x_live_video.xml   |  2 +-
 .../res/layout/item_v2x_road_live_car_detail.xml  | 15 +++++++++------
 .../src/main/res/values-ldpi/dimens.xml           |  5 +++++
 .../src/main/res/values-mdpi/dimens.xml           |  4 ++++
 .../src/main/res/values-xhdpi/dimens.xml          |  5 +++++
 7 files changed, 33 insertions(+), 18 deletions(-)

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 ffbdb1e14b..bb4e4b9261 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
@@ -5,6 +5,7 @@ import android.view.View;
 
 import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XMessageEntity;
+import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.scenario.impl.AbsV2XScenario;
@@ -77,11 +78,11 @@ public class V2XRoadLiveCarScenario extends AbsV2XScenario<List<V2XEventShowEnti
     public void showWindow() {
         Log.d(TAG,getV2XWindow().toString());
         if (getV2XWindow() != null) {
-            V2XServiceManager
-                    .getMogoTopViewManager()
-                    .addSubView(getV2XWindow().getView(), this);
             getV2XWindow().show(getV2XMessageEntity().getContent());
-            V2XServiceManager.getMoGoV2XStatusManager().setRoadLiveCarWindowShow(TAG, true);
+            V2XServiceManager
+                    .getIMogoWindowManager()
+                    .addView(getV2XWindow().getView(), 0, 0, false);
+            V2XServiceManager.getMoGoV2XStatusManager().setV2XAnimationWindowShow(TAG, true);
         }
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarWindow.java
index c8fad1177a..74906d52fe 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarWindow.java
@@ -193,13 +193,10 @@ public class V2XRoadLiveCarWindow extends RelativeLayout
             runnableV2XEvent = null;
         }
 
-        if (V2XServiceManager
-                .getMogoTopViewManager().isViewAdded(this)) {
-            //移除窗体
-            V2XServiceManager
-                    .getMogoTopViewManager()
-                    .removeSubView(this);
-        }
+        //移除窗体
+        V2XServiceManager
+                .getIMogoWindowManager()
+                .removeView(this);
     }
 
     @Override
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
index 8dc6414261..40b58102cf 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml
@@ -3,7 +3,7 @@
     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/module_v2x_event_window_height"
+    android:layout_height="@dimen/v2x_video_window_height"
     android:background="@drawable/v2x_alert_window_bg">
 
     <com.mogo.module.v2x.view.V2XLiveGSYVideoView
diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
index d8e4371717..c6c5b0a658 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
@@ -4,7 +4,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/rlRoadEventDetail"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/module_v2x_event_window_height">
+    android:layout_height="@dimen/v2x_video_window_height"
+    android:background="@drawable/v2x_alert_window_bg"
+    android:layout_marginLeft="@dimen/v2x_right_context_magin"
+    android:layout_marginTop="@dimen/dp_22">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvRoadEventList"
@@ -23,7 +26,7 @@
         android:id="@+id/tvEventStubClose"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_25"
+        android:layout_marginRight="@dimen/dp_20"
         android:layout_marginTop="@dimen/dp_20"
         android:background="@drawable/bg_count_down"
         android:paddingLeft="@dimen/dp_12"
@@ -33,17 +36,17 @@
         android:text="30s"
         android:textColor="#FFFFFF"
         android:textSize="@dimen/dp_30"
-        app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
+        app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
         app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
 
     <ImageView
         android:layout_width="@dimen/dp_130"
         android:layout_height="@dimen/dp_46"
         android:layout_alignParentEnd="true"
-        android:layout_marginTop="@dimen/dp_28"
-        android:layout_marginEnd="@dimen/dp_28"
+        android:layout_marginLeft="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_20"
         android:src="@drawable/v2x_icon_event_live_top"
-        app:layout_constraintEnd_toEndOf="@+id/rvRoadEventList"
+        app:layout_constraintStart_toStartOf="@+id/rvRoadEventList"
         app:layout_constraintTop_toTopOf="@+id/rvRoadEventList" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index dd0891cca4..5e45fa03a7 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -102,4 +102,9 @@
     <dimen name="module_v2x_event_panel_btn_x">572px</dimen>
     <dimen name="module_v2x_event_panel_in_launcher_btn_x">480px</dimen>
     <dimen name="module_v2x_event_panel_btn_y">384px</dimen>
+
+    <!---->
+    <dimen name="v2x_right_context_magin">460px</dimen>
+    <dimen name="v2x_video_window_height">474px</dimen>
+    
 </resources>
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 3af13f8c79..625976b887 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -104,4 +104,8 @@
     <dimen name="module_v2x_event_panel_in_launcher_btn_x">480px</dimen>
     <dimen name="module_v2x_event_panel_btn_y">384px</dimen>
 
+    <!---->
+    <dimen name="v2x_right_context_magin">460px</dimen>
+    <dimen name="v2x_video_window_height">474px</dimen>
+
 </resources>
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 37c004aa56..0ce4540ea4 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
@@ -101,4 +101,9 @@
     <dimen name="module_v2x_event_panel_in_launcher_btn_x">940px</dimen>
     <dimen name="module_v2x_event_panel_btn_y">701px</dimen>
 
+    <!--适配直播框-->
+    <dimen name="v2x_right_context_magin">820px</dimen>
+    <dimen name="v2x_video_window_height">674px</dimen>
+
+
 </resources>