Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

# Conflicts:
#	ydl-platform/build.gradle

config.gradle

@@ -132,11 +132,7 @@ ext {
             "systembartint"                : "com.readystatesoftware.systembartint:systembartint:1.0.3",
             "cube"                         : 'in.srain.cube:cube-sdk:1.0.44@aar',
             "support-multidex"             : 'com.android.support:multidex:1.0.2',
-            "ijkplayer-armv5"              : 'com.dou361.ijkplayer-armv5:jjdxm-ijkplayer-armv5:1.0.0',
-            "ijkplayer-arm64"              : 'com.dou361.ijkplayer-arm64:jjdxm-ijkplayer-arm64:1.0.0',
-            "ijkplayer-x86"                : 'com.dou361.ijkplayer-x86:jjdxm-ijkplayer-x86:1.0.0',
-            "ijkplayer-x86_64"             : 'com.dou361.ijkplayer-x86_64:jjdxm-ijkplayer-x86_64:1.0.0',
-            "ijkplayer-jjdxm"              : 'com.dou361.ijkplayer:jjdxm-ijkplayer:1.0.6',
+            "ydl-ijkplayer-jjdxm"              : 'com.ydl:jjdxm-ijkplayer:0.0.1',
             "robust"                       : 'com.meituan.robust:robust:0.4.87',
             "walle"                        : 'com.meituan.android.walle:library:1.1.5',
             "jpush"                        : 'cn.jiguang.sdk:jpush:3.2.0',

ydl-media/build.gradle

@@ -50,14 +50,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     kapt 'com.alibaba:arouter-compiler:1.2.2'
 
-    api rootProject.ext.dependencies["ijkplayer-armv5"]
-    api rootProject.ext.dependencies["ijkplayer-arm64"]
-    api rootProject.ext.dependencies["ijkplayer-x86"]
-    api rootProject.ext.dependencies["ijkplayer-x86_64"]
-    api(rootProject.ext.dependencies["ijkplayer-jjdxm"]) {
-        exclude group: 'com.android.support', module: 'appcompat-v7'
-    }
-
     api rootProject.ext.dependencies["ydl-user-router"]
     if (rootProject.ext.dev_mode){
         //开发时使用

ydl-media/src/main/java/com/ydl/media/music/utils/ImageUtils.kt

 package com.ydl.media.music.utils
 
-import android.app.Activity
-import android.content.Intent
 import android.graphics.*
-import com.ydl.media.music.constants.RequestCode
 
 /**
  *

ydl-platform/build.gradle

@@ -120,6 +120,11 @@ dependencies {
     api rootProject.ext.dependencies["BaseRecyclerViewAdapterHelper"]
     api rootProject.ext.dependencies["flowlayout"]
     api rootProject.ext.dependencies["androidanimations"]
+
+    api(rootProject.ext.dependencies["ydl-ijkplayer-jjdxm"]) {
+        exclude group: 'com.android.support', module: 'appcompat-v7'
+    }
+    api rootProject.ext.dependencies["exoplayer"]
     //====================Tools====================
     api rootProject.ext.dependencies["robust"]
     api rootProject.ext.dependencies["walle"]