Merge branch 'release/v4.0_beta'

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%7C3.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-3.6.3-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.0_beta-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>
@@ -19,33 +19,33 @@
 5. 视频大小的屏幕适配，宽或长至少有两个对边是充满屏幕的，另外两个方向居中
 6. 可以在加载、暂停、播放等各种状态中正常进入全屏和退出全屏
 7. [支持hls,rtsp](https://developer.android.com/guide/appendix/media-formats.html)
-8. 占用空间非常小，不到60k
+8. 占用空间非常小，不到100k
 9. 设置http头信息
 
 ##效果
 
-**[jiecaovideoplayer-3.6.3-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.3-demo.apk)**
+**[jiecaovideoplayer-4.0_beta-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.0_beta-demo.apk)**
 
 ![Demo Screenshot][1]
 
 ##使用
 1.添加类库
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:3.6.3'
+compile 'fm.jiecao:jiecaovideoplayer:4.0_beta'
 ```
 
 或直接下载
 
-* [jiecaovideoplayer-3.6.3.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.3.aar)
-* [jiecaovideoplayer-3.6.3-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.3-javadoc.jar)
-* [jiecaovideoplayer-3.6.3-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.3-sources.jar)
+* [jiecaovideoplayer-4.0_beta.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.0_beta.aar)
+* [jiecaovideoplayer-4.0_beta-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.0_beta-javadoc.jar)
+* [jiecaovideoplayer-4.0_beta-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.0_beta-sources.jar)
 
 2.添加布局
 ```xml
 <fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard
     android:id="@+id/custom_videoplayer_standard"
     android:layout_width="match_parent"
-    android:lay3.6.3out_height="200dp"/>
+    android:layout_height="200dp"/>
 ```
 
 3.设置视频地址、缩略图地址、标题
@@ -82,7 +82,7 @@ jcVideoPlayerStandard.startButton.performClick();
 
 ##贡献者
 
-[Nathen](https://github.com/lipangit) [Derlio](https://github.com/derlio) [zhangzzqq](https://github.com/zhangzzqq) [carmelo-ruota](https://github.com/carmelo-ruota) [wxxsw](https://github.com/wxxsw)
+[Nathen](https://github.com/lipangit) [Derlio](https://github.com/derlio) [zhangzzqq](https://github.com/zhangzzqq) [carmelo-ruota](https://github.com/carmelo-ruota) [wxxsw](https://github.com/wxxsw) [Miguel Aragues](https://github.com/Maragues)
 
 ## License MIT
 

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%7C3.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-3.6.3-green.svg"></a>
+<a href="http://search.maven.org/#artifactdetails%7Cfm.jiecao%7Cjiecaovideoplayer%7C3.6.3%7Caar"><img src="https://img.shields.io/badge/Maven%20Central-4.0_beta-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>
@@ -23,26 +23,26 @@ Android truly full-screen capabilities, the Android platform to become the most
 5. Adaptive to the screen size, where at least the width or length of the video is adaptive while the other  is centered on the screen
 6. It will not disturb or change the playing state when entering or exiting fullscreen
 7. [Support hls,rtsp](https://developer.android.com/guide/appendix/media-formats.html)
-8. With limited storage, less than 60 kb
+8. With limited storage, less than 100k
 9. Put head data
 
 ## Effect
 
-**[jiecaovideoplayer-3.6.3-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.3-demo.apk)**
+**[jiecaovideoplayer-4.0_beta-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.0_beta-demo.apk)**
 
 ![Demo Screenshot][1]
 
 ## Usage
 1.Import library
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:3.6.3'
+compile 'fm.jiecao:jiecaovideoplayer:4.0_beta'
 ```
 
 Or download lib
 
-* [jiecaovideoplayer-3.6.3.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.3.aar)
-* [jiecaovideoplayer-3.6.3-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.3-javadoc.jar)
-* [jiecaovideoplayer-3.6.3-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-3.6.3-sources.jar)
+* [jiecaovideoplayer-4.0_beta.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.0_beta.aar)
+* [jiecaovideoplayer-4.0_beta-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.0_beta-javadoc.jar)
+* [jiecaovideoplayer-4.0_beta-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.0_beta-sources.jar)
 
 2.Add JCVideoPlayer in your layout
 ```xml
@@ -86,7 +86,7 @@ Need nothing
 
 ##Contributors
 
-[Nathen](https://github.com/lipangit) [Derlio](https://github.com/derlio) [zhangzzqq](https://github.com/zhangzzqq) [carmelo-ruota](https://github.com/carmelo-ruota) [wxxsw](https://github.com/wxxsw)
+[Nathen](https://github.com/lipangit) [Derlio](https://github.com/derlio) [zhangzzqq](https://github.com/zhangzzqq) [carmelo-ruota](https://github.com/carmelo-ruota) [wxxsw](https://github.com/wxxsw) [Miguel Aragues](https://github.com/Maragues)
 
 ## License MIT
 

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "fm.jiecao.jiecaovideoplayer"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 31
-        versionName "3.6.3"
+        versionCode 32
+        versionName "4.0_beta"
     }
     buildTypes {
         release {
@@ -37,4 +37,13 @@ dependencies {
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
     testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
 
+    //If you can not start app, you cancel the annotation
+    //如果app无法启动,请取消下面的注释
+    //Other ABIs: optional
+//    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.6.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.6.0'
+    //ExoPlayer as IMediaPlayer: optional, experimental
+    //compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.6.0'
 }

app/src/main/java/fm/jiecao/jiecaovideoplayer/View/JCVideoPlayerStandardFresco.java

@@ -24,7 +24,7 @@
 
 import fm.jiecao.jcvideoplayer_lib.JCBuriedPointStandard;
 import fm.jiecao.jcvideoplayer_lib.JCMediaManager;
-import fm.jiecao.jcvideoplayer_lib.Utils;
+import fm.jiecao.jcvideoplayer_lib.JCUtils;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer;
 import fm.jiecao.jiecaovideoplayer.R;
 
@@ -166,7 +166,7 @@ public void onClick(View v) {
                 return;
             }
             if (mCurrentState == CURRENT_STATE_NORMAL) {
-                if (!Utils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
+                if (!JCUtils.isWifiConnected(getContext()) && !WIFI_TIP_DIALOG_SHOWED) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
                     builder.setMessage(getResources().getString(fm.jiecao.jcvideoplayer_lib.R.string.tips_not_wifi));
                     builder.setPositiveButton(getResources().getString(fm.jiecao.jcvideoplayer_lib.R.string.tips_not_wifi_confirm), new DialogInterface.OnClickListener() {
@@ -191,7 +191,7 @@ public void onClick(DialogInterface dialog, int which) {
                 onClickUiToggle();
             }
         } else if (i == R.id.surface_container) {
-            if (JC_BURIED_POINT_STANDARD != null && JCMediaManager.instance().listener == this) {
+            if (JC_BURIED_POINT_STANDARD != null && isCurrentMediaListener()) {
                 if (mIfCurrentIsFullscreen) {
                     JC_BURIED_POINT_STANDARD.onClickBlankFullscreen(mUrl, mObjects);
                 } else {

gradle/maven_push.gradle

@@ -22,7 +22,7 @@ signing {
 
 group = "fm.jiecao"
 archivesBaseName = "jiecaovideoplayer"
-version = "3.6.3"
+version = "4.0_beta"
 
 uploadArchives {
     repositories {

jcvideoplayer-lib/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 31
-        versionName "3.6.3"
+        versionCode 32
+        versionName "4.0_beta"
     }
     buildTypes {
         release {
@@ -24,6 +24,10 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
+
+    //required, enough for most devices.
+    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.6.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.0'
 }
 
 apply from: '../gradle/maven_push.gradle'

jcvideoplayer-lib/src/main/AndroidManifest.xml

@@ -1,7 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="fm.jiecao.jcvideoplayer_lib">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <uses-sdk tools:overrideLibrary="com.example.ijkplayer_x86_64,
+     tv.danmaku.ijk.media.player_arm64"/>
     <application
         android:allowBackup="true"
         android:supportsRtl="true">

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

@@ -87,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
             mJcVideoPlayer.startButton.performClick();
         } else {
             JCVideoPlayer.IF_RELEASE_WHEN_ON_PAUSE = true;
-            JCMediaManager.instance().listener = mJcVideoPlayer;
+            JCMediaManager.instance().setListener(mJcVideoPlayer);
             if (CURRENT_STATE == JCVideoPlayer.CURRENT_STATE_PAUSE) {
                 JCMediaManager.instance().mediaPlayer.seekTo(JCMediaManager.instance().mediaPlayer.getCurrentPosition());
             }