From 459551e3d5151cc2b8fdfb350f6653e4dacbb0d2 Mon Sep 17 00:00:00 2001
From: shuyu <359369982@qq.com>
Date: Sat, 20 Oct 2018 14:29:26 +0800
Subject: [PATCH] update exoPlayer to 2.9.0

---
 app/build.gradle                                     |  2 ++
 .../com/example/gsyvideoplayer/GSYApplication.java   |  2 +-
 dependencies.gradle                                  |  2 +-
 .../danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java   | 12 +-----------
 gsyVideoPlayer/build.gradle                          |  4 ++--
 5 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2d91f31..3e73b59 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,6 +57,8 @@ android {
             jniLibs.srcDirs = ['libs']
         }
     }
+
+    compileOptions { targetCompatibility JavaVersion.VERSION_1_8 }
 }
 
 dependencies {
diff --git a/app/src/main/java/com/example/gsyvideoplayer/GSYApplication.java b/app/src/main/java/com/example/gsyvideoplayer/GSYApplication.java
index 88783f5..d26e7c8 100644
--- a/app/src/main/java/com/example/gsyvideoplayer/GSYApplication.java
+++ b/app/src/main/java/com/example/gsyvideoplayer/GSYApplication.java
@@ -39,7 +39,7 @@ public class GSYApplication extends MultiDexApplication {
         //GSYVideoType.enableMediaCodec();
         //GSYVideoType.enableMediaCodecTexture();
 
-        //PlayerFactory.setPlayManager(Exo2PlayerManager.class);//EXO模式
+        PlayerFactory.setPlayManager(Exo2PlayerManager.class);//EXO模式
         //PlayerFactory.setPlayManager(SystemPlayerManager.class);//系统模式
         //PlayerFactory.setPlayManager(IjkPlayerManager.class);//ijk模式
 
diff --git a/dependencies.gradle b/dependencies.gradle
index ae130dd..2db18c2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -31,7 +31,7 @@ ext {
 
     gsyVideoVersion = '6.0.1'
 
-    exo_player2 = '2.8.4'
+    exo_player2 = '2.9.0'
 
     permissionsdispatcher = '3.2.0'
 
diff --git a/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java
index 3be927d..be02406 100644
--- a/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java
+++ b/gsyVideoPlayer-exo_player2/src/main/java/tv/danmaku/ijk/media/exo2/IjkExo2MediaPlayer.java
@@ -179,7 +179,7 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev
 
         rendererFactory = new DefaultRenderersFactory(mAppContext, extensionRendererMode);
         DefaultLoadControl loadControl = new DefaultLoadControl();
-        mInternalPlayer = ExoPlayerFactory.newSimpleInstance(rendererFactory, mTrackSelector, loadControl, null);
+        mInternalPlayer = ExoPlayerFactory.newSimpleInstance(mAppContext, rendererFactory, mTrackSelector, loadControl, null);
         mInternalPlayer.addListener(this);
         mInternalPlayer.addAnalyticsListener(this);
         mInternalPlayer.addListener(mEventLogger);
@@ -637,16 +637,6 @@ public class IjkExo2MediaPlayer extends AbstractMediaPlayer implements Player.Ev
 
     }
 
-    @Override
-    public void onViewportSizeChange(EventTime eventTime, int width, int height) {
-
-    }
-
-    @Override
-    public void onNetworkTypeChanged(EventTime eventTime, @Nullable NetworkInfo networkInfo) {
-
-    }
-
     @Override
     public void onMetadata(EventTime eventTime, Metadata metadata) {
 
diff --git a/gsyVideoPlayer/build.gradle b/gsyVideoPlayer/build.gradle
index c32ac6d..d284dd8 100644
--- a/gsyVideoPlayer/build.gradle
+++ b/gsyVideoPlayer/build.gradle
@@ -32,7 +32,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     //api project(':gsyVideoPlayer-java')
-    //api project(':gsyVideoPlayer-exo_player2')
+    api project(':gsyVideoPlayer-exo_player2')
     //api project(':gsyVideoPlayer-armv5')
     //api project(':gsyVideoPlayer-armv7a')
     //api project(':gsyVideoPlayer-armv64')
@@ -45,7 +45,7 @@ dependencies {
     //api "com.shuyu:GSYVideoPlayer:$gsyVideoVersion"
 
     api "com.shuyu:gsyVideoPlayer-java:$gsyVideoVersion"
-    api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion"
+    //api "com.shuyu:GSYVideoPlayer-exo2:$gsyVideoVersion"
     api "com.shuyu:gsyVideoPlayer-armv5:$gsyVideoVersion"
     api "com.shuyu:gsyVideoPlayer-armv7a:$gsyVideoVersion"
     api "com.shuyu:gsyVideoPlayer-arm64:$gsyVideoVersion"
-- 
GitLab