Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/newModuleStrike

韩亚云
2 parents 595a51fb 273f0cf5
Showing 17 changed files with 274 additions and 86 deletions
.idea/inspectionProfiles/Project_Default.xml
app/strike/src/main/AndroidManifest.xml
app/strike/src/main/java/com/cnlive/strike/DemoApplication.java
app/strike/src/main/java/com/cnlive/strike/demo/activity/ExoPlayerActivity.java
cloud/video/src/main/java/com/danikula/videocache/StorageUtils.java
cloud/video/src/main/java/com/libs/video/util/cache/ProxyVideoCacheManager.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/PlayErrorException.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/component/DebugInfoView.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/controller/MediaPlayerControl.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/AbstractPlayer.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/CNVideoView.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/VideoViewConfig.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/playerCore/exoplayer/ExoMediaPlayer.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/playerCore/exoplayer/ExoMediaSourceHelper.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/AndroidMediaPlayer.java → cloud/video/src/main/java/com/libs/video/video/exoplayer/playerCore/mediaplayer/AndroidMediaPlayer.java
cloud/video/src/main/java/com/libs/video/video/exoplayer/util/PlayCacheUtils.java
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AndroidLintLockedOrientationActivity" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintSourceLockedOrientationActivity" enabled="false" level="ERROR" enabled_by_default="false" />
+  </profile>
+</component>
 \ No newline at end of file
@@ -34,20 +34,20 @@
         </provider>
         <activity
             android:name="com.cnlive.strike.demo.activity.tiktok.TikTokViewPager2Activity"
-            android:screenOrientation="fullSensor" />
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.cnlive.strike.demo.activity.tiktok.TikTokRecycleActivity"
-            android:screenOrientation="fullSensor" />
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.cnlive.strike.demo.activity.tiktok.DemoTikTokActivity"
-            android:screenOrientation="fullSensor" />
+            android:screenOrientation="portrait" />
         <activity
             android:name="com.cnlive.strike.demo.activity.tiktok.TikTokVerticalViewPagerActivity"
-            android:screenOrientation="fullSensor" />
+            android:screenOrientation="portrait"/>
         <activity
             android:name="com.cnlive.strike.demo.activity.ExoPlayerActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="fullSensor" />
+            android:screenOrientation="portrait" />
         <activity android:name="com.cnlive.strike.demo.activity.CNplayerActivity" />
         <activity android:name="com.cnlive.strike.demo.activity.DemoAnimActivity" />
         <activity
@@ -101,7 +101,7 @@ public class DemoApplication extends BaseApplication {
 //                .setPlayerFactory(ThunderMediaPlayerFactory.create())
               .setPlayerFactory(ExoMediaPlayerFactory.create())
               .setRenderViewFactory(TextureRenderViewFactory.create())
-              .setEnableOrientation(true)
+              .setEnableOrientation(false)
 //                .setEnableAudioFocus(false)
 //                .setScreenScaleType(VideoView.SCREEN_SCALE_MATCH_PARENT)
 //                .setAdaptCutout(false)
@@ -18,10 +18,13 @@ import com.google.android.exoplayer2.source.hls.HlsMediaSource;
 import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoListener;
+import com.libs.video.util.cache.PreloadManager;
 import com.libs.video.util.cache.ProxyVideoCacheManager;
 import com.libs.video.video.exoplayer.component.DefaultErrorView;
 import com.libs.video.video.exoplayer.component.DefaultYoukuPrepareView;
 import com.libs.video.video.exoplayer.play.CNVideoView;
+import com.libs.video.video.exoplayer.playerCore.exoplayer.ExoMediaSourceHelper;
+import com.libs.video.video.exoplayer.util.PlayCacheUtils;
 import com.libs.video.video.test.CNLiveVideoView;
 import com.libs.video.video.test.VideoPlayer;
 import com.libs.video.video.exoplayer.component.DefaultAdControlView;
@@ -44,6 +47,7 @@ public class ExoPlayerActivity extends BaseActivity implements VideoListener, Pl
     private static final String URL_AD = "https://gslb.miaopai.com/stream/IR3oMYDhrON5huCmf7sHCfnU5YKEkgO2.mp4";
     private StandardVideoController mController;
+    private PreloadManager mPreloadManager;
     @Override
     protected int getBindLayoutId() {
@@ -82,7 +86,6 @@ public class ExoPlayerActivity extends BaseActivity implements VideoListener, Pl
         player.prepare(hlsMediaSource);
-
         mController = new StandardVideoController(this);
         DefaultAdControlView adControlView = new DefaultAdControlView(this);
         adControlView.setListener(new DefaultAdControlView.AdControlListener() {
@@ -96,15 +99,13 @@ public class ExoPlayerActivity extends BaseActivity implements VideoListener, Pl
                 playVideo();
             }
         });
-        DefaultErrorView errorView=new DefaultErrorView(this);
-        mController.addControlComponent(adControlView,new DefaultYoukuPrepareView(me),errorView);
+        DefaultErrorView errorView = new DefaultErrorView(this);
+        mController.addControlComponent(adControlView, new DefaultYoukuPrepareView(me), errorView);
         //直播
-        HttpProxyCacheServer cacheServer = ProxyVideoCacheManager.getProxy(this);
-        String proxyUrl = cacheServer.getProxyUrl(URL_AD);
-        binding.playerView.setUrl(proxyUrl);
-//        binding.playerView.setUrl("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
+//        binding.playerView.setUrl(proxyUrl);
+        binding.playerView.setUrl("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8", true);
         binding.playerView.setVideoController(mController);
-        binding.playerView.setScreenScaleType(CNVideoView.SCREEN_SCALE_16_9);
+//        binding.playerView.setScreenScaleType(CNVideoView.SCREEN_SCALE_16_9);
         binding.playerView.start();
         //监听播放结束
 //        binding.playerView.addOnStateChangeListener(new CNVideoView.SimpleOnStateChangeListener() {
@@ -154,7 +155,7 @@ public class ExoPlayerActivity extends BaseActivity implements VideoListener, Pl
     private void playVideo() {
         binding.playerView.release();
         mController.removeAllControlComponent();
-        mController.addDefaultControlComponent("正片", true);
+        mController.addDefaultControlComponent("正片", false);
         //重新设置数据
 //        List<String> list = new ArrayList<>();
 //        list.add("http://sbslive.cnrmobile.com/storage/storage4/76/23/10/14de52115893fb5371b7e064f910ab7b.3gp");
@@ -162,8 +163,8 @@ public class ExoPlayerActivity extends BaseActivity implements VideoListener, Pl
 //        list.add("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
 //        list.add("http://ivi.bupt.edu.cn/hls/cctv1hd.m3u8");
 //        binding.playerView.setDataSource(list);
-        binding.playerView.setUrl("rtmp://tyzg.rtmps2.cnlive.com/live-tyzg-577/577_999");
-
+        binding.playerView.setUrl("https://qq.com-ok-qq.com/20191005/24249_f5e36323/index.m3u8", true);
+//        binding.playerView.setUrl("rtmp://tyzg.rtmps2.cnlive.com/live-tyzg-577/577_999");
         //开始播放
         binding.playerView.start();
     }
@@ -187,4 +188,6 @@ public class ExoPlayerActivity extends BaseActivity implements VideoListener, Pl
 //        });
     }
+
+
 }
@@ -37,7 +37,7 @@ public final class StorageUtils {
      * <i>("/Android/data/[app_package_name]/cache")</i> (if card is mounted and app has appropriate permission) or
      * on device's file system depending incoming parameters.
      *
-     * @param context        Application context
+     * @param context Application context
      * @return Cache {@link File directory}.<br />
      * <b>NOTE:</b> Can be null in some unpredictable cases (if SD card is unmounted and
      * {@link Context#getCacheDir() Context.getCacheDir()} returns null).
@@ -58,6 +58,26 @@ public final class StorageUtils {
     }
     /**
+     * 获取缓存路径
+     *
+     * @param context
+     * @return
+     */
+    public static String getCacheDirectoryPath(Context context) {
+        String appCacheDir = null;
+        if (MEDIA_MOUNTED.equals(Environment.getExternalStorageState())) {
+            appCacheDir = context.getExternalCacheDir().getAbsolutePath();
+        }
+        if (appCacheDir == null) {
+            appCacheDir = context.getCacheDir().getAbsolutePath();
+        }
+        if (appCacheDir == null) {
+            appCacheDir = "/data/data/" + context.getPackageName() + "/cache/";
+        }
+        return appCacheDir;
+    }
+
+    /**
      * delete directory
      */
     public static boolean deleteFiles(File root) {
@@ -20,7 +20,7 @@ public class ProxyVideoCacheManager {
     private static HttpProxyCacheServer newProxy(Context context) {
         return new HttpProxyCacheServer.Builder(context)
-                .maxCacheSize(512 * 1024 * 1024)       // 512MB for cache
+                .maxCacheSize(1024 * 1024 * 1024)       // 512MB for cache
                 //缓存路径，不设置默认在sd_card/Android/data/[app_package_name]/cache中
 //                .cacheDirectory()
                 .build();
@@ -5,8 +5,6 @@ import android.text.TextUtils;
 import androidx.annotation.IntDef;
-import com.cnlive.core.libs.base.util.StatusBarConfig;
-
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -19,26 +17,20 @@ public class PlayErrorException extends Exception {
     public static final int TYPE_OUT_OF_MEMORY = 2;//内存溢出
     public static final int TYPE_UNEXPECTED_ERROR = 3;//未知错误
     public static final int TYPE_RENDERER_ERROR = 4;//渲染异常
-    public static final int TYPE_MediaPlayer_IOException = 5;
-    public static final int TYPE_MediaPlayer_IllegalArgumentException = 6;
-    public static final int TYPE_MediaPlayer_SecurityException = 7;
-    public static final int TYPE_MediaPlayer_IllegalStateException = 8;
-    public static final int TYPE_MediaPlayer_unknownException = 9;
-    public static final int TYPE_MediaPlayer_ON_ERROR = 10;
-
-
+    public static final int TYPE_IllegalArgumentException = 5;
+    public static final int TYPE_SecurityException = 6;
+    public static final int TYPE_IllegalStateException = 7;
+    public static final int TYPE_TIMED_OUT_ERROR = 9;//播放超时错误
+    public static final int TYPE_MEDIA_UNSUPPORTED_ERROR = 10;//不支持的媒体类型
+    public static final int TYPE_MEDIA_SERVER_DIED_ERROR = 11;//媒体服务器挂机（应用必须释放对象，然后开启新的实例）
+    public static final int TYPE_OTHER_ERROR = 12;//其他错误
     private int errorType;//错误类型
     private String errorMsg;//错误信息
-    private MediaPlayer mediaPlayer;
-    private int mediaPlayer_what;
-    private int mediaPlayer_extra;
-
-
     @IntDef({TYPE_NETWORK_ERROR, TYPE_SOURCE_ERROR, TYPE_OUT_OF_MEMORY, TYPE_UNEXPECTED_ERROR, TYPE_RENDERER_ERROR,
-            TYPE_MediaPlayer_IOException, TYPE_MediaPlayer_IllegalArgumentException, TYPE_MediaPlayer_SecurityException,
-            TYPE_MediaPlayer_IllegalStateException, TYPE_MediaPlayer_unknownException, TYPE_MediaPlayer_ON_ERROR})
+            TYPE_IllegalArgumentException, TYPE_SecurityException, TYPE_IllegalStateException,
+            TYPE_TIMED_OUT_ERROR,TYPE_MEDIA_UNSUPPORTED_ERROR,TYPE_MEDIA_SERVER_DIED_ERROR,TYPE_OTHER_ERROR})
     @Retention(RetentionPolicy.SOURCE)
     public @interface Type {
     }
@@ -70,27 +62,4 @@ public class PlayErrorException extends Exception {
         this.errorMsg = errorMsg;
     }
-    public MediaPlayer getMediaPlayer() {
-        return mediaPlayer;
-    }
-
-    public void setMediaPlayer(MediaPlayer mediaPlayer) {
-        this.mediaPlayer = mediaPlayer;
-    }
-
-    public int getMediaPlayer_what() {
-        return mediaPlayer_what;
-    }
-
-    public void setMediaPlayer_what(int mediaPlayer_what) {
-        this.mediaPlayer_what = mediaPlayer_what;
-    }
-
-    public int getMediaPlayer_extra() {
-        return mediaPlayer_extra;
-    }
-
-    public void setMediaPlayer_extra(int mediaPlayer_extra) {
-        this.mediaPlayer_extra = mediaPlayer_extra;
-    }
 }
@@ -13,7 +13,7 @@ import android.widget.TextView;
 import com.libs.video.video.exoplayer.PlayErrorException;
 import com.libs.video.video.exoplayer.controller.ControlWrapper;
 import com.libs.video.video.exoplayer.controller.IControlComponent;
-import com.libs.video.video.exoplayer.play.AndroidMediaPlayerFactory;
+import com.libs.video.video.exoplayer.playerCore.mediaplayer.AndroidMediaPlayerFactory;
 import com.libs.video.video.exoplayer.playerCore.exoplayer.ExoMediaPlayerFactory;
 import com.libs.video.video.exoplayer.util.PlayerUtils;
@@ -9,7 +9,6 @@ import com.libs.video.video.exoplayer.play.AbstractPlayer;
  */
 public interface MediaPlayerControl {
-//    int getMediaCount();
     void start();
 package com.libs.video.video.exoplayer.play;
+import android.content.Context;
 import android.content.res.AssetFileDescriptor;
 import android.view.Surface;
 import android.view.SurfaceHolder;
@@ -53,11 +54,29 @@ public abstract class AbstractPlayer {
      */
     public abstract void setDataSource(String path, Map<String, String> headers);
+
+    public abstract void setDataSource(String path, Map<String, String> headers, boolean isCache);
+
     /**
      * 用于播放raw和asset里面的视频文件
      */
     public abstract void setDataSource(AssetFileDescriptor fd);
+//    /**
+//     * 清除全部视频缓存
+//     *
+//     * @param context
+//     */
+//    public abstract void clearAllCache(Context context);
+//
+//    /**
+//     * 根据url清除指定视频缓存
+//     *
+//     * @param context
+//     * @param url
+//     */
+//    public abstract void clearDefaultCache(Context context, String url);
+
     /**
      * 播放
      */
@@ -128,6 +128,8 @@ public class CNVideoView&lt;P extends AbstractPlayer&gt; extends FrameLayout
      */
     private int mPlayerBackgroundColor;
+    private boolean isCache;//是否边缓存边播放
+
 //    private List<String> dataSource;
 //    private int curentPlayIndex;
@@ -237,7 +239,7 @@ public class CNVideoView&lt;P extends AbstractPlayer&gt; extends FrameLayout
         if (mProgressManager != null) {
             mCurrentPosition = mProgressManager.getSavedProgress(mUrl);
         }
-       initPlayer();
+        initPlayer();
         //添加渲染视图
         addDisplay();
         startPrepare(false);
@@ -272,7 +274,7 @@ public class CNVideoView&lt;P extends AbstractPlayer&gt; extends FrameLayout
      * 初始化播放器
      */
     protected void initPlayer() {
-        if (null==mMediaPlayer){
+        if (null == mMediaPlayer) {
             //初始化播放器
             mMediaPlayer = mPlayerFactory.createPlayer(getContext());
         }
@@ -341,7 +343,7 @@ public class CNVideoView&lt;P extends AbstractPlayer&gt; extends FrameLayout
             mMediaPlayer.setDataSource(mAssetFileDescriptor);
             return true;
         } else if (!TextUtils.isEmpty(mUrl)) {
-            mMediaPlayer.setDataSource(mUrl, mHeaders);
+            mMediaPlayer.setDataSource(mUrl, mHeaders, isCache);
             return true;
         }
         return false;
@@ -657,13 +659,24 @@ public class CNVideoView&lt;P extends AbstractPlayer&gt; extends FrameLayout
     /**
      * 设置视频地址
      */
-    public void setUrl(String url) {
+    public void setUrl(String url, boolean isCache) {
+        this.isCache = isCache;
 //        dataSource.clear();
 //        dataSource.add(url);
 //        curentPlayIndex = 0;
         setUrl(url, null);
     }
+    /**
+     * 设置视频地址
+     */
+    public void setUrl(String url) {
+        this.isCache = false;
+//        dataSource.clear();
+//        dataSource.add(url);
+//        curentPlayIndex = 0;
+        setUrl(url, null);
+    }
 //    public void setDataSource(List<String> url) {
 //        dataSource.clear();
 //        dataSource.addAll(url);
@@ -944,14 +957,14 @@ public class CNVideoView&lt;P extends AbstractPlayer&gt; extends FrameLayout
      * 设置控制器，传null表示移除控制器
      */
     public void setVideoController(@Nullable BaseVideoController mediaController) {
-        if (null==mMediaPlayer){
+        if (null == mMediaPlayer) {
             //初始化播放器
             mMediaPlayer = mPlayerFactory.createPlayer(getContext());
         }
         mPlayerContainer.removeView(mVideoController);
         mVideoController = mediaController;
         if (mediaController != null) {
-            mediaController.setMediaPlayer(this,mMediaPlayer);
+            mediaController.setMediaPlayer(this, mMediaPlayer);
             LayoutParams params = new LayoutParams(
                     ViewGroup.LayoutParams.MATCH_PARENT,
                     ViewGroup.LayoutParams.MATCH_PARENT);
@@ -1150,8 +1163,9 @@ public class CNVideoView&lt;P extends AbstractPlayer&gt; extends FrameLayout
     /**
      * 视频缩放类型
      */
-    @IntDef({SCREEN_SCALE_DEFAULT,SCREEN_SCALE_16_9,SCREEN_SCALE_4_3,SCREEN_SCALE_MATCH_PARENT,SCREEN_SCALE_ORIGINAL,SCREEN_SCALE_CENTER_CROP})
+    @IntDef({SCREEN_SCALE_DEFAULT, SCREEN_SCALE_16_9, SCREEN_SCALE_4_3, SCREEN_SCALE_MATCH_PARENT, SCREEN_SCALE_ORIGINAL, SCREEN_SCALE_CENTER_CROP})
     @Retention(RetentionPolicy.SOURCE)
     public @interface screenScalType {
     }
+
 }
@@ -2,6 +2,7 @@ package com.libs.video.video.exoplayer.play;
+import com.libs.video.video.exoplayer.playerCore.mediaplayer.AndroidMediaPlayerFactory;
 import com.libs.video.video.exoplayer.render.RenderViewFactory;
 import com.libs.video.video.exoplayer.render.texture.TextureRenderViewFactory;
@@ -31,6 +31,7 @@ import com.google.android.exoplayer2.video.VideoListener;
 import com.libs.video.video.exoplayer.PlayErrorException;
 import com.libs.video.video.exoplayer.play.AbstractPlayer;
 import com.libs.video.video.exoplayer.play.VideoViewManager;
+import com.libs.video.video.exoplayer.util.PlayCacheUtils;
 import java.util.Map;
@@ -80,7 +81,6 @@ public class ExoMediaPlayer extends AbstractPlayer implements VideoListener, Pla
                 Clock.DEFAULT)
                 .build();
         setOptions();
-
         //播放器日志
         if (VideoViewManager.getConfig().mIsEnableLog && mTrackSelector instanceof MappingTrackSelector) {
             exoPlayer.addAnalyticsListener(new EventLogger((MappingTrackSelector) mTrackSelector, "ExoPlayer"));
@@ -114,10 +114,16 @@ public class ExoMediaPlayer extends AbstractPlayer implements VideoListener, Pla
     }
     @Override
+    public void setDataSource(String path, Map<String, String> headers, boolean isCache) {
+        mMediaSource = mMediaSourceHelper.getMediaSource(path, headers,isCache);
+    }
+
+    @Override
     public void setDataSource(AssetFileDescriptor fd) {
         //no support
     }
+
     @Override
     public void start() {
         if (exoPlayer == null)
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.net.Uri;
 import android.text.TextUtils;
+import com.danikula.videocache.StorageUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.database.ExoDatabaseProvider;
 import com.google.android.exoplayer2.ext.rtmp.RtmpDataSourceFactory;
@@ -36,6 +37,8 @@ public final class ExoMediaSourceHelper {
     private Context mAppContext;
     private HttpDataSource.Factory mHttpDataSourceFactory;
     private Cache mCache;
+    private final int CACHE_SIZE = 1024;//缓存大小1G
+    public static final String CACHE_DIR = "exo-video-cache";
     private ExoMediaSourceHelper(Context context) {
         mAppContext = context.getApplicationContext();
@@ -117,11 +120,15 @@ public final class ExoMediaSourceHelper {
                 CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR);
     }
-    private Cache newCache() {
-        return new SimpleCache(
-                new File(mAppContext.getExternalCacheDir(), "exo-video-cache"),//缓存目录
-                new LeastRecentlyUsedCacheEvictor(512 * 1024 * 1024),//缓存大小，默认512M，使用LRU算法实现
-                new ExoDatabaseProvider(mAppContext));
+    public Cache newCache() {
+        if (null == mCache) {
+            return new SimpleCache(
+                    new File(StorageUtils.getCacheDirectoryPath(mAppContext), CACHE_DIR),//缓存目录
+                    new LeastRecentlyUsedCacheEvictor(CACHE_SIZE * 1024 * 1024),//缓存大小，默认512M，使用LRU算法实现
+                    new ExoDatabaseProvider(mAppContext));
+        } else {
+            return mCache;
+        }
     }
     /**
-package com.libs.video.video.exoplayer.play;
+package com.libs.video.video.exoplayer.playerCore.mediaplayer;
 import android.content.Context;
 import android.content.res.AssetFileDescriptor;
@@ -6,10 +6,16 @@ import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
+import android.text.TextUtils;
 import android.view.Surface;
 import android.view.SurfaceHolder;
+import com.danikula.videocache.HttpProxyCacheServer;
+import com.danikula.videocache.StorageUtils;
+import com.libs.video.util.cache.ProxyVideoCacheManager;
 import com.libs.video.video.exoplayer.PlayErrorException;
+import com.libs.video.video.exoplayer.play.AbstractPlayer;
+import com.libs.video.video.exoplayer.util.PlayCacheUtils;
 import java.io.IOException;
 import java.util.Map;
@@ -48,6 +54,20 @@ public class AndroidMediaPlayer extends AbstractPlayer {
     }
     @Override
+    public void setDataSource(String path, Map<String, String> headers, boolean isCache) {
+        try {
+            if (isCache) {
+                mMediaPlayer.setDataSource(mAppContext, Uri.parse(PlayCacheUtils.getCachePath(mAppContext,path)), headers);
+            } else {
+                //不缓存
+                mMediaPlayer.setDataSource(mAppContext, Uri.parse(path), headers);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
     public void setDataSource(AssetFileDescriptor fd) {
         try {
             mMediaPlayer.setDataSource(fd.getFileDescriptor(), fd.getStartOffset(), fd.getLength());
@@ -56,6 +76,7 @@ public class AndroidMediaPlayer extends AbstractPlayer {
         }
     }
+
     /**
      * 获取当前异常
      *
@@ -64,15 +85,16 @@ public class AndroidMediaPlayer extends AbstractPlayer {
     private void getException(Exception e) {
         PlayErrorException errorException = null;
         if (e instanceof IOException) {
-            errorException = new PlayErrorException(PlayErrorException.TYPE_MediaPlayer_IOException, e.getMessage());
+            //资源错误
+            errorException = new PlayErrorException(PlayErrorException.TYPE_SOURCE_ERROR, e.getMessage());
         } else if (e instanceof IllegalArgumentException) {
-            errorException = new PlayErrorException(PlayErrorException.TYPE_MediaPlayer_IllegalArgumentException, e.getMessage());
+            errorException = new PlayErrorException(PlayErrorException.TYPE_IllegalArgumentException, e.getMessage());
         } else if (e instanceof SecurityException) {
-            errorException = new PlayErrorException(PlayErrorException.TYPE_MediaPlayer_SecurityException, e.getMessage());
+            errorException = new PlayErrorException(PlayErrorException.TYPE_SecurityException, e.getMessage());
         } else if (e instanceof IllegalStateException) {
-            errorException = new PlayErrorException(PlayErrorException.TYPE_MediaPlayer_IllegalStateException, e.getMessage());
+            errorException = new PlayErrorException(PlayErrorException.TYPE_IllegalStateException, e.getMessage());
         } else {
-            errorException = new PlayErrorException(PlayErrorException.TYPE_MediaPlayer_unknownException, e.getMessage());
+            errorException = new PlayErrorException(PlayErrorException.TYPE_UNEXPECTED_ERROR, e.getMessage());
         }
         mPlayerEventListener.onError(errorException);
     }
@@ -132,7 +154,7 @@ public class AndroidMediaPlayer extends AbstractPlayer {
         try {
             mMediaPlayer.seekTo((int) time);
         } catch (IllegalStateException e) {
-            mPlayerEventListener.onError(new PlayErrorException(PlayErrorException.TYPE_MediaPlayer_IllegalStateException, e.getMessage()));
+            mPlayerEventListener.onError(new PlayErrorException(PlayErrorException.TYPE_IllegalStateException, e.getMessage()));
         }
     }
@@ -226,10 +248,28 @@ public class AndroidMediaPlayer extends AbstractPlayer {
         @Override
         public boolean onError(MediaPlayer mp, int what, int extra) {
             PlayErrorException errorException = new PlayErrorException();
-            errorException.setErrorType(PlayErrorException.TYPE_MediaPlayer_ON_ERROR);
-            errorException.setMediaPlayer(mp);
-            errorException.setMediaPlayer_what(what);
-            errorException.setMediaPlayer_extra(extra);
+            switch (what) {
+                //播放超时错误
+                case MediaPlayer.MEDIA_ERROR_TIMED_OUT:
+                    errorException.setErrorType(PlayErrorException.TYPE_TIMED_OUT_ERROR);
+                    errorException.setErrorMsg("播放超时错误");
+                    break;
+                //不支持的媒体类型
+                case MediaPlayer.MEDIA_ERROR_UNSUPPORTED:
+                    errorException.setErrorType(PlayErrorException.TYPE_MEDIA_UNSUPPORTED_ERROR);
+                    errorException.setErrorMsg("不支持的媒体类型");
+                    break;
+                //媒体服务器挂机（应用必须释放对象，然后开启新的实例）
+                case MediaPlayer.MEDIA_ERROR_SERVER_DIED:
+                    errorException.setErrorType(PlayErrorException.TYPE_MEDIA_SERVER_DIED_ERROR);
+                    errorException.setErrorMsg("媒体服务器挂机（应用必须释放对象，然后开启新的实例）");
+                    break;
+                default:
+                    errorException.setErrorType(PlayErrorException.TYPE_OTHER_ERROR);
+                    errorException.setErrorMsg("其他错误:" + what);
+                    break;
+            }
+
             mPlayerEventListener.onError(errorException);
             return true;
         }
-package com.libs.video.video.exoplayer.play;
+package com.libs.video.video.exoplayer.playerCore.mediaplayer;
 import android.content.Context;
+import com.libs.video.video.exoplayer.play.PlayerFactory;
+
 public class AndroidMediaPlayerFactory extends PlayerFactory<AndroidMediaPlayer> {
     public static AndroidMediaPlayerFactory create() {
+package com.libs.video.video.exoplayer.util;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.danikula.videocache.HttpProxyCacheServer;
+import com.danikula.videocache.StorageUtils;
+import com.libs.video.util.cache.ProxyVideoCacheManager;
+import com.libs.video.video.exoplayer.playerCore.exoplayer.ExoMediaPlayerFactory;
+import com.libs.video.video.exoplayer.playerCore.exoplayer.ExoMediaSourceHelper;
+import com.libs.video.video.exoplayer.playerCore.mediaplayer.AndroidMediaPlayerFactory;
+
+import java.io.File;
+
+/**
+ * 播放缓存工具
+ */
+public class PlayCacheUtils {
+    public static String getCachePath(Context mAppContext, String path) {
+        String result = "";
+        if (null == mAppContext || TextUtils.isEmpty(path)) {
+            return result;
+        }
+        if (path.contains("m3u8")) {
+            result = path;
+        } else if (null != mAppContext && !TextUtils.isDigitsOnly(path) && !path.contains(StorageUtils.getCacheDirectoryPath(mAppContext))) {
+            HttpProxyCacheServer cacheServer = ProxyVideoCacheManager.getProxy(mAppContext);
+            if (!cacheServer.isCached(path)) {
+                String proxyUrl = cacheServer.getProxyUrl(path);
+                result = proxyUrl;
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 目前exoplayer是全部删除
+     *
+     * @param context
+     * @param url
+     */
+    public void clearDefaultCache(Context context, String url) {
+        //获取当前播放核心
+        Object object = PlayerFactoryUtils.getCurrentPlayerFactory();
+        if (null != object) {
+            if (object instanceof ExoMediaPlayerFactory) {
+                File file = new File(StorageUtils.getCacheDirectoryPath(context), ExoMediaSourceHelper.CACHE_DIR);//缓存目录
+                if (null == file) {
+                    return;
+                }
+                if (file.exists()) {
+                    deleteFile(file);
+                }
+            } else if (object instanceof AndroidMediaPlayerFactory) {
+                ProxyVideoCacheManager.clearDefaultCache(context, url);
+            }
+        }
+    }
+
+    public static void clearAllCache(Context context) {
+        //获取当前播放核心
+//        Object object = PlayerFactoryUtils.getCurrentPlayerFactory();
+//        if (null != object) {
+//            if (object instanceof ExoMediaPlayerFactory) {
+        File file = new File(StorageUtils.getCacheDirectoryPath(context), ExoMediaSourceHelper.CACHE_DIR);//缓存目录
+        if (null == file) {
+            return;
+        }
+        if (file.exists()) {
+            deleteFile(file);
+        }
+//            } else if (object instanceof AndroidMediaPlayerFactory) {
+        ProxyVideoCacheManager.clearAllCache(context);
+//            }
+//    }
+
+
+    }
+
+    /**
+     * 删除文件
+     *
+     * @param file
+     */
+    private static void deleteFile(File file) {
+        if (file.exists()) { // 判断文件是否存在
+            if (file.isFile()) { // 判断是否是文件
+                file.delete(); // delete()方法 你应该知道 是删除的意思;
+            } else if (file.isDirectory()) { // 否则如果它是一个目录
+                File files[] = file.listFiles(); // 声明目录下所有的文件 files[];
+                for (File file1 : files) { // 遍历目录下所有的文件
+                    deleteFile(file1); // 把每个文件 用这个方法进行迭代
+                }
+            }
+            file.delete();
+        } else {
+
+        }
+    }
+
+}