Merge branch 'release/v6.2.10'

README-ZH.md

@@ -2,7 +2,7 @@
 --
 <p align="center">
 <a href="http://developer.android.com/index.html"><img src="https://img.shields.io/badge/platform-android-green.svg"></a>
-<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C5.8.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-6.2.9-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C5.8.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-6.2.10-green.svg"></a>
 <a href="http://choosealicense.com/licenses/mit/"><img src="https://img.shields.io/badge/license-MIT-green.svg"></a>
 <a href="https://android-arsenal.com/details/1/3269"><img src="https://img.shields.io/badge/Android%20Arsenal-jiaozivideoplayer-green.svg?style=true"></a>
 </p>
@@ -24,7 +24,7 @@
 
 ## 效果
 
-**[jiaozivideoplayer-6.2.9.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.9/jiaozivideoplayer-6.2.9.apk)**
+**[jiaozivideoplayer-6.2.10.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.10/jiaozivideoplayer-6.2.10.apk)**
 
 ![Demo Screenshot][1]
 
@@ -36,10 +36,10 @@
 
 1.添加类库
 ```gradle
-compile 'cn.jzvd:jiaozivideoplayer:6.2.9'
+compile 'cn.jzvd:jiaozivideoplayer:6.2.10'
 ```
 
-或直接下载 [jar包](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.9) (不建议)
+或直接下载 [jar包](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.10) (不建议)
 
 2.添加布局
 ```xml

README.md

@@ -2,19 +2,14 @@
 --
 <p align="center">
 <a href="http://developer.android.com/index.html"><img src="https://img.shields.io/badge/platform-android-green.svg"></a>
-<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C5.8.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-6.2.9-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Ccn.jzvd%7Cjiaozivideoplayer%7C5.8.2%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-6.2.10-green.svg"></a>
 <a href="http://choosealicense.com/licenses/mit/"><img src="https://img.shields.io/badge/license-MIT-green.svg"></a>
 <a href="https://android-arsenal.com/details/1/3269"><img src="https://img.shields.io/badge/Android%20Arsenal-jiaozivideoplayer-green.svg?style=true"></a>
 </p>
 
-
-# [斗鱼直播](https://www.douyu.com/1667893)
-
-周一到周三每天上午10:00开始直播写代码，回答大家的使用问题，请大家进入直播间后提问，直播期间不再手动打字回复
-
 完美的列表滑动的检测，一行代码将系统的播放器换成Ijkplayer Exoplayer Vitamio等
 
-Q群:490442439 验证信息:jzvd
+Q群:490442439(1群 满) 761899104(2群)验证信息:jzvd
 
 [中文文档](https://github.com/lipangit/JiaoZiVideoPlayer/blob/develop/README-ZH.md) [WorkPlan](https://github.com/lipangit/JiaoZiVideoPlayer/projects/2) [微博](http://weibo.com/2342820395/profile?topnav=1&wvr=6&is_all=1) [视频教程](https://github.com/lipangit/JiaoZiVideoPlayer/wiki/%E8%A7%86%E9%A2%91%E6%95%99%E7%A8%8B)
 
@@ -35,7 +30,7 @@ Q群:490442439 验证信息:jzvd
 
 ## A demo showing available effects
 
-**[jiaozivideoplayer-6.2.9.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.9/jiaozivideoplayer-6.2.9.apk)**
+**[jiaozivideoplayer-6.2.10.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.10/jiaozivideoplayer-6.2.10.apk)**
 
 ![Demo Screenshot][1]
 
@@ -47,10 +42,10 @@ Only five steps to use the player.
 
 1.Import library
 ```gradle
-compile 'cn.jzvd:jiaozivideoplayer:6.2.9'
+compile 'cn.jzvd:jiaozivideoplayer:6.2.10'
 ```
 
-Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.9) (not recommended)
+Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.10) (not recommended)
 
 2.Add JZVideoPlayer in your layout
 ```xml

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "cn.jzvd.demo"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 79
-        versionName "6.2.9"
+        versionCode 80
+        versionName "6.2.10"
     }
     signingConfigs {
         releaseConfig {
@@ -32,16 +32,14 @@ android {
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
     implementation 'com.android.support:appcompat-v7:27.1.0'
     implementation project(':jiaozivideoplayer')
-
     implementation 'tv.danmaku.ijk.media:ijkplayer-java:0.8.4'
     implementation 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.8.4'
-
     implementation 'com.android.support:recyclerview-v7:27.1.0'
     implementation 'com.danikula:videocache:2.7.0'
-
     implementation 'com.github.bumptech.glide:glide:4.6.1'
+    implementation 'com.google.android.exoplayer:exoplayer:2.7.1'
 }

app/src/main/AndroidManifest.xml

@@ -4,7 +4,6 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
 
     <application
         android:name=".ApplicationDemo"

app/src/main/java/cn/jzvd/demo/ActivityApiCustomMediaPlayer.java

@@ -18,14 +18,15 @@
 import cn.jzvd.JZVideoPlayer;
 import cn.jzvd.JZVideoPlayerStandard;
 import cn.jzvd.demo.CustomMediaPlayer.CustomMediaPlayerAssertFolder;
+import cn.jzvd.demo.CustomMediaPlayer.JZExoPlayer;
 import cn.jzvd.demo.CustomMediaPlayer.JZMediaIjkplayer;
 
 /**
  * Created by Nathen on 2017/11/23.
  */
 
 public class ActivityApiCustomMediaPlayer extends AppCompatActivity implements View.OnClickListener {
-    Button mChangeToIjk, mChangeToSystemMediaPlayer;
+    Button mChangeToIjk, mChangeToSystemMediaPlayer, mChangeToExo;
     JZVideoPlayerStandard jzVideoPlayerStandard;
     Handler handler = new Handler();//这里其实并不需要handler，为了防止播放中切换播放器引擎导致的崩溃，实际使用时一般不会遇到，可以随时调用JZVideoPlayer.setMediaInterface();
 
@@ -42,9 +43,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         jzVideoPlayerStandard = findViewById(R.id.videoplayer);
         mChangeToIjk = findViewById(R.id.change_to_ijkplayer);
         mChangeToSystemMediaPlayer = findViewById(R.id.change_to_system_mediaplayer);
+        mChangeToExo = findViewById(R.id.change_to_exo);
 
         mChangeToIjk.setOnClickListener(this);
         mChangeToSystemMediaPlayer.setOnClickListener(this);
+        mChangeToExo.setOnClickListener(this);
 
         LinkedHashMap map = new LinkedHashMap();
         try {
@@ -88,6 +91,17 @@ public void run() {
                 Toast.makeText(this, "Change to MediaPlayer", Toast.LENGTH_SHORT).show();
                 finish();
                 break;
+            case R.id.change_to_exo:
+                JZVideoPlayer.releaseAllVideos();
+                handler.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+                        JZVideoPlayer.setMediaInterface(new JZExoPlayer());
+                    }
+                }, 1000);
+                Toast.makeText(this, "Change to ExoPlayer", Toast.LENGTH_SHORT).show();
+                finish();
+                break;
         }
     }