Merge remote-tracking branch 'origin/dev_改版主分支-升级融云SDK&AGP8' into dev_改版主分支-升级融云SDK&AGP8

common/build.gradle

@@ -242,4 +242,8 @@ dependencies {
     api 'com.github.xuexiangjys:XUI:1.1.6'
     api 'com.github.xuexiangjys.XUtil:xutil-core:2.0.0'
 
+    //ExoPlayer,腾讯的播放器不支持无缝切换
+    api 'com.google.android.exoplayer:exoplayer:2.18.2'
+    api 'com.google.android.exoplayer:exoplayer-core:2.18.2@aar'
+
 }

common/src/main/java/com/yunbao/common/utils/RouteUtil.java

@@ -59,12 +59,12 @@ public class RouteUtil {
 
     public static final String PATH_VIDEO_NEW_PLAY = "/video/VideoPlayNewActivity";
 
-  /*  public static void forwardVideoPlayActivity(ActiveBean bean) {
-        ARouter.getInstance().build(PATH_VIDEO_PLAY)
+    public static void forwardVideoPlayNewActivity(ActiveBean bean) {
+        ARouter.getInstance().build(PATH_VIDEO_NEW_PLAY)
                 .withParcelable("ActiveBean", bean)
                 .withString(Constants.VIDEO_KEY, Constants.VIDEO_SINGLE)
                 .navigation();
-    }*/
+    }
 
     public static void forwardUserHome(String uid) {
         ARouter.getInstance().build(PATH_USER_HOME)

common/src/main/res/layout/item_comment_video_view.xml

@@ -24,6 +24,7 @@
             android:id="@+id/avatar"
             android:layout_width="50dp"
             android:layout_height="50dp"
+            android:scaleType="centerCrop"
             android:src="@mipmap/icon_data_empty"
             app:riv_oval="true" />