Merge branch 'release/v6.2.3'

README-ZH.md

@@ -2,31 +2,28 @@
 --
 <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.2-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.3-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>
 
 ## 主要特点
 
 1. 可以完全自定义UI和任何功能
-2. 支持https和rtsp协议，更多协议请点[这里](https://developer.android.com/guide/topics/media/media-formats.html)
-3. 小于 110kb
+2. 一行代码切换播放引擎，支持的视频格式和协议取决于播放引擎，[android.media.MediaPlayer](https://developer.android.com/guide/topics/media/media-formats.html) [ijkplayer](https://github.com/Bilibili/ijkplayer)
+3. 完美检测列表滑动
 4. 可实现全屏播放，小窗播放
-5. 完美的列表滑动的判断
-6. 能在`ListView`、`ViewPager`和`ListView`、`ViewPager`和`Fragment`等多重嵌套模式下全屏工作
-7. 可以在加载、暂停、播放等各种状态中正常进入全屏和退出全屏
-8. 多种视频适配屏幕的方式，可铺满全屏，可以全屏剪裁
-9. 重力感应自动进入全屏
-10. 全屏后手势修改进度和音量
-11. Home键退出界面暂停播放，返回界面继续播放
-12. WebView嵌套本地视频控件
-
-对于中小公司而言，目前认为安卓中视频点播的终极状态是系统的MediaPlayer，其他的播放引擎并不是未来的趋势，虽然系统的MediaPlayer也有缺点我认为我们应该做出一些让步，如果系统的MediaPlayer没有重大缺陷将不会考虑替换它。
+5. 能在`ListView`、`ViewPager`和`ListView`、`ViewPager`和`Fragment`等多重嵌套模式下全屏工作
+6. 可以在加载、暂停、播放等各种状态中正常进入全屏和退出全屏
+7. 多种视频适配屏幕的方式，可铺满全屏，可以全屏剪裁
+8. 重力感应自动进入全屏
+9. 全屏后手势修改进度和音量
+10. Home键退出界面暂停播放，返回界面继续播放
+11. WebView嵌套本地视频控件
 
 ## 效果
 
-**[jiaozivideoplayer-6.2.2.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.2/jiaozivideoplayer-6.2.2.apk)**
+**[jiaozivideoplayer-6.2.3.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.3/jiaozivideoplayer-6.2.3.apk)**
 
 ![Demo Screenshot][1]
 
@@ -38,10 +35,10 @@
 
 1.添加类库
 ```gradle
-compile 'cn.jzvd:jiaozivideoplayer:6.2.2'
+compile 'cn.jzvd:jiaozivideoplayer:6.2.3'
 ```
 
-或直接下载[jar包](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.2) (不建议)
+或直接下载 [jar包](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.3) (不建议)
 
 2.添加布局
 ```xml

README.md

@@ -2,42 +2,39 @@
 --
 <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.2-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.3-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开始直播写代码，回答大家的使用问题，请大家进入直播间后提问，直播期间不再手动打字回复
+周一到周三每天上午10:00开始直播写代码，回答大家的使用问题，请大家进入直播间后提问，直播期间不再手动打字回复
 
 完美的列表滑动的检测，一行代码将系统的播放器换成Ijkplayer Exoplayer Vitamio等
 
 Q群:490442439 验证信息:jzvd
 
-[英文文档](https://github.com/lipangit/JiaoZiVideoPlayer) [工作计划](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)
+[中文文档](https://github.com/lipangit/JiaoZiVideoPlayer/blob/develop/README-ZH.md) [工作计划](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)
 
 ## Features
 
 1. You can completely customize the UI and any function
-2. Support https and rtsp agreement, more agreement please click [here](https://developer.android.com/guide/topics/media/media-formats.html)
-3. Less than 110kb
+2. One line of code to switch the playback engine, supported video formats and protocols depends on the playback engine,[android.media.MediaPlayer](https://developer.android.com/guide/topics/media/media-formats.html) [ijkplayer](https://github.com/Bilibili/ijkplayer)
+3. Perfect detection list sliding
 4. Can achieve full-screen playback, small window playback
-5. The perfect list of sliding judgment
-6. Full-screen work in multiple nested modes like ListView, ViewPager and ListView, ViewPager and Fragment
-7. Can load, pause, play and other normal state into the full screen and exit full screen
-8. A variety of video adaptation screen mode, can be covered full screen, you can cut full screen
-9. Gravity sensing automatically enter full screen
-10. Full screen gestures to modify the progress and volume
-11. Home key to exit the interface to suspend the playback, return to the interface to continue playing
-12. WebView Nested Local Video Controls
-
-For small and medium-sized companies, I think the final solution to video in android is `android.media.MediaPlayer`, other players are not in the trend, even if the `android.media.MediaPlayer` has disavantages we should make concession, if `android.media.MediaPlayer` has defect we will consider to change other player.
+5. Full-screen work in multiple nested modes like ListView, ViewPager and ListView, ViewPager and Fragment
+6. Can load, pause, play and other normal state into the full screen and exit full screen
+7. A variety of video adaptation screen mode, can be covered full screen, you can cut full screen
+8. Gravity sensing automatically enter full screen
+9. Full screen gestures to modify the progress and volume
+10. Home key to exit the interface to suspend the playback, return to the interface to continue playing
+11. WebView Nested Local Video Controls
 
 ## Effect
 
-**[jiaozivideoplayer-6.2.2.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.2/jiaozivideoplayer-6.2.2.apk)**
+**[jiaozivideoplayer-6.2.3.apk](https://github.com/lipangit/JiaoZiVideoPlayer/releases/download/v6.2.3/jiaozivideoplayer-6.2.3.apk)**
 
 ![Demo Screenshot][1]
 
@@ -49,10 +46,10 @@ Even the custom UI, or has changed to the Library, is also the five steps to use
 
 1.Import library
 ```gradle
-compile 'cn.jzvd:jiaozivideoplayer:6.2.2'
+compile 'cn.jzvd:jiaozivideoplayer:6.2.3'
 ```
 
-Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.2) (not recommended)
+Or download [lib](https://github.com/lipangit/JiaoZiVideoPlayer/releases/tag/v6.2.3) (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 73
-        versionName "6.2.2"
+        versionCode 74
+        versionName "6.2.3"
     }
     signingConfigs {
         releaseConfig {
@@ -34,7 +34,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
-    implementation 'com.android.support:appcompat-v7:27.0.1'
+    implementation 'com.android.support:appcompat-v7:27.0.2'
     implementation project(':jiaozivideoplayer')
     implementation 'com.squareup.picasso:picasso:2.5.2'
 
@@ -45,5 +45,5 @@ dependencies {
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4'
 
-    implementation 'com.android.support:recyclerview-v7:27.0.1'
+    implementation 'com.android.support:recyclerview-v7:27.0.2'
 }

gradle/maven_push.gradle

@@ -22,7 +22,7 @@ signing {
 
 group = "cn.jzvd"
 archivesBaseName = "jiaozivideoplayer"
-version = "6.2.2"
+version = "6.2.3"
 
 uploadArchives {
     repositories {

jiaozivideoplayer/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 73
-        versionName "6.2.2"
+        versionCode 74
+        versionName "6.2.3"
     }
     buildTypes {
         release {

jiaozivideoplayer/src/main/java/cn/jzvd/JZUtils.java

@@ -119,16 +119,15 @@ public static void saveProgress(Context context, Object url, long progress) {
         SharedPreferences spn = context.getSharedPreferences("JZVD_PROGRESS",
                 Context.MODE_PRIVATE);
         SharedPreferences.Editor editor = spn.edit();
-        editor.putLong(url.toString(), progress);
+        editor.putLong("newVersion:" + url.toString(), progress);
         editor.apply();
     }
 
     public static long getSavedProgress(Context context, Object url) {
         if (!JZVideoPlayer.SAVE_PROGRESS) return 0;
-        SharedPreferences spn;
-        spn = context.getSharedPreferences("JZVD_PROGRESS",
+        SharedPreferences spn = context.getSharedPreferences("JZVD_PROGRESS",
                 Context.MODE_PRIVATE);
-        return spn.getLong(url.toString(), 0);
+        return spn.getLong("newVersion:" + url.toString(), 0);
     }
 
     /**

jiaozivideoplayer/src/main/java/cn/jzvd/JZVideoPlayer.java

@@ -749,7 +749,6 @@ public void onAutoCompletion() {
         dismissVolumeDialog();
         dismissProgressDialog();
         dismissBrightnessDialog();
-        cancelProgressTimer();
         onStateAutoComplete();
 
         if (currentScreen == SCREEN_WINDOW_FULLSCREEN || currentScreen == SCREEN_WINDOW_TINY) {