Merge branch 'll' into dev

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<V2XEventShowEntity>
     @Override
     public void beforeViewRemoveAnim(View view) {
         Log.d(TAG, "beforeViewRemoveAnim");
-        closeWindow();
+        ( (V2XRoadVideoWindow)getV2XWindow()).pauseVideo();
     }
 }

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();
         }

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" />
 
-    <com.mogo.module.v2x.view.HeartUnLikeView
+    <ImageView
         android:id="@+id/road_case_useless"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:layout_alignTop="@+id/road_case_style"
+        android:src="@drawable/v2x_share_item_unlike"
         android:layout_toLeftOf="@id/road_case_useless_num"
         android:clickable="false"
         android:gravity="center"
@@ -50,19 +51,20 @@
         android:id="@+id/road_case_useful_num"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:layout_alignTop="@+id/road_case_style"
         android:layout_toLeftOf="@id/road_case_useless"
         android:gravity="left"
         android:paddingRight="@dimen/dp_28"
         android:text="100"
         android:textColor="#FFFFFF"
-        android:textSize="@dimen/dp_34" />
+        android:textSize="@dimen/dp_26" />
 
-    <com.mogo.module.v2x.view.HeartLikeView
+    <ImageView
         android:id="@+id/road_case_uselful"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
+        android:src="@drawable/v2x_share_item_like"
+        android:layout_alignTop="@+id/road_case_style"
         android:layout_toLeftOf="@id/road_case_useful_num"
         android:clickable="false"
         android:paddingRight="5px" />