Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml
2020-11-03 13:37:05 +08:00
parent f6473a8d31 f81dff0329
commit 80f51fa5d1
237 changed files with 3 additions and 8032 deletions
--- 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
@@ -261,6 +261,7 @@ public class V2XRoadVideoWindow extends RelativeLayout implements

    @Override
    public void close() {
+        simpleCoverVideoPlayer.onVideoPause();
        //移除窗体
        V2XServiceManager
                .getMogoTopViewManager()