Merge branch 'release/v5.8.1'

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%7Cfm.jiecao%7Cjiecaovideoplayer%7C4.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-5.8-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C4.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-5.8.1-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-jiecaovideoplayer-green.svg?style=true"></a>
 </p>
@@ -28,7 +28,7 @@
 
 ## 效果
 
-**[jiecaovideoplayer-5.8.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.8/jiecaovideoplayer-5.8.apk)**
+**[jiecaovideoplayer-5.8.1.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.8.1/jiecaovideoplayer-5.8.1.apk)**
 
 ![Demo Screenshot][1]
 
@@ -38,10 +38,10 @@
 
 1.添加类库
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:5.8'
+compile 'fm.jiecao:jiecaovideoplayer:5.8.1'
 ```
 
-[或直接下载jar包](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.8)
+[或直接下载jar包](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.8.1)
 
 2.添加布局
 ```xml

README.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%7Cfm.jiecao%7Cjiecaovideoplayer%7C4.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-5.8-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C4.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-5.8.1-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-jiecaovideoplayer-green.svg?style=true"></a>
 </p>
@@ -30,7 +30,7 @@ I think the final solution for play video in android is android.media.MediaPlaye
 
 ## Effect
 
-**[jiecaovideoplayer-5.8.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.8/jiecaovideoplayer-5.8.apk)**
+**[jiecaovideoplayer-5.8.1.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.8.1/jiecaovideoplayer-5.8.1.apk)**
 
 ![Demo Screenshot][1]
 
@@ -40,10 +40,10 @@ Even the custom UI, or has changed to the Library, is also the five steps to use
 
 1.Import library
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:5.8'
+compile 'fm.jiecao:jiecaovideoplayer:5.8.1'
 ```
 
-[Or download lib](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.8)
+[Or download lib](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.8.1)
 
 2.Add JCVideoPlayer in your layout
 ```xml

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "fm.jiecao.jiecaovideoplayer"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 62
-        versionName "5.8"
+        versionCode 63
+        versionName "5.8.1"
     }
     buildTypes {
         release {

app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java

@@ -48,15 +48,8 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mAboutWebView.setOnClickListener(this);
 
         myJCVideoPlayerStandard = (MyJCVideoPlayerStandard) findViewById(R.id.jc_video);
-
-        LinkedHashMap map = new LinkedHashMap();
-        map.put("高清", "http://video.jiecao.fm/11/23/xin/%E5%81%87%E4%BA%BA.mp4");
-        map.put("标清", "http://video.jiecao.fm/8/16/%E4%BF%AF%E5%8D%A7%E6%92%91.mp4");
-        map.put("普清", "http://video.jiecao.fm/8/16/%E9%B8%AD%E5%AD%90.mp4");
-        myJCVideoPlayerStandard.setUp(map, 0
-                , JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL, "嫂子不信");
-//        myJCVideoPlayerStandard.setUp("http://video.jiecao.fm/11/23/xu/%E5%A6%B9%E5%A6%B9.mp4"
-//                , JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL, "嫂子快长大");
+        myJCVideoPlayerStandard.setUp("http://video.jiecao.fm/11/23/xu/%E5%A6%B9%E5%A6%B9.mp4"
+                , JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL, "嫂子快长大");
         Picasso.with(this)
                 .load("http://img4.jiecaojingxuan.com/2016/11/23/1bb2ebbe-140d-4e2e-abd2-9e7e564f71ac.png@!640_360")
                 .into(myJCVideoPlayerStandard.thumbImageView);

gradle/maven_push.gradle

@@ -22,7 +22,7 @@ signing {
 
 group = "fm.jiecao"
 archivesBaseName = "jiecaovideoplayer"
-version = "5.8"
+version = "5.8.1"
 
 uploadArchives {
     repositories {

jcvideoplayer-lib/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 62
-        versionName "5.8"
+        versionCode 63
+        versionName "5.8.1"
     }
     buildTypes {
         release {

jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCVideoPlayer.java

@@ -482,7 +482,7 @@ public void onInfo(int what, int extra) {
                 BACKUP_PLAYING_BUFFERING_STATE = -1;
             }
             Log.d(TAG, "MEDIA_INFO_BUFFERING_END");
-        }else if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START){
+        } else if (what == MediaPlayer.MEDIA_INFO_VIDEO_RENDERING_START) {
             onVideoRendingStart();
         }
     }
@@ -871,6 +871,7 @@ public void playOnThisJcvd() {
         Log.i(TAG, "playOnThisJcvd " + " [" + this.hashCode() + "] ");
         //1.清空全屏和小窗的jcvd
         currentState = JCVideoPlayerManager.getSecondFloor().currentState;
+        currentUrlMapIndex = JCVideoPlayerManager.getSecondFloor().currentUrlMapIndex;
         clearFloatScreen();
         //2.在本jcvd上播放
         setState(currentState);