Merge branch 'release/v4.6'

lipangit · Aug 7, 2016 · de00d1b · de00d1b
2 parents 90ab056 + 5b2cd83
commit de00d1b
Show file tree

Hide file tree

Showing 31 changed files with 451 additions and 275 deletions.
diff --git a/README-ZH.md b/README-ZH.md
@@ -2,17 +2,15 @@
 --
 <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-4.5_preview1-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.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>
 
-真正实现Android的全屏功能，立志成为Android平台使用最广泛的视频播放控件  Q群:490442439
-
-正在全力研究 头条视频 和 天天快报 那样的用android.media.MediaPlayer小窗播放的功能，重点是在切换SurfaceView的时候或removeView的时候视频能连续播放.
+立志成为Android平台使用最广泛的视频播放控件  Q群:490442439 验证信息:jcvd
 
 ##主要特点
-1. 全屏时启动新`Activity`实现播放器真正的全屏功能
+1. 视频全屏播放和浮层小窗播放
 2. 可以完全自定义UI
 3. 能在`ListView`、`ViewPager`和`ListView`、`ViewPager`和`Fragment`等多重嵌套模式下全屏工作
 4. 手势修改进度和音量
@@ -23,7 +21,7 @@
 
 ##效果
 
-**[jiecaovideoplayer-4.5_preview1-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-demo.apk)**
+**[jiecaovideoplayer-4.6-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6-demo.apk)**
 
 ![Demo Screenshot][1]
 
@@ -33,14 +31,14 @@
 
 1.添加类库
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:4.5_preview1'
+compile 'fm.jiecao:jiecaovideoplayer:4.6'
 ```
 
 或直接下载
 
-* [jiecaovideoplayer-4.5_preview1.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1.aar)
-* [jiecaovideoplayer-4.5_preview1-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-javadoc.jar)
-* [jiecaovideoplayer-4.5_preview1-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-sources.jar)
+* [jiecaovideoplayer-4.6.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.aar)
+* [jiecaovideoplayer-4.6-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6-javadoc.jar)
+* [jiecaovideoplayer-4.6-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6-sources.jar)
 
 2.添加布局
 ```xml
@@ -52,39 +50,32 @@ compile 'fm.jiecao:jiecaovideoplayer:4.5_preview1'
 
 3.设置视频地址、缩略图地址、标题
 ```java
-JCVideoPlayerStandard jcVideoPlayerStandard = (JCVideoPlayerStandard) findViewById(R.id.custom_videoplayer_standard);
-jcVideoPlayerStandard.setUp("http://2449.vod.myqcloud.com/2449_bfbbfa3cea8f11e5aac3db03cda99974.f20.mp4"
-                , "嫂子想我没");
+JCVideoPlayerStandard jcVideoPlayerStandard = (JCVideoPlayerStandard) findViewById(R.id.jc_video);
+jcVideoPlayerStandard.setUp("http://2449.vod.myqcloud.com/2449_22ca37a6ea9011e5acaaf51d105342e3.f20.mp4"
+                            , JCVideoPlayerStandard.SCREEN_LAYOUT_LIST, "嫂子闭眼睛");
 jcVideoPlayerStandard.thumbImageView.setThumbInCustomProject("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640");
 ```
 
-4.在包含播放器的`Fragment`或`Activity`的`onPause()`方法中调用`JCVideoPlayer.releaseAllVideos();`
+4.在包含播放器的`Fragment`的`onPause()`方法中调用`JCVideoPlayer.releaseAllVideos();`
 
 ####其他接口
 
 直接进入全屏，比如在webview中视频播放的适配很麻烦很无头绪，调用此接口直接全屏播放
 ```java
-JCFullScreenActivity.startActivity(this,
-    "http://video.jiecao.fm/5/1/%E8%87%AA%E5%8F%96%E5%85%B6%E8%BE%B1.mp4",
-    JCVideoPlayerStandard.class,
-    "嫂子别摸我");
-```
-
-用代码控制播放按钮的点击,如果是普通状态会播放视频，如果是播放中会暂停视频
-```java
-jcVideoPlayerStandard.startButton.performClick();
+敬请期待
 ```
 
 ####混淆
 ```
-无需添加
+-keep class tv.danmaku.ijk.** { *; }
+-dontwarn tv.danmaku.ijk.**
 ```
 
 ##[自定义UI](./README_CUSTOM_UI-ZH.md)
 
 ##贡献者
 
-[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)
+[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) [e16din](https://github.com/e16din)
 
 ## License MIT
 
@@ -96,4 +87,4 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-[1]: ./screenshots/j6.jpg
+[1]: ./screenshots/j7.jpg
diff --git a/README.md b/README.md
@@ -2,21 +2,20 @@
 --
 <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-4.5_preview1-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.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>
 
 * This project need translators, mother language is english, you can change everything edit readme, release note, formate variable and annotation.
-* Now the research target is android.media.MediaPlayer setSurface by more surfaces the video is always continuous.
 
-Android truly full-screen capabilities, the Android platform to become the most widely used video playback controls. Q Group:490442439
+Ambition is become the most widely used video playback control.
 
 
 [中文文档](README-ZH.md)
 
 ## Features
-1. Launching new Fullscreen Activity when playing video in fullscreen mode
+1. Video fullscreen and float tiny window
 2. Completely custom ui
 3. In `ListView`、`ViewPager` and `ListView`、`ViewPager` and `Fragment` and other nested fragments and views situation, it works well
 4. Gestrues to modify progress and volume
@@ -27,7 +26,7 @@ Android truly full-screen capabilities, the Android platform to become the most
 
 ## Effect
 
-**[jiecaovideoplayer-4.5_preview1-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-demo.apk)**
+**[jiecaovideoplayer-4.6-demo.apk](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6-demo.apk)**
 
 ![Demo Screenshot][1]
 
@@ -37,14 +36,14 @@ Android truly full-screen capabilities, the Android platform to become the most
 
 1.Import library
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:4.5_preview1'
+compile 'fm.jiecao:jiecaovideoplayer:4.6'
 ```
 
 Or download lib
 
-* [jiecaovideoplayer-4.5_preview1.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1.aar)
-* [jiecaovideoplayer-4.5_preview1-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-javadoc.jar)
-* [jiecaovideoplayer-4.5_preview1-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.5_preview1-sources.jar)
+* [jiecaovideoplayer-4.6.aar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6.aar)
+* [jiecaovideoplayer-4.6-javadoc.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6-javadoc.jar)
+* [jiecaovideoplayer-4.6-sources.jar](https://raw.githubusercontent.com/lipangit/jiecaovideoplayer/develop/downloads/jiecaovideoplayer-4.6-sources.jar)
 
 2.Add JCVideoPlayer in your layout
 ```xml
@@ -56,39 +55,32 @@ Or download lib
 
 3.Set the video uri, video thumb url and video title
 ```java
-JCVideoPlayerStandard jcVideoPlayerStandard = (JCVideoPlayerStandard) findViewById(R.id.custom_videoplayer_standard);
-jcVideoPlayerStandard.setUp("http://2449.vod.myqcloud.com/2449_bfbbfa3cea8f11e5aac3db03cda99974.f20.mp4"
-                , "嫂子想我没");
+JCVideoPlayerStandard jcVideoPlayerStandard = (JCVideoPlayerStandard) findViewById(R.id.jc_video);
+jcVideoPlayerStandard.setUp("http://2449.vod.myqcloud.com/2449_22ca37a6ea9011e5acaaf51d105342e3.f20.mp4"
+                            , JCVideoPlayerStandard.SCREEN_LAYOUT_LIST, "嫂子闭眼睛");
 jcVideoPlayerStandard.thumbImageView.setThumbInCustomProject("http://p.qpic.cn/videoyun/0/2449_43b6f696980311e59ed467f22794e792_1/640");
 ```
 
-4.Remember to invoke `JCVideoPlayer.releaseAllVideos();` in `onPause()` of `Fragment` or `Activity`
+4.Remember to invoke `JCVideoPlayer.releaseAllVideos();` in `onPause()` of `Activity`
 
 #### Other APIs
 
 Invoke `JCFullScreenActivity.startActivity(...)` to enter fullscreen directly.
 ```java
-JCFullScreenActivity.startActivity(this,
-    "http://video.jiecao.fm/5/1/%E8%87%AA%E5%8F%96%E5%85%B6%E8%BE%B1.mp4",
-    JCVideoPlayerStandard.class,
-    "嫂子别摸我");
-```
-
-Control play button,if state is normal it will play, if state is playing it will pause
-```java
-jcVideoPlayerStandard.startButton.performClick();
+Comming soon
 ```
 
 ProGuard
 ```
-Need nothing
+-keep class tv.danmaku.ijk.** { *; }
+-dontwarn tv.danmaku.ijk.**
 ```
 
 ##[Custom UI](./README_CUSTOM_UI.md)
 
 ##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) [Miguel Aragues](https://github.com/Maragues)
+[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) [e16din](https://github.com/e16din)
 
 ## License MIT
 
@@ -100,5 +92,5 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-[1]: ./screenshots/j6.jpg
+[1]: ./screenshots/j7.jpg
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "fm.jiecao.jiecaovideoplayer"
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 35
-        versionName "4.5_preview1"
+        versionCode 36
+        versionName "4.6"
     }
     buildTypes {
         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,17 +21,35 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ActivityPlayDirectly"/>
+        <activity
+            android:name=".ActivityPlayDirectly"
+            android:screenOrientation="portrait"/>
 
-        <activity android:name=".ActivityListView"/>
-        <activity android:name=".ActivityListViewNormal"/>
-        <activity android:name=".ActivityListViewViewpager"/>
-        <activity android:name=".ActivityListViewMultiHolder"/>
+        <activity
+            android:name=".ActivityListView"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ActivityListViewNormal"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ActivityListViewViewpager"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ActivityListViewMultiHolder"
+            android:screenOrientation="portrait"/>
 
-        <activity android:name=".ActivityUI"/>
-        <activity android:name=".ActivityUISmallChange"/>
-        <activity android:name=".ActivityUIBigChange"/>
-        <activity android:name=".ActivityUIImageLoader"/>
+        <activity
+            android:name=".ActivityUI"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ActivityUISmallChange"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ActivityUIBigChange"
+            android:screenOrientation="portrait"/>
+        <activity
+            android:name=".ActivityUIImageLoader"
+            android:screenOrientation="portrait"/>
 
     </application>
 

diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/ActiivtyMain.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/ActiivtyMain.java
@@ -4,11 +4,14 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 
 import com.nostra13.universalimageloader.core.ImageLoader;
 
+import fm.jiecao.jcvideoplayer_lib.JCBuriedPoint;
+import fm.jiecao.jcvideoplayer_lib.JCBuriedPointStandard;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerSimple;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard;
@@ -42,17 +45,77 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
         jcVideoPlayerStandard = (JCVideoPlayerStandard) findViewById(R.id.jc_video);
         jcVideoPlayerStandard.setUp("http://2449.vod.myqcloud.com/2449_22ca37a6ea9011e5acaaf51d105342e3.f20.mp4"
-                , JCVideoPlayerStandard.SCREEN_LAYOUT_LIST, "嫂子闭眼睛");
+                , JCVideoPlayerStandard.SCREEN_LAYOUT_LIST, "嫂子坐这");
         ImageLoader.getInstance().displayImage("http://cos.myqcloud.com/1000264/qcloud_video_attachment/842646334/vod_cover/cover1458036374.jpg",
                 jcVideoPlayerStandard.thumbImageView);
 
         findViewById(R.id.tiny_win).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                jcVideoPlayerStandard.toWindowTiny();
+                jcVideoPlayerStandard.startWindowTiny();
             }
         });
 
+        JCVideoPlayer.setJcBuriedPoint(new MyJCBuriedPointStandard());
+
+    }
+
+    class MyJCBuriedPointStandard implements JCBuriedPointStandard {
+
+        @Override
+        public void onEvent(int type, String url, int screen, Object... objects) {
+            switch (type) {
+                case JCBuriedPoint.ON_CLICK_START_ICON:
+                    Log.i("Buried_Point", "ON_CLICK_START_ICON" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_CLICK_START_ERROR:
+                    Log.i("Buried_Point", "ON_CLICK_START_ERROR" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_CLICK_START_AUTO_COMPLETE:
+                    Log.i("Buried_Point", "ON_CLICK_START_AUTO_COMPLETE" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_CLICK_PAUSE:
+                    Log.i("Buried_Point", "ON_CLICK_PAUSE" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_CLICK_RESUME:
+                    Log.i("Buried_Point", "ON_CLICK_RESUME" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_SEEK_POSITION:
+                    Log.i("Buried_Point", "ON_SEEK_POSITION" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_AUTO_COMPLETE:
+                    Log.i("Buried_Point", "ON_AUTO_COMPLETE" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_ENTER_FULLSCREEN:
+                    Log.i("Buried_Point", "ON_ENTER_FULLSCREEN" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_QUIT_FULLSCREEN:
+                    Log.i("Buried_Point", "ON_QUIT_FULLSCREEN" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_ENTER_TINYSCREEN:
+                    Log.i("Buried_Point", "ON_ENTER_TINYSCREEN" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_QUIT_TINYSCREEN:
+                    Log.i("Buried_Point", "ON_QUIT_TINYSCREEN" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_TOUCH_SCREEN_SEEK_VOLUME:
+                    Log.i("Buried_Point", "ON_TOUCH_SCREEN_SEEK_VOLUME" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPoint.ON_TOUCH_SCREEN_SEEK_POSITION:
+                    Log.i("Buried_Point", "ON_TOUCH_SCREEN_SEEK_POSITION" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+
+                case JCBuriedPointStandard.ON_CLICK_START_THUMB:
+                    Log.i("Buried_Point", "ON_CLICK_START_THUMB" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                case JCBuriedPointStandard.ON_CLICK_BLANK:
+                    Log.i("Buried_Point", "ON_CLICK_BLANK" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
+                    break;
+                default:
+                    Log.i("Buried_Point", "unknow");
+                    break;
+            }
+        }
     }
 
     @Override