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 26b82cb32d..b805141238 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,8 +11,6 @@ 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; @@ -132,6 +130,6 @@ public class V2XRoadVideoCarScenario extends AbsV2XScenario @Override public void beforeViewRemoveAnim(View view) { Log.d(TAG, "beforeViewRemoveAnim"); - closeWindow(); + ( (V2XRoadVideoWindow)getV2XWindow()).pauseVideo(); } } 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 d2c98d978d..37784bf6f5 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 @@ -19,6 +19,7 @@ import com.mogo.module.v2x.listener.V2XWindowStatusListener; import com.mogo.module.v2x.scenario.view.IV2XWindow; import com.mogo.module.v2x.view.SimpleCoverVideoPlayer; import com.mogo.utils.BitmapHelper; +import com.shuyu.gsyvideoplayer.GSYVideoManager; import com.shuyu.gsyvideoplayer.builder.GSYVideoOptionBuilder; import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack; import com.shuyu.gsyvideoplayer.utils.GSYVideoType; @@ -99,6 +100,7 @@ public class V2XRoadVideoWindow extends RelativeLayout implements gsyVideoOptionBuilder.setUrl(videoUrl).setCacheWithPlay(false).setPlayTag(TAG) .build(simpleCoverVideoPlayer); simpleCoverVideoPlayer.getStartButton().performClick(); + GSYVideoManager.instance().setNeedMute(true); thumbnailImage.setVisibility(View.GONE); playImageView.setVisibility(View.GONE); } @@ -260,14 +262,14 @@ public class V2XRoadVideoWindow extends RelativeLayout implements @Override public void close() { - pushVideo(); + pauseVideo(); //移除窗体 V2XServiceManager .getMogoTopViewManager() .removeViewNoLinkage(this); } - void pushVideo() { + public void pauseVideo() { if (simpleCoverVideoPlayer != null) { simpleCoverVideoPlayer.onVideoPause(); } diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_share_item_like.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_share_item_like.png new file mode 100644 index 0000000000..49b9436c57 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_share_item_like.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_share_item_unlike.png b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_share_item_unlike.png new file mode 100644 index 0000000000..86ddd897ca Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-ldpi/v2x_share_item_unlike.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_share_item_like.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_share_item_like.png new file mode 100644 index 0000000000..49b9436c57 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_share_item_like.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_share_item_unlike.png b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_share_item_unlike.png new file mode 100644 index 0000000000..86ddd897ca Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-mdpi/v2x_share_item_unlike.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_share_item_like.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_share_item_like.png new file mode 100644 index 0000000000..3a4e93249b Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_share_item_like.png differ diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_share_item_unlike.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_share_item_unlike.png new file mode 100644 index 0000000000..d169b2e1c0 Binary files /dev/null and b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi/v2x_share_item_unlike.png differ diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml index f6aa04154c..7194aa6524 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_item.xml @@ -30,17 +30,18 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_centerInParent="true" + android:layout_alignTop="@+id/road_case_style" android:paddingRight="@dimen/dp_28" android:text="100" android:textColor="#FFFFFF" - android:textSize="@dimen/dp_34" /> + android:textSize="@dimen/dp_26" /> - + android:textSize="@dimen/dp_26" /> - diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_share_item_like.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_share_item_like.png new file mode 100644 index 0000000000..49b9436c57 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_share_item_like.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_share_item_unlike.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_share_item_unlike.png new file mode 100644 index 0000000000..f2f29a4380 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-ldpi/v2x_share_item_unlike.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_share_item_like.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_share_item_like.png new file mode 100644 index 0000000000..49b9436c57 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_share_item_like.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_share_item_unlike.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_share_item_unlike.png new file mode 100644 index 0000000000..f2f29a4380 Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-mdpi/v2x_share_item_unlike.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_share_item_like_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_share_item_like_light.png new file mode 100644 index 0000000000..3a4e93249b Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_share_item_like_light.png differ diff --git a/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_share_item_unlike_light.png b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_share_item_unlike_light.png new file mode 100644 index 0000000000..7c44f3cfaa Binary files /dev/null and b/skin/mogo-skin-light/src/main/module-v2x-res/drawable-xhdpi/v2x_share_item_unlike_light.png differ