Merge branch 'release/v5.6'

lipangit · Jul 9, 2017 · cbb6265 · cbb6265
2 parents f836413 + 5f0cd2b
commit cbb6265
Show file tree

Hide file tree

Showing 29 changed files with 710 additions and 1,090 deletions.
diff --git a/README-ZH.md b/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.5.4-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.6-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.5.4.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.5.4/jiecaovideoplayer-5.5.4.apk)**
+**[jiecaovideoplayer-5.6.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.6/jiecaovideoplayer-5.6.apk)**
 
 ![Demo Screenshot][1]
 
@@ -38,10 +38,10 @@
 
 1.添加类库
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:5.5.4'
+compile 'fm.jiecao:jiecaovideoplayer:5.6'
 ```
 
-[或直接下载jar包](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.5.4)
+[或直接下载jar包](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.6)
 
 2.添加布局
 ```xml

diff --git a/README.md b/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.5.4-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.6-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.5.4.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.5.4/jiecaovideoplayer-5.5.4.apk)**
+**[jiecaovideoplayer-5.6.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v5.6/jiecaovideoplayer-5.6.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.5.4'
+compile 'fm.jiecao:jiecaovideoplayer:5.6'
 ```
 
-[Or download lib](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.5.4)
+[Or download lib](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v5.6)
 
 2.Add JCVideoPlayer in your layout
 ```xml

diff --git a/app/build.gradle b/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.3'
+    buildToolsVersion '26.0.0'
 
     defaultConfig {
         applicationId "fm.jiecao.jiecaovideoplayer"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 59
-        versionName "5.5.4"
+        versionCode 60
+        versionName "5.6"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/ApiActivity.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/ApiActivity.java
@@ -70,7 +70,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 //        cpAssertVideoToLocalPath();
 //        mJcVideoPlayerStandard.setUp(Environment.getExternalStorageDirectory().getAbsolutePath() + "/DCIM/Camera/local_video.mp4"
 //                , JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL, "嫂子不信");
-        /** Play video in assert **/
+        /** Play video in assert, but not work now **/
 //        mJcVideoPlayerStandard.setUp("file:///android_asset/local_video.mp4"
 //                , JCVideoPlayerStandard.SCREEN_LAYOUT_NORMAL, "嫂子不信");
 

diff --git a/...jiecao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardAutoCompleteAfterFullscreen.java b/...jiecao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardAutoCompleteAfterFullscreen.java
@@ -21,7 +21,7 @@ public JCVideoPlayerStandardAutoCompleteAfterFullscreen(Context context, Attribu
     @Override
     public void onAutoCompletion() {
         if (currentScreen == SCREEN_WINDOW_FULLSCREEN) {
-            setUiWitStateAndScreen(CURRENT_STATE_AUTO_COMPLETE);
+            onStateAutoComplete();
         } else {
             super.onAutoCompletion();
         }