删除APlayer

kolarbear · Mar 10, 2020 · 7eedb6c · 7eedb6c
1 parent 3516a9c
commit 7eedb6c
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 296 deletions.
diff --git a/dkplayer-players/exo/src/main/java/com/dueeeke/videoplayer/exo/ExoMediaPlayer.java b/dkplayer-players/exo/src/main/java/com/dueeeke/videoplayer/exo/ExoMediaPlayer.java
@@ -17,7 +17,6 @@
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.analytics.AnalyticsCollector;
-import com.google.android.exoplayer2.source.DefaultMediaSourceEventListener;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MediaSourceEventListener;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
@@ -135,10 +134,9 @@ public void prepareAsync() {
         mInternalPlayer.prepare(mMediaSource);
     }
 
-    private MediaSourceEventListener mMediaSourceEventListener = new DefaultMediaSourceEventListener() {
+    private MediaSourceEventListener mMediaSourceEventListener = new MediaSourceEventListener() {
         @Override
         public void onReadingStarted(int windowIndex, MediaSource.MediaPeriodId mediaPeriodId) {
-            super.onReadingStarted(windowIndex, mediaPeriodId);
             if (mPlayerEventListener != null && mIsPreparing) {
                 mPlayerEventListener.onPrepared();
             }

diff --git a/dkplayer-players/thunder/.gitignore b/dkplayer-players/thunder/.gitignore
diff --git a/dkplayer-players/thunder/build.gradle b/dkplayer-players/thunder/build.gradle
diff --git a/dkplayer-players/thunder/libs/APlayerAndroid.aar b/dkplayer-players/thunder/libs/APlayerAndroid.aar
diff --git a/dkplayer-players/thunder/src/main/AndroidManifest.xml b/dkplayer-players/thunder/src/main/AndroidManifest.xml
diff --git a/...yer-players/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayer.java b/...yer-players/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayer.java
diff --git a/...yers/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayerFactory.java b/...yers/thunder/src/main/java/com/dueeeke/videoplayer/thunder/ThunderMediaPlayerFactory.java
diff --git a/dkplayer-sample/build.gradle b/dkplayer-sample/build.gradle
@@ -69,12 +69,6 @@ android {
     }
 }
 
-repositories {
-    flatDir {
-        dirs project(':dkplayer-players:thunder').file('libs')
-    }
-}
-
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 //    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0'
@@ -93,7 +87,6 @@ dependencies {
     implementation project(':dkplayer-ui')
     implementation project(path: ':dkplayer-players:ijk')
     implementation project(path: ':dkplayer-players:exo')
-    implementation project(path: ':dkplayer-players:thunder')
     //缓存
     implementation project(':dkplayer-videocache')
 

diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/MainActivity.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/activity/MainActivity.java
@@ -25,7 +25,6 @@
 import com.dueeeke.videoplayer.player.PlayerFactory;
 import com.dueeeke.videoplayer.player.VideoViewConfig;
 import com.dueeeke.videoplayer.player.VideoViewManager;
-import com.dueeeke.videoplayer.thunder.ThunderMediaPlayerFactory;
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 import com.yanzhenjie.permission.AndPermission;
 import com.yanzhenjie.permission.runtime.Permission;
@@ -66,8 +65,6 @@ protected void initView() {
             setTitle(getResources().getString(R.string.app_name) + " (IjkPlayer)");
         } else if (factory instanceof AndroidMediaPlayerFactory) {
             setTitle(getResources().getString(R.string.app_name) + " (MediaPlayer)");
-        } else if (factory instanceof ThunderMediaPlayerFactory) {
-            setTitle(getResources().getString(R.string.app_name) + " (APlayer)");
         } else {
             setTitle(getResources().getString(R.string.app_name) + " (unknown)");
         }
@@ -105,7 +102,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 break;
         }
 
-        if (itemId == R.id.ijk || itemId == R.id.exo || itemId == R.id.media || itemId == R.id.thunder) {
+        if (itemId == R.id.ijk || itemId == R.id.exo || itemId == R.id.media) {
             //切换播放核心，不推荐这么做，我这么写只是为了方便测试
             VideoViewConfig config = VideoViewManager.getConfig();
             try {
@@ -125,10 +122,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
                         playerFactory = AndroidMediaPlayerFactory.create();
                         setTitle(getResources().getString(R.string.app_name) + " (MediaPlayer)");
                         break;
-                    case R.id.thunder:
-                        playerFactory = ThunderMediaPlayerFactory.create();
-                        setTitle(getResources().getString(R.string.app_name) + " (APlayer)");
-                        break;
                 }
                 mPlayerFactoryField.set(config, playerFactory);
             } catch (Exception e) {

diff --git a/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/component/DebugInfoView.java b/dkplayer-sample/src/main/java/com/dueeeke/dkplayer/widget/component/DebugInfoView.java
@@ -19,7 +19,6 @@
 import com.dueeeke.videoplayer.exo.ExoMediaPlayerFactory;
 import com.dueeeke.videoplayer.ijk.IjkPlayerFactory;
 import com.dueeeke.videoplayer.player.AndroidMediaPlayerFactory;
-import com.dueeeke.videoplayer.thunder.ThunderMediaPlayerFactory;
 
 /**
  * 调试信息
@@ -88,8 +87,6 @@ protected String getCurrentPlayer() {
             player = "IjkPlayer";
         } else if (playerFactory instanceof AndroidMediaPlayerFactory) {
             player = "MediaPlayer";
-        } else if (playerFactory instanceof ThunderMediaPlayerFactory) {
-            player = "APlayer";
         } else {
             player = "unknown";
         }

diff --git a/dkplayer-sample/src/main/res/menu/main_menu.xml b/dkplayer-sample/src/main/res/menu/main_menu.xml
@@ -15,8 +15,6 @@
                 android:title="ExoPlayer"/>
             <item android:id="@+id/media"
                 android:title="MediaPlayer"/>
-            <item android:id="@+id/thunder"
-                android:title="APlayer"/>
         </menu>
     </item>
 </menu>
diff --git a/settings.gradle b/settings.gradle
@@ -2,5 +2,4 @@ include ':dkplayer-sample', ':dkplayer-videocache'
 include ':dkplayer-java'
 include ':dkplayer-ui'
 include 'dkplayer-players:ijk'
-include 'dkplayer-players:exo'
-include 'dkplayer-players:thunder'
+include 'dkplayer-players:exo'