From c4fade6820894f1bc21124f350cd3164c475ae7d Mon Sep 17 00:00:00 2001
From: liujing <liujing@zhidaoauto.com>
Date: Tue, 20 Oct 2020 10:13:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=BB=93=E6=9D=9F=E5=90=8E?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=AC=AC=E4=B8=80=E5=B8=A7=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F+=E9=87=8D=E5=A4=8D=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scene/road/V2XRoadVideoWindow.java        | 33 +++++++++++--------
 .../src/main/res/layout/window_road_video.xml |  1 +
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
index 6f5d93dda6..ff4a6ffa3a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoWindow.java
@@ -78,20 +78,8 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
 
                 mVideoView.setOnCompletionListener(mediaPlayer -> {
                     Logger.w(MODULE_NAME, "视频播放结束...");
-                    Bitmap bitmap = BitmapHelper.getVideoThumbnail(path);
-                    mThumbnailImageView.setVisibility(View.VISIBLE);
-                    mThumbnailImageView.setImageBitmap(bitmap);
-
-                    windowPalyImageView.setVisibility(View.VISIBLE);
-                    windowPalyImageView.setOnClickListener(v -> {
-                        videoViewStartWithPath(path);
-
-                    });
-                    if (mV2XWindowStatusListener != null) {
-                        mV2XWindowStatusListener.onViewClose();
-                    }
+                    videoPlayEnd();
                 });
-                mVideoView.start();
 
             }
 
@@ -109,6 +97,25 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID
             mThumbnailImageView.setVisibility(View.GONE);
             windowPalyImageView.setVisibility(View.GONE);
         });
+        mVideoView.start();
+    }
+
+    /*
+    * 视频播放结束
+    * */
+    private void videoPlayEnd(){
+        Bitmap bitmap = BitmapHelper.getVideoThumbnail(path);
+        mThumbnailImageView.setVisibility(View.VISIBLE);
+        mThumbnailImageView.setImageBitmap(bitmap);
+
+        windowPalyImageView.setVisibility(View.VISIBLE);
+        windowPalyImageView.setOnClickListener(v -> {
+            videoViewStartWithPath(path);
+
+        });
+        if (mV2XWindowStatusListener != null) {
+            mV2XWindowStatusListener.onViewClose();
+        }
     }
 
     @Override
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
index 3ac98e63f0..d43b868146 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video.xml
@@ -33,6 +33,7 @@
             android:layout_height="match_parent"
             android:background="@drawable/v2x_bg_big_image_dark"
             android:visibility="gone"
+            android:scaleType="fitXY"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"