diff --git a/README.md b/README.md
index ba126309..63e91659 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Step 1.Add it in your root build.gradle at the end of repositories:
 Step 2. Add the dependency
 
 	dependencies {
-	        compile 'com.github.DevlinChiu:MagicPlayer:1.0.1'
+	        compile 'com.github.DevlinChiu:MagicPlayer:1.0.2'
 	}
 ### ProGuard
 
diff --git a/app/src/main/java/com/devlin_n/magicplayer/FullScreenActivity.java b/app/src/main/java/com/devlin_n/magicplayer/FullScreenActivity.java
index 01ef153e..85586db4 100644
--- a/app/src/main/java/com/devlin_n/magicplayer/FullScreenActivity.java
+++ b/app/src/main/java/com/devlin_n/magicplayer/FullScreenActivity.java
@@ -9,9 +9,9 @@
 import android.support.v7.app.AppCompatActivity;
 import android.widget.Toast;
 
-import com.devlin_n.magic_player.player.IjkVideoView;
+import com.devlin_n.magic_player.player.MagicVideoView;
 
-import static com.devlin_n.magic_player.player.IjkVideoView.ALERT_WINDOW_PERMISSION_CODE;
+import static com.devlin_n.magic_player.player.MagicVideoView.ALERT_WINDOW_PERMISSION_CODE;
 
 /**
  * 全屏播放
@@ -20,46 +20,46 @@
 
 public class FullScreenActivity extends AppCompatActivity{
 
-    private IjkVideoView ijkVideoView;
+    private MagicVideoView magicVideoView;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ijkVideoView = new IjkVideoView(this);
-        setContentView(ijkVideoView);
-        ijkVideoView
+        magicVideoView = new MagicVideoView(this);
+        setContentView(magicVideoView);
+        magicVideoView
                 .init()
                 .autoRotate()
                 .alwaysFullScreen()
                 .setTitle("这是一个标题")
                 .setUrl("http://flv2.bn.netease.com/videolib3/1611/28/GbgsL3639/HD/movie_index.m3u8")
-                .setMediaController(IjkVideoView.VOD)
-                .setScreenType(IjkVideoView.SCREEN_TYPE_4_3)
+                .setVideoController(MagicVideoView.VOD)
+                .setScreenType(MagicVideoView.SCREEN_TYPE_4_3)
                 .start();
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        ijkVideoView.pause();
+        magicVideoView.pause();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        ijkVideoView.resume();
-        ijkVideoView.stopFloatWindow();
+        magicVideoView.resume();
+        magicVideoView.stopFloatWindow();
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        ijkVideoView.release();
+        magicVideoView.release();
     }
 
     @Override
     public void onBackPressed() {
-        if (!ijkVideoView.onBackPressed()){
+        if (!magicVideoView.onBackPressed()){
             super.onBackPressed();
         }
     }
@@ -74,7 +74,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             if (!Settings.canDrawOverlays(this)) {
                 Toast.makeText(FullScreenActivity.this, "权限授予失败，无法开启悬浮窗", Toast.LENGTH_SHORT).show();
             } else {
-                ijkVideoView.startFloatWindow();
+                magicVideoView.startFloatWindow();
             }
         }
     }
diff --git a/app/src/main/java/com/devlin_n/magicplayer/LivePlayerActivity.java b/app/src/main/java/com/devlin_n/magicplayer/LivePlayerActivity.java
index 1c790c36..d88e3fe1 100644
--- a/app/src/main/java/com/devlin_n/magicplayer/LivePlayerActivity.java
+++ b/app/src/main/java/com/devlin_n/magicplayer/LivePlayerActivity.java
@@ -11,10 +11,10 @@
 import android.view.View;
 import android.widget.Toast;
 
-import com.devlin_n.magic_player.player.IjkVideoView;
+import com.devlin_n.magic_player.player.MagicVideoView;
 
 import static android.os.Build.VERSION_CODES.M;
-import static com.devlin_n.magic_player.player.IjkVideoView.ALERT_WINDOW_PERMISSION_CODE;
+import static com.devlin_n.magic_player.player.MagicVideoView.ALERT_WINDOW_PERMISSION_CODE;
 
 /**
  * 直播播放
@@ -23,7 +23,7 @@
 
 public class LivePlayerActivity extends AppCompatActivity {
 
-    private IjkVideoView ijkVideoView;
+    private MagicVideoView magicVideoView;
     private static final String URL = "http://ivi.bupt.edu.cn/hls/cctv6.m3u8";
 
     @Override
@@ -35,16 +35,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             actionBar.setTitle("LIVE");
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
-        ijkVideoView = (IjkVideoView) findViewById(R.id.ijk_video_view);
+        magicVideoView = (MagicVideoView) findViewById(R.id.magic_video_view);
 //        int widthPixels = getResources().getDisplayMetrics().widthPixels;
-//        ijkVideoView.setLayoutParams(new LinearLayout.LayoutParams(widthPixels, widthPixels / 4 * 3));
+//        magicVideoView.setLayoutParams(new LinearLayout.LayoutParams(widthPixels, widthPixels / 4 * 3));
 
-        ijkVideoView
+        magicVideoView
                 .init()
                 .autoRotate()
                 .setUrl(URL)
                 .setTitle("CCTV6")
-                .setMediaController(IjkVideoView.LIVE)
+                .setVideoController(MagicVideoView.LIVE)
                 .start();
     }
 
@@ -59,26 +59,26 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     protected void onPause() {
         super.onPause();
-        ijkVideoView.pause();
+        magicVideoView.pause();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        ijkVideoView.resume();
-        ijkVideoView.stopFloatWindow();
+        magicVideoView.resume();
+        magicVideoView.stopFloatWindow();
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        ijkVideoView.release();
+        magicVideoView.release();
     }
 
 
     @Override
     public void onBackPressed() {
-        if (!ijkVideoView.onBackPressed()) {
+        if (!magicVideoView.onBackPressed()) {
             super.onBackPressed();
         }
     }
@@ -93,28 +93,28 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             if (!Settings.canDrawOverlays(this)) {
                 Toast.makeText(LivePlayerActivity.this, "权限授予失败，无法开启悬浮窗", Toast.LENGTH_SHORT).show();
             } else {
-                ijkVideoView.startFloatWindow();
+                magicVideoView.startFloatWindow();
             }
         }
     }
 
     public void startFloatWindow(View view) {
-        ijkVideoView.startFloatWindow();
+        magicVideoView.startFloatWindow();
     }
 
     public void wide(View view) {
-        ijkVideoView.setScreenType(IjkVideoView.SCREEN_TYPE_16_9);
+        magicVideoView.setScreenType(MagicVideoView.SCREEN_TYPE_16_9);
     }
 
     public void tv(View view) {
-        ijkVideoView.setScreenType(IjkVideoView.SCREEN_TYPE_4_3);
+        magicVideoView.setScreenType(MagicVideoView.SCREEN_TYPE_4_3);
     }
 
     public void match(View view) {
-        ijkVideoView.setScreenType(IjkVideoView.SCREEN_TYPE_MATCH_PARENT);
+        magicVideoView.setScreenType(MagicVideoView.SCREEN_TYPE_MATCH_PARENT);
     }
 
     public void original(View view) {
-        ijkVideoView.setScreenType(IjkVideoView.SCREEN_TYPE_ORIGINAL);
+        magicVideoView.setScreenType(MagicVideoView.SCREEN_TYPE_ORIGINAL);
     }
 }
diff --git a/app/src/main/java/com/devlin_n/magicplayer/MainActivity.java b/app/src/main/java/com/devlin_n/magicplayer/MainActivity.java
index 9ddeec02..9272d2e7 100644
--- a/app/src/main/java/com/devlin_n/magicplayer/MainActivity.java
+++ b/app/src/main/java/com/devlin_n/magicplayer/MainActivity.java
@@ -6,6 +6,7 @@
 import android.view.View;
 
 import com.devlin_n.magic_player.player.BackgroundPlayService;
+import com.devlin_n.magic_player.player.VideoCacheManager;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -31,4 +32,8 @@ public void closeFloatWindow(View view) {
     public void startFullScreen(View view) {
         startActivity(new Intent(this, FullScreenActivity.class));
     }
+
+    public void clearCache(View view) {
+        VideoCacheManager.clearAllCache(this);
+    }
 }
diff --git a/app/src/main/java/com/devlin_n/magicplayer/VodPlayerActivity.java b/app/src/main/java/com/devlin_n/magicplayer/VodPlayerActivity.java
index de47c382..7d110226 100644
--- a/app/src/main/java/com/devlin_n/magicplayer/VodPlayerActivity.java
+++ b/app/src/main/java/com/devlin_n/magicplayer/VodPlayerActivity.java
@@ -12,9 +12,9 @@
 import android.view.View;
 import android.widget.Toast;
 
-import com.devlin_n.magic_player.player.IjkVideoView;
+import com.devlin_n.magic_player.player.MagicVideoView;
 
-import static com.devlin_n.magic_player.player.IjkVideoView.ALERT_WINDOW_PERMISSION_CODE;
+import static com.devlin_n.magic_player.player.MagicVideoView.ALERT_WINDOW_PERMISSION_CODE;
 
 /**
  * 点播播放
@@ -23,7 +23,7 @@
 
 public class VodPlayerActivity extends AppCompatActivity {
 
-    private IjkVideoView ijkVideoView;
+    private MagicVideoView magicVideoView;
     private static final String URL_VOD = "http://mov.bn.netease.com/open-movie/nos/flv/2017/01/03/SC8U8K7BC_hd.flv";
     private static final String URL_AD = "http://gslb.miaopai.com/stream/FQXM04zrW1dcXGiPdJ6Q3KAq2Fpv4TLV.mp4";
 
@@ -36,22 +36,22 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             actionBar.setTitle("VOD");
             actionBar.setDisplayHomeAsUpEnabled(true);
         }
-        ijkVideoView = (IjkVideoView) findViewById(R.id.ijk_video_view);
+        magicVideoView = (MagicVideoView) findViewById(R.id.magic_video_view);
 //        int widthPixels = getResources().getDisplayMetrics().widthPixels;
-//        ijkVideoView.setLayoutParams(new LinearLayout.LayoutParams(widthPixels, widthPixels / 16 * 9));
+//        magicVideoView.setLayoutParams(new LinearLayout.LayoutParams(widthPixels, widthPixels / 16 * 9));
 
 //        List<VideoModel> videos = new ArrayList<>();
 //        videos.add(new VideoModel(URL_AD, "广告", IjkVideoView.AD));
 //        videos.add(new VideoModel(URL_VOD, "网易公开课-如何掌控你的自由时间", IjkVideoView.VOD));
 
-        ijkVideoView
+        magicVideoView
                 .init()
                 .autoRotate()
                 .enableCache()
 //                .setVideos(videos)
                 .setUrl(URL_VOD)
                 .setTitle("网易公开课-如何掌控你的自由时间")
-                .setMediaController(IjkVideoView.VOD)
+                .setVideoController(MagicVideoView.VOD)
                 .start();
     }
 
@@ -66,26 +66,26 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     protected void onPause() {
         super.onPause();
-        ijkVideoView.pause();
+        magicVideoView.pause();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        ijkVideoView.resume();
-        ijkVideoView.stopFloatWindow();
+        magicVideoView.resume();
+        magicVideoView.stopFloatWindow();
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        ijkVideoView.release();
+        magicVideoView.release();
     }
 
 
     @Override
     public void onBackPressed() {
-        if (!ijkVideoView.onBackPressed()) {
+        if (!magicVideoView.onBackPressed()) {
             super.onBackPressed();
         }
     }
@@ -100,28 +100,28 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             if (!Settings.canDrawOverlays(this)) {
                 Toast.makeText(VodPlayerActivity.this, "权限授予失败，无法开启悬浮窗", Toast.LENGTH_SHORT).show();
             } else {
-                ijkVideoView.startFloatWindow();
+                magicVideoView.startFloatWindow();
             }
         }
     }
 
     public void startFloatWindow(View view) {
-        ijkVideoView.startFloatWindow();
+        magicVideoView.startFloatWindow();
     }
 
     public void wide(View view) {
-        ijkVideoView.setScreenType(IjkVideoView.SCREEN_TYPE_16_9);
+        magicVideoView.setScreenType(MagicVideoView.SCREEN_TYPE_16_9);
     }
 
     public void tv(View view) {
-        ijkVideoView.setScreenType(IjkVideoView.SCREEN_TYPE_4_3);
+        magicVideoView.setScreenType(MagicVideoView.SCREEN_TYPE_4_3);
     }
 
     public void match(View view) {
-        ijkVideoView.setScreenType(IjkVideoView.SCREEN_TYPE_MATCH_PARENT);
+        magicVideoView.setScreenType(MagicVideoView.SCREEN_TYPE_MATCH_PARENT);
     }
 
     public void original(View view) {
-        ijkVideoView.setScreenType(IjkVideoView.SCREEN_TYPE_ORIGINAL);
+        magicVideoView.setScreenType(MagicVideoView.SCREEN_TYPE_ORIGINAL);
     }
 }
diff --git a/app/src/main/res/layout/activity_live_player.xml b/app/src/main/res/layout/activity_live_player.xml
index 74cac4cf..11a5ffda 100644
--- a/app/src/main/res/layout/activity_live_player.xml
+++ b/app/src/main/res/layout/activity_live_player.xml
@@ -4,8 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.devlin_n.magic_player.player.IjkVideoView
-        android:id="@+id/ijk_video_view"
+    <com.devlin_n.magic_player.player.MagicVideoView
+        android:id="@+id/magic_video_view"
         android:layout_width="match_parent"
         android:layout_height="300dp" />
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0b146b74..71ec6c17 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,27 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="VOD PLAYER"
-        android:onClick="skipToVodPlayer"/>
+        android:onClick="skipToVodPlayer"
+        android:text="VOD PLAYER" />
+
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="LIVE PLAYER"
-        android:onClick="skipToLivePlayer"/>
+        android:onClick="skipToLivePlayer"
+        android:text="LIVE PLAYER" />
+
     <Button
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="ALWAYS ON FULLSCREEN"
-        android:onClick="startFullScreen"/>
+        android:onClick="startFullScreen"
+        android:text="ALWAYS ON FULLSCREEN" />
 
     <Button
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:onClick="closeFloatWindow"
-        android:text="CLOSE PIP"/>
+        android:text="CLOSE PIP" />
+
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:onClick="clearCache"
+        android:text="CLEAR CACHE" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_vod_player.xml b/app/src/main/res/layout/activity_vod_player.xml
index 048b8271..42b405b1 100644
--- a/app/src/main/res/layout/activity_vod_player.xml
+++ b/app/src/main/res/layout/activity_vod_player.xml
@@ -4,8 +4,8 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.devlin_n.magic_player.player.IjkVideoView
-        android:id="@+id/ijk_video_view"
+    <com.devlin_n.magic_player.player.MagicVideoView
+        android:id="@+id/magic_video_view"
         android:layout_width="match_parent"
         android:layout_height="400dp" />
 
diff --git a/magic_player/build.gradle b/magic_player/build.gradle
index e398e43b..bb2de308 100644
--- a/magic_player/build.gradle
+++ b/magic_player/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 4
-        versionName "1.4"
+        versionCode 3
+        versionName "1.0.2"
     }
 }
 
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/controller/AdController.java b/magic_player/src/main/java/com/devlin_n/magic_player/controller/AdController.java
index d50703b3..ff649c81 100644
--- a/magic_player/src/main/java/com/devlin_n/magic_player/controller/AdController.java
+++ b/magic_player/src/main/java/com/devlin_n/magic_player/controller/AdController.java
@@ -17,7 +17,7 @@
  * Created by Devlin_n on 2017/4/12.
  */
 
-public class AdController extends BaseMediaController implements View.OnClickListener {
+public class AdController extends BaseVideoController implements View.OnClickListener {
     private static final String TAG = AdController.class.getSimpleName();
     protected TextView adTime, adDetail;
     protected ImageView back, volume, fullScreen, playButton;
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/controller/BaseMediaController.java b/magic_player/src/main/java/com/devlin_n/magic_player/controller/BaseVideoController.java
similarity index 97%
rename from magic_player/src/main/java/com/devlin_n/magic_player/controller/BaseMediaController.java
rename to magic_player/src/main/java/com/devlin_n/magic_player/controller/BaseVideoController.java
index 4189439d..2ae5f90a 100644
--- a/magic_player/src/main/java/com/devlin_n/magic_player/controller/BaseMediaController.java
+++ b/magic_player/src/main/java/com/devlin_n/magic_player/controller/BaseVideoController.java
@@ -25,9 +25,9 @@
  * Created by Devlin_n on 2017/4/12.
  */
 
-public abstract class BaseMediaController extends FrameLayout {
+public abstract class BaseVideoController extends FrameLayout {
 
-    private static final String TAG = BaseMediaController.class.getSimpleName();
+    private static final String TAG = BaseVideoController.class.getSimpleName();
     protected View controllerView;//控制器视图
     protected MediaPlayerControlInterface mediaPlayer;//播放器
     protected boolean mShowing;//控制器是否处于显示状态
@@ -37,11 +37,11 @@ public abstract class BaseMediaController extends FrameLayout {
     private Formatter mFormatter;
     protected boolean isLocked;
 
-    public BaseMediaController(@NonNull Context context) {
+    public BaseVideoController(@NonNull Context context) {
         this(context, null);
     }
 
-    public BaseMediaController(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public BaseVideoController(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         initView();
     }
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/controller/IjkMediaController.java b/magic_player/src/main/java/com/devlin_n/magic_player/controller/MagicVideoController.java
similarity index 93%
rename from magic_player/src/main/java/com/devlin_n/magic_player/controller/IjkMediaController.java
rename to magic_player/src/main/java/com/devlin_n/magic_player/controller/MagicVideoController.java
index 5665435c..bbd1b1db 100644
--- a/magic_player/src/main/java/com/devlin_n/magic_player/controller/IjkMediaController.java
+++ b/magic_player/src/main/java/com/devlin_n/magic_player/controller/MagicVideoController.java
@@ -13,7 +13,7 @@
 import android.widget.TextView;
 
 import com.devlin_n.magic_player.R;
-import com.devlin_n.magic_player.player.IjkVideoView;
+import com.devlin_n.magic_player.player.MagicVideoView;
 import com.devlin_n.magic_player.util.WindowUtil;
 
 /**
@@ -21,7 +21,7 @@
  * Created by Devlin_n on 2017/4/7.
  */
 
-public class IjkMediaController extends BaseMediaController implements View.OnClickListener, SeekBar.OnSeekBarChangeListener {
+public class MagicVideoController extends BaseVideoController implements View.OnClickListener, SeekBar.OnSeekBarChangeListener {
     private static final String TAG = "IjkMediaController";
     protected TextView totalTime, currTime;
     protected ImageView fullScreenButton;
@@ -38,11 +38,11 @@ public class IjkMediaController extends BaseMediaController implements View.OnCl
     private View statusHolder;
 
 
-    public IjkMediaController(@NonNull Context context) {
+    public MagicVideoController(@NonNull Context context) {
         this(context, null);
     }
 
-    public IjkMediaController(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public MagicVideoController(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
     }
 
@@ -137,11 +137,11 @@ public void updateFullScreen() {
 
     @Override
     public void updatePlayButton() {
-        if (mediaPlayer.getCurrentState() == IjkVideoView.STATE_BUFFERING) {
+        if (mediaPlayer.getCurrentState() == MagicVideoView.STATE_BUFFERING) {
             playButton.setVisibility(GONE);
             return;
         }
-        if (mShowing && !isLocked && mediaPlayer.getCurrentState() == IjkVideoView.STATE_BUFFERED) {
+        if (mShowing && !isLocked && mediaPlayer.getCurrentState() == MagicVideoView.STATE_BUFFERED) {
             playButton.setVisibility(VISIBLE);
             return;
         }
@@ -222,7 +222,7 @@ public void hide() {
                 bottomContainer.setVisibility(GONE);
                 bottomContainer.startAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.anim_slide_bottom_out));
                 playButton.setVisibility(GONE);
-                if (mediaPlayer.getCurrentState() != IjkVideoView.STATE_BUFFERING) {
+                if (mediaPlayer.getCurrentState() != MagicVideoView.STATE_BUFFERING) {
                     playButton.startAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.anim_alpha_out));
                 }
 
@@ -233,7 +233,7 @@ public void hide() {
 
     private void hideAllViews() {
         playButton.setVisibility(GONE);
-        if (mediaPlayer.getCurrentState() != IjkVideoView.STATE_BUFFERING) {
+        if (mediaPlayer.getCurrentState() != MagicVideoView.STATE_BUFFERING) {
             playButton.startAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.anim_alpha_out));
         }
         bottomContainer.setVisibility(GONE);
@@ -252,7 +252,7 @@ private void show(int timeout) {
                     showAllViews();
                 }
             } else {
-                if (mediaPlayer.getCurrentState() != IjkVideoView.STATE_BUFFERING) {
+                if (mediaPlayer.getCurrentState() != MagicVideoView.STATE_BUFFERING) {
                     playButton.setVisibility(VISIBLE);
                     playButton.startAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.anim_alpha_in));
                 }
@@ -275,7 +275,7 @@ private void show(int timeout) {
     }
 
     private void showAllViews() {
-        if (mediaPlayer.getCurrentState() != IjkVideoView.STATE_BUFFERING) {
+        if (mediaPlayer.getCurrentState() != MagicVideoView.STATE_BUFFERING) {
             playButton.setVisibility(VISIBLE);
             playButton.startAnimation(AnimationUtils.loadAnimation(getContext(), R.anim.anim_alpha_in));
         }
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/player/BackgroundPlayService.java b/magic_player/src/main/java/com/devlin_n/magic_player/player/BackgroundPlayService.java
index 9b1eb950..0f7f91a6 100644
--- a/magic_player/src/main/java/com/devlin_n/magic_player/player/BackgroundPlayService.java
+++ b/magic_player/src/main/java/com/devlin_n/magic_player/player/BackgroundPlayService.java
@@ -23,7 +23,7 @@
 public class BackgroundPlayService extends Service {
     private WindowManager wm;
     private WindowManager.LayoutParams wmParams;
-    private IjkVideoView videoView;
+    private MagicVideoView videoView;
     private String url;
     private View floatView;
     private int position;
@@ -69,7 +69,7 @@ private void initWindow() {
         wmParams.width = width;
         wmParams.height = width * 9 / 16;
         floatView = LayoutInflater.from(getApplicationContext()).inflate(R.layout.layout_float_window, null);
-        videoView = (IjkVideoView) floatView.findViewById(R.id.video_view);
+        videoView = (MagicVideoView) floatView.findViewById(R.id.video_view);
         floatView.findViewById(R.id.btn_close).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/player/IjkVideoView.java b/magic_player/src/main/java/com/devlin_n/magic_player/player/MagicVideoView.java
similarity index 94%
rename from magic_player/src/main/java/com/devlin_n/magic_player/player/IjkVideoView.java
rename to magic_player/src/main/java/com/devlin_n/magic_player/player/MagicVideoView.java
index 29ec4be9..f5d8ee3e 100644
--- a/magic_player/src/main/java/com/devlin_n/magic_player/player/IjkVideoView.java
+++ b/magic_player/src/main/java/com/devlin_n/magic_player/player/MagicVideoView.java
@@ -27,8 +27,8 @@
 import com.danikula.videocache.HttpProxyCacheServer;
 import com.devlin_n.magic_player.R;
 import com.devlin_n.magic_player.controller.AdController;
-import com.devlin_n.magic_player.controller.BaseMediaController;
-import com.devlin_n.magic_player.controller.IjkMediaController;
+import com.devlin_n.magic_player.controller.BaseVideoController;
+import com.devlin_n.magic_player.controller.MagicVideoController;
 import com.devlin_n.magic_player.util.KeyUtil;
 import com.devlin_n.magic_player.util.NetworkUtil;
 import com.devlin_n.magic_player.util.WindowUtil;
@@ -47,13 +47,13 @@
  * Created by Devlin_n on 2017/4/7.
  */
 
-public class IjkVideoView extends FrameLayout implements IjkMediaController.MediaPlayerControlInterface,
+public class MagicVideoView extends FrameLayout implements MagicVideoController.MediaPlayerControlInterface,
         IMediaPlayer.OnErrorListener, IMediaPlayer.OnCompletionListener, IMediaPlayer.OnInfoListener,
         IMediaPlayer.OnBufferingUpdateListener, IMediaPlayer.OnPreparedListener, IMediaPlayer.OnVideoSizeChangedListener, CacheListener {
 
-    private static final String TAG = IjkVideoView.class.getSimpleName();
+    private static final String TAG = MagicVideoView.class.getSimpleName();
     private IjkMediaPlayer mMediaPlayer;//ijkPlayer
-    private BaseMediaController mMediaController;//控制器
+    private BaseVideoController mMediaController;//控制器
     private boolean isControllerAdded;//师傅添加控制器
     private MagicSurfaceView surfaceView;
     private RelativeLayout surfaceContainer;
@@ -112,12 +112,12 @@ public class IjkVideoView extends FrameLayout implements IjkMediaController.Medi
     private boolean isCache;
 
 
-    public IjkVideoView(@NonNull Context context) {
+    public MagicVideoView(@NonNull Context context) {
         this(context, null);
     }
 
 
-    public IjkVideoView(@NonNull Context context, @Nullable AttributeSet attrs) {
+    public MagicVideoView(@NonNull Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
         initView();
     }
@@ -147,7 +147,7 @@ public void onWindowFocusChanged(boolean hasFocus) {
     /**
      * 创建播放器实例，设置播放地址及播放器参数
      */
-    public IjkVideoView init() {
+    public MagicVideoView init() {
         mAudioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);
         mAudioManager.requestAudioFocus(onAudioFocusChangeListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN);
         mMediaPlayer = new IjkMediaPlayer();
@@ -175,7 +175,7 @@ private void startPrepare() {
         try {
             mMediaPlayer.reset();
             if (isCache) {
-                HttpProxyCacheServer cacheServer = cacheServer();
+                HttpProxyCacheServer cacheServer = getCacheServer();
                 String proxyPath = cacheServer.getProxyUrl(mCurrentUrl);
                 cacheServer.registerCacheListener(this, mCurrentUrl);
                 if (cacheServer.isCached(mCurrentUrl)) {
@@ -196,8 +196,8 @@ private void startPrepare() {
         }
     }
 
-    private HttpProxyCacheServer cacheServer() {
-        return ProxyFactory.getProxy(getContext().getApplicationContext());
+    private HttpProxyCacheServer getCacheServer() {
+        return VideoCacheManager.getProxy(getContext().getApplicationContext());
     }
 
     /**
@@ -229,7 +229,7 @@ public void surfaceDestroyed(SurfaceHolder holder) {
     /**
      * 设置视频比例
      */
-    public IjkVideoView setScreenType(int type) {
+    public MagicVideoView setScreenType(int type) {
         mCurrentScreenType = type;
         surfaceView.setScreenType(mCurrentScreenType);
         return this;
@@ -238,7 +238,7 @@ public IjkVideoView setScreenType(int type) {
     /**
      * 设置视频地址
      */
-    public IjkVideoView setUrl(String url) {
+    public MagicVideoView setUrl(String url) {
         this.mCurrentUrl = url;
         return this;
     }
@@ -246,7 +246,7 @@ public IjkVideoView setUrl(String url) {
     /**
      * 一开始播放就seek到预先设置好的位置
      */
-    public IjkVideoView skipPositionWhenPlay(String url, int position) {
+    public MagicVideoView skipPositionWhenPlay(String url, int position) {
         this.mCurrentUrl = url;
         this.mCurrentPosition = position;
         return this;
@@ -255,7 +255,7 @@ public IjkVideoView skipPositionWhenPlay(String url, int position) {
     /**
      * 设置视频的类型
      */
-    public IjkVideoView setVideoType(int type) {
+    public MagicVideoView setVideoType(int type) {
         mCurrentVideoType = type;
         return this;
     }
@@ -263,7 +263,7 @@ public IjkVideoView setVideoType(int type) {
     /**
      * 设置一个列表的视频
      */
-    public IjkVideoView setVideos(List<VideoModel> videoModels) {
+    public MagicVideoView setVideos(List<VideoModel> videoModels) {
         this.mVideoModels = videoModels;
         playNext();
         return this;
@@ -272,7 +272,7 @@ public IjkVideoView setVideos(List<VideoModel> videoModels) {
     /**
      * 设置标题
      */
-    public IjkVideoView setTitle(String title) {
+    public MagicVideoView setTitle(String title) {
         if (title != null) {
             this.mCurrentTitle = title;
         }
@@ -282,7 +282,7 @@ public IjkVideoView setTitle(String title) {
     /**
      * 开启缓存
      */
-    public IjkVideoView enableCache() {
+    public MagicVideoView enableCache() {
         isCache = true;
         return this;
     }
@@ -296,7 +296,7 @@ private void playNext() {
             mCurrentUrl = videoModel.url;
             mCurrentTitle = videoModel.title;
             mCurrentPosition = 0;
-            setMediaController(videoModel.type);
+            setVideoController(videoModel.type);
         }
     }
 
@@ -393,7 +393,7 @@ public void release() {
             orientationEventListener = null;
         }
 
-        cacheServer().unregisterCacheListener(this);
+        getCacheServer().unregisterCacheListener(this);
     }
 
     private boolean isInPlaybackState() {
@@ -488,7 +488,7 @@ public void startFullScreenDirectly() {
         if (mMediaController != null) mMediaController.startFullScreenDirectly();
     }
 
-    public IjkVideoView alwaysFullScreen() {
+    public MagicVideoView alwaysFullScreen() {
         mAlwaysFullScreen = true;
         return this;
     }
@@ -578,19 +578,19 @@ public String getTitle() {
     /**
      * 根据视频类型快速设置控制器
      */
-    public IjkVideoView setMediaController(int type) {
+    public MagicVideoView setVideoController(int type) {
         controllerContainer.removeAllViews();
         isControllerAdded = false;
         switch (type) {
             case VOD: {
-                IjkMediaController ijkMediaController = new IjkMediaController(getContext());
+                MagicVideoController ijkMediaController = new MagicVideoController(getContext());
                 ijkMediaController.setMediaPlayer(this);
                 mMediaController = ijkMediaController;
                 mCurrentVideoType = VOD;
                 break;
             }
             case LIVE: {
-                IjkMediaController ijkMediaController = new IjkMediaController(getContext());
+                MagicVideoController ijkMediaController = new MagicVideoController(getContext());
                 ijkMediaController.setMediaPlayer(this);
                 ijkMediaController.setLive(true);
                 mMediaController = ijkMediaController;
@@ -612,14 +612,14 @@ public IjkVideoView setMediaController(int type) {
     /**
      * 设置控制器
      */
-    public IjkVideoView setMediaController(BaseMediaController mediaController) {
+    public MagicVideoView setVideoController(BaseVideoController mediaController) {
         controllerContainer.removeAllViews();
         isControllerAdded = false;
         if (mediaController != null) {
             mediaController.setMediaPlayer(this);
             mMediaController = mediaController;
-            if (mediaController instanceof IjkMediaController) {
-                if (((IjkMediaController) mediaController).getLive()) {
+            if (mediaController instanceof MagicVideoController) {
+                if (((MagicVideoController) mediaController).getLive()) {
                     mCurrentVideoType = LIVE;
                 } else {
                     mCurrentVideoType = VOD;
@@ -779,7 +779,7 @@ public void onAudioFocusChange(int focusChange) {
     /**
      * 设置自动旋转
      */
-    public IjkVideoView autoRotate() {
+    public MagicVideoView autoRotate() {
         this.mAutoRotate = true;
         orientationEventListener = new OrientationEventListener(getContext()) { // 加速度传感器监听，用于自动旋转屏幕
 
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/player/ProxyFactory.java b/magic_player/src/main/java/com/devlin_n/magic_player/player/ProxyFactory.java
deleted file mode 100644
index 65c276ee..00000000
--- a/magic_player/src/main/java/com/devlin_n/magic_player/player/ProxyFactory.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.devlin_n.magic_player.player;
-
-import android.content.Context;
-
-import com.danikula.videocache.HttpProxyCacheServer;
-
-public class ProxyFactory {
- 
-    private static HttpProxyCacheServer sharedProxy;
- 
-    private ProxyFactory() {
-    }
- 
-    public static HttpProxyCacheServer getProxy(Context context) {
-        return sharedProxy == null ? (sharedProxy = newProxy(context)) : sharedProxy;
-    }
- 
-    private static HttpProxyCacheServer newProxy(Context context) {
-        return new HttpProxyCacheServer.Builder(context)
-                .maxCacheSize(1024 * 1024 * 1024)       // 1 Gb for cache
-                .build();
-    }
-}
\ No newline at end of file
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/player/VideoCacheManager.java b/magic_player/src/main/java/com/devlin_n/magic_player/player/VideoCacheManager.java
new file mode 100644
index 00000000..6b8ee0da
--- /dev/null
+++ b/magic_player/src/main/java/com/devlin_n/magic_player/player/VideoCacheManager.java
@@ -0,0 +1,53 @@
+package com.devlin_n.magic_player.player;
+
+import android.content.Context;
+
+import com.danikula.videocache.HttpProxyCacheServer;
+import com.danikula.videocache.file.Md5FileNameGenerator;
+import com.devlin_n.magic_player.util.StorageUtil;
+
+import java.io.File;
+
+public class VideoCacheManager {
+ 
+    private static HttpProxyCacheServer sharedProxy;
+ 
+    private VideoCacheManager() {
+    }
+ 
+    public static HttpProxyCacheServer getProxy(Context context) {
+        return sharedProxy == null ? (sharedProxy = newProxy(context)) : sharedProxy;
+    }
+ 
+    private static HttpProxyCacheServer newProxy(Context context) {
+        return new HttpProxyCacheServer.Builder(context)
+                .maxCacheSize(1024 * 1024 * 1024)       // 1 Gb for cache
+                .build();
+    }
+
+
+    /**
+     * 删除所有缓存文件
+     */
+    public static void clearAllCache(Context context) {
+        File cacheDirectory = StorageUtil.getIndividualCacheDirectory(context);
+        StorageUtil.deleteFiles(cacheDirectory);
+    }
+
+    /**
+     * 删除url对应默认缓存文件
+     */
+    public static void clearDefaultCache(Context context, String url) {
+        Md5FileNameGenerator md5FileNameGenerator = new Md5FileNameGenerator();
+        String name = md5FileNameGenerator.generate(url);
+        String pathTmp = StorageUtil.getIndividualCacheDirectory
+                (context.getApplicationContext()).getAbsolutePath()
+                + File.separator + name + ".download";
+        String path = StorageUtil.getIndividualCacheDirectory
+                (context.getApplicationContext()).getAbsolutePath()
+                + File.separator + name;
+        StorageUtil.deleteFile(pathTmp);
+        StorageUtil.deleteFile(path);
+
+    }
+}
\ No newline at end of file
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/util/StorageUtil.java b/magic_player/src/main/java/com/devlin_n/magic_player/util/StorageUtil.java
new file mode 100644
index 00000000..ed8fcc9e
--- /dev/null
+++ b/magic_player/src/main/java/com/devlin_n/magic_player/util/StorageUtil.java
@@ -0,0 +1,119 @@
+package com.devlin_n.magic_player.util;
+
+import android.content.Context;
+import android.os.Environment;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+
+import static android.os.Environment.MEDIA_MOUNTED;
+
+/**
+ * Provides application storage paths
+ * <p/>
+ * See https://github.com/nostra13/Android-Universal-Image-Loader
+ *
+ * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
+ * @since 1.0.0
+ */
+public class StorageUtil {
+
+    private static final Logger LOG = LoggerFactory.getLogger("StorageUtil");
+    private static final String INDIVIDUAL_DIR_NAME = "video-cache";
+
+    /**
+     * Returns individual application cache directory (for only video caching from Proxy). Cache directory will be
+     * created on SD card <i>("/Android/data/[app_package_name]/cache/video-cache")</i> if card is mounted .
+     * Else - Android defines cache directory on device's file system.
+     *
+     * @param context Application context
+     * @return Cache {@link File directory}
+     */
+    public static File getIndividualCacheDirectory(Context context) {
+        File cacheDir = getCacheDirectory(context, true);
+        return new File(cacheDir, INDIVIDUAL_DIR_NAME);
+    }
+
+    /**
+     * Returns application cache directory. Cache directory will be created on SD card
+     * <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 preferExternal Whether prefer external location for cache
+     * @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).
+     */
+    private static File getCacheDirectory(Context context, boolean preferExternal) {
+        File appCacheDir = null;
+        String externalStorageState;
+        try {
+            externalStorageState = Environment.getExternalStorageState();
+        } catch (NullPointerException e) { // (sh)it happens
+            externalStorageState = "";
+        }
+        if (preferExternal && MEDIA_MOUNTED.equals(externalStorageState)) {
+            appCacheDir = getExternalCacheDir(context);
+        }
+        if (appCacheDir == null) {
+            appCacheDir = context.getCacheDir();
+        }
+        if (appCacheDir == null) {
+            String cacheDirPath = context.getFilesDir().getPath() + context.getPackageName() + "/cache/";
+            LOG.warn("Can't define system cache directory! '" + cacheDirPath + "%s' will be used.");
+            appCacheDir = new File(cacheDirPath);
+        }
+        return appCacheDir;
+    }
+
+    private static File getExternalCacheDir(Context context) {
+        File dataDir = new File(new File(Environment.getExternalStorageDirectory(), "Android"), "data");
+        File appCacheDir = new File(new File(dataDir, context.getPackageName()), "cache");
+        if (!appCacheDir.exists()) {
+            if (!appCacheDir.mkdirs()) {
+                LOG.warn("Unable to create external cache directory");
+                return null;
+            }
+        }
+        return appCacheDir;
+    }
+
+    /**
+     * delete directory
+     */
+    public static void deleteFiles(File root) {
+        File files[] = root.listFiles();
+        if (files != null) {
+            for (File f : files) {
+                if (!f.isDirectory() && f.exists()) { // 判断是否存在
+                    try {
+                        f.delete();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * delete file
+     */
+    public static void deleteFile(String filePath) {
+        File file = new File(filePath);
+        if (file.exists()) {
+            if (file.isFile()) {
+                file.delete();
+            } else {
+                String[] filePaths = file.list();
+                for (String path : filePaths) {
+                    deleteFile(filePath + File.separator + path);
+                }
+                file.delete();
+            }
+        }
+    }
+}
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/widget/MagicSurfaceView.java b/magic_player/src/main/java/com/devlin_n/magic_player/widget/MagicSurfaceView.java
index 716c6962..cf76d784 100644
--- a/magic_player/src/main/java/com/devlin_n/magic_player/widget/MagicSurfaceView.java
+++ b/magic_player/src/main/java/com/devlin_n/magic_player/widget/MagicSurfaceView.java
@@ -4,7 +4,7 @@
 import android.util.AttributeSet;
 import android.view.SurfaceView;
 
-import com.devlin_n.magic_player.player.IjkVideoView;
+import com.devlin_n.magic_player.player.MagicVideoView;
 
 /**
  * Created by Devlin_n on 2017/4/10.
@@ -50,18 +50,18 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
         //如果设置了比例
         switch (screenType) {
-            case IjkVideoView.SCREEN_TYPE_ORIGINAL:
+            case MagicVideoView.SCREEN_TYPE_ORIGINAL:
                 width = mVideoWidth;
                 height = mVideoHeight;
                 break;
-            case IjkVideoView.SCREEN_TYPE_16_9:
+            case MagicVideoView.SCREEN_TYPE_16_9:
                 if (height > width / 16 * 9) {
                     height = width / 16 * 9;
                 } else {
                     width = height / 9 * 16;
                 }
                 break;
-            case IjkVideoView.SCREEN_TYPE_4_3:
+            case MagicVideoView.SCREEN_TYPE_4_3:
                 if (height > width / 4 * 3) {
                     height = width / 4 * 3;
                 } else {
@@ -69,7 +69,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                 }
 //                Log.d("@@@@", "onMeasure 4:3 : width" + width + "    height:" + height);
                 break;
-            case IjkVideoView.SCREEN_TYPE_MATCH_PARENT:
+            case MagicVideoView.SCREEN_TYPE_MATCH_PARENT:
                 width = widthMeasureSpec;
                 height = heightMeasureSpec;
                 break;
diff --git a/magic_player/src/main/java/com/devlin_n/magic_player/widget/MagicTextureView.java b/magic_player/src/main/java/com/devlin_n/magic_player/widget/MagicTextureView.java
index d02fffe9..cd022814 100644
--- a/magic_player/src/main/java/com/devlin_n/magic_player/widget/MagicTextureView.java
+++ b/magic_player/src/main/java/com/devlin_n/magic_player/widget/MagicTextureView.java
@@ -4,7 +4,7 @@
 import android.util.AttributeSet;
 import android.view.TextureView;
 
-import com.devlin_n.magic_player.player.IjkVideoView;
+import com.devlin_n.magic_player.player.MagicVideoView;
 
 /**
  * 用于显示video的，做了横屏与竖屏的匹配，还有需要rotation需求的
@@ -113,13 +113,13 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         }
 
         //如果设置了比例
-        if (screenType == IjkVideoView.SCREEN_TYPE_16_9) {
+        if (screenType == MagicVideoView.SCREEN_TYPE_16_9) {
             if (height > width) {
                 width = height * 9 / 16;
             } else {
                 height = width * 9 / 16;
             }
-        } else if (screenType == IjkVideoView.SCREEN_TYPE_4_3) {
+        } else if (screenType == MagicVideoView.SCREEN_TYPE_4_3) {
             if (height > width) {
                 width = height * 3 / 4;
             } else {
diff --git a/magic_player/src/main/res/layout/layout_float_window.xml b/magic_player/src/main/res/layout/layout_float_window.xml
index 6270ec4c..9a05c5d1 100644
--- a/magic_player/src/main/res/layout/layout_float_window.xml
+++ b/magic_player/src/main/res/layout/layout_float_window.xml
@@ -6,7 +6,7 @@
     android:background="@drawable/shape_float_window_background"
     android:padding="1dp">
 
-    <com.devlin_n.magic_player.player.IjkVideoView
+    <com.devlin_n.magic_player.player.MagicVideoView
         android:id="@+id/video_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />