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 1d207bd4dd..6c0c5231b0 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 @@ -57,9 +57,14 @@ public class V2XRoadVideoCarScenario extends AbsV2XScenario public void showWindow() { if (getV2XWindow() != null) { getV2XWindow().show(getV2XMessageEntity().getContent()); + ViewGroup.LayoutParams layoutParams = + new ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + (int) V2XUtils.getApp().getResources() + .getDimension(R.dimen.v2x_video_window_height)); V2XServiceManager - .getIMogoWindowManager() - .addView(getV2XWindow().getView(), 0, 0, false); + .getMogoTopViewManager() + .addViewNoLinkage(getV2XWindow().getView(), layoutParams, this); V2XServiceManager.getMoGoV2XStatusManager().setV2XAnimationWindowShow(TAG, true); } } 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 517f004b7a..0ebdcbbbd5 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 @@ -30,10 +30,11 @@ import java.util.ArrayList; import static com.mogo.module.v2x.VideoInitKt.initVideo; import static com.shuyu.gsyvideoplayer.utils.GSYVideoType.SCREEN_MATCH_FULL; -/* -https://github.com/CarGuo/GSYVideoPlayer/tree/master/doc SimpleCoverVideoPlayer文档 -* */ -public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, IDestroyable, VideoAdapterCallBack { +/** + https://github.com/CarGuo/GSYVideoPlayer/tree/master/doc SimpleCoverVideoPlayer文档 +*/ +public class V2XRoadVideoWindow extends RelativeLayout implements + IV2XWindow, IDestroyable, VideoAdapterCallBack { private static final String TAG = "V2XRoadVideoWindow"; private V2XWindowStatusListener mV2XWindowStatusListener; @@ -92,9 +93,9 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID }); } - /* + /** * 开始播放 - * */ + */ private void startPlayWithVideoUrl(String videoUrl) { gsyVideoOptionBuilder.setUrl(videoUrl).setCacheWithPlay(false).setPlayTag(TAG) .build(simpleCoverVideoPlayer); @@ -103,9 +104,9 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID playImageView.setVisibility(View.GONE); } - /* + /** * 暂停 - * */ + */ private void pause() { playImageView.setVisibility(View.VISIBLE); thumbnailImage.setVisibility(View.GONE); @@ -117,18 +118,18 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID }); } - /* + /** * 继续 - * */ + */ private void resume() { playImageView.setImageResource(R.drawable.v2x_video_pause); playImageView.setVisibility(View.GONE); thumbnailImage.setVisibility(View.GONE); } - /* + /** * 播放结束后 - * */ + */ private void complete(Bitmap firstbitmap, String path) { thumbnailImage.setVisibility(View.VISIBLE); thumbnailImage.setImageBitmap(firstbitmap); @@ -262,8 +263,8 @@ public class V2XRoadVideoWindow extends RelativeLayout implements IV2XWindow, ID public void close() { //移除窗体 V2XServiceManager - .getIMogoWindowManager() - .removeView(this); + .getMogoTopViewManager() + .removeViewNoLinkage(this); } @Override diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml index 4eb87eec93..7d4290cdaa 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/window_road_video_layout.xml @@ -1,58 +1,46 @@ - + android:layout_height="@dimen/v2x_video_window_height_content" + android:background="@drawable/v2x_alert_window_bg" + app:roundLayoutRadius="@dimen/dp_60"> - + android:layout_height="@dimen/dp_200" + android:layout_alignParentTop="true" + android:layout_alignParentBottom="true" + android:clickable="true" /> - - - + - + - - - - \ No newline at end of file + +