Merge branch 'vi' into dev

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

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"