diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index aa28e2dee2..7236fea5eb 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -287,11 +287,9 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { * V2XMessageEntity 三次封装(是否进行事件与本机连线 是否显示通话功能等) * V2XEventShowEntity 包含V2XRoadEventEntity * */ - Log.d(TAG,"马上展示图片/视频资源"); + Log.d(TAG,"马上展示图片/视频资源全屏"); V2XMessageEntity v2XMessageEntity = new V2XMessageEntity<>(); - v2XMessageEntity.setContent(v2XEventShowEntity); - mV2XRoadVideoCarScenario = V2XRoadVideoCarScenario.getInstance(); - mV2XRoadVideoCarScenario.init(v2XMessageEntity); + V2XRoadVideoCarScenario.getInstance().init(v2XMessageEntity); } } /** diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationWindow.java index bef1acd8d1..b2e2860f21 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/animation/V2XAnimationWindow.java @@ -87,8 +87,10 @@ public class V2XAnimationWindow extends ConstraintLayout implements IV2XWindow { Logger.w(MODULE_NAME, "场景动画准备。。。。。"); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java index fcb4a3c1a0..1d207bd4dd 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/road/V2XRoadVideoCarScenario.java @@ -11,6 +11,7 @@ import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.scenario.impl.AbsV2XScenario; +import com.mogo.module.v2x.scenario.scene.animation.V2XAnimationWindow; import com.mogo.module.v2x.scenario.view.IV2XWindow; import com.mogo.module.v2x.utils.V2XUtils; import com.mogo.service.windowview.IMogoTopViewStatusListener; @@ -59,23 +60,30 @@ public class V2XRoadVideoCarScenario extends AbsV2XScenario V2XServiceManager .getIMogoWindowManager() .addView(getV2XWindow().getView(), 0, 0, false); - V2XServiceManager.getMoGoV2XStatusManager().setV2XRoadVideoWindowShow(TAG, true); + V2XServiceManager.getMoGoV2XStatusManager().setV2XAnimationWindowShow(TAG, true); } } @Override public void closeWindow() { - + if (getV2XWindow() != null) { + getV2XWindow().close(); + } + V2XServiceManager.getMoGoV2XStatusManager().setV2XRoadVideoWindowShow(TAG, false); } @Override public void showButton() { - + if (getV2XButton() != null) { + getV2XButton().show(); + } } @Override public void closeButton() { - + if (getV2XButton() != null) { + getV2XButton().close(); + } } @Override 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 ac1377ba44..74f118b5dc 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 @@ -15,6 +15,11 @@ import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.listener.V2XWindowStatusListener; import com.mogo.module.v2x.scenario.view.IV2XWindow; import com.mogo.module.v2x.view.TextureVideoView; +import com.mogo.utils.logger.Logger; + +import retrofit2.http.Url; + +import static com.mogo.module.v2x.V2XConst.MODULE_NAME; public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow { @@ -48,14 +53,29 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow { @Override public void show(Object entity) { - mV2XMessageEntity = (V2XMessageEntity) entity; -// String path = - mVideoView.setVideoPath("https://haokan.baidu.com/v?vid=11239381022041270821&pd=bjh&fr=bjhauthor&type=video"); +// mV2XMessageEntity = (V2XMessageEntity) entity; + String path = "http://vd4.bdstatic.com//mda-kh0ijgx47i3uu141//v1-cae//mda-kh0ijgx47i3uu141.mp4"; + mVideoView.setVideoPath(path); + if (path != null) { + mVideoView.setOnPreparedListener(mediaPlayer -> { + Logger.w(MODULE_NAME, "全屏准备。。。。。"); + }); + mVideoView.setOnCompletionListener(mediaPlayer -> { + Logger.w(MODULE_NAME, "全屏展示结束..."); + if (mV2XWindowStatusListener != null) { + mV2XWindowStatusListener.onViewClose(); + } + }); + mVideoView.start(); + } } @Override public void close() { - + //移除窗体 + V2XServiceManager + .getIMogoWindowManager() + .removeView(this); } @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 146a46e559..26989d5087 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 @@ -1,18 +1,30 @@ + android:background="#99000000" + android:paddingStart="@dimen/module_main_v2x_animation_width"> - + android:layout_margin="@dimen/dp_30" + app:roundLayoutRadius="@dimen/dp_28"> - + + + \ No newline at end of file