Merge branch 'release/v4.8.3'

lipangit · Nov 20, 2016 · 45be020 · 45be020
2 parents 5c04bd2 + 66f9bb7
commit 45be020
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 109 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-4.8.2-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-4.8.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-jiecaovideoplayer-green.svg?style=true"></a>
 </p>
@@ -26,7 +26,7 @@
 
 ##效果
 
-**[jiecaovideoplayer-4.8.2-demo.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v4.8.2/jiecaovideoplayer-4.8.2.apk)**
+**[jiecaovideoplayer-4.8.3-demo.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v4.8.3/jiecaovideoplayer-4.8.3.apk)**
 
 ![Demo Screenshot][1]
 
@@ -36,10 +36,10 @@
 
 1.添加类库
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:4.8.2'
+compile 'fm.jiecao:jiecaovideoplayer:4.8.3'
 ```
 
-[或直接下载jar包](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v4.8.2)
+[或直接下载jar包](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v4.8.3)
 
 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-4.8.2-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-4.8.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-jiecaovideoplayer-green.svg?style=true"></a>
 </p>
@@ -28,7 +28,7 @@
 
 ## Effect
 
-**[jiecaovideoplayer-4.8.2-demo.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v4.8.2/jiecaovideoplayer-4.8.2.apk)**
+**[jiecaovideoplayer-4.8.3-demo.apk](https://github.com/lipangit/JieCaoVideoPlayer/releases/download/v4.8.3/jiecaovideoplayer-4.8.3.apk)**
 
 ![Demo Screenshot][1]
 
@@ -38,10 +38,10 @@ Even the custom UI, or has changed to the Library, is also the four steps to use
 
 1.Import library
 ```gradle
-compile 'fm.jiecao:jiecaovideoplayer:4.8.2'
+compile 'fm.jiecao:jiecaovideoplayer:4.8.3'
 ```
 
-[Or download lib](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v4.8.2)
+[Or download lib](https://github.com/lipangit/JieCaoVideoPlayer/releases/tag/v4.8.3)
 
 2.Add JCVideoPlayer in your layout
 ```xml

diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "fm.jiecao.jiecaovideoplayer"
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 46
-        versionName "4.8.2"
+        versionCode 47
+        versionName "4.8.3"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardFresco.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/CustomView/JCVideoPlayerStandardFresco.java
@@ -23,7 +23,7 @@
 import java.util.Timer;
 import java.util.TimerTask;
 
-import fm.jiecao.jcvideoplayer_lib.JCBuriedPointStandard;
+import fm.jiecao.jcvideoplayer_lib.JCUserActionStandard;
 import fm.jiecao.jcvideoplayer_lib.JCUtils;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer;
 import fm.jiecao.jiecaovideoplayer.R;
@@ -44,7 +44,7 @@ public class JCVideoPlayerStandardFresco extends JCVideoPlayer {
     protected static Timer DISSMISS_CONTROL_VIEW_TIMER;
     protected DismissControlViewTimerTask mDismissControlViewTimerTask;
 
-    protected static JCBuriedPointStandard JC_BURIED_POINT_STANDARD;
+    protected static JCUserActionStandard JC_USER_EVENT_STANDARD;
 
     public JCVideoPlayerStandardFresco(Context context) {
         super(context);
@@ -185,11 +185,11 @@ public void onClick(View v) {
                 onClickUiToggle();
             }
         } else if (i == R.id.surface_container) {
-            if (JC_BURIED_POINT_STANDARD != null && isCurrentMediaListener()) {
+            if (JC_USER_EVENT_STANDARD != null && isCurrentMediaListener()) {
 //                if (mIfCurrentIsFullscreen) {
-//                    JC_BURIED_POINT_STANDARD.onClickBlankFullscreen(url, objects);
+//                    JC_USER_EVENT_STANDARD.onClickBlankFullscreen(url, objects);
 //                } else {
-//                    JC_BURIED_POINT_STANDARD.onClickBlank(url, objects);
+//                    JC_USER_EVENT_STANDARD.onClickBlank(url, objects);
 //                }
             }
             startDismissControlViewTimer();
@@ -235,7 +235,7 @@ public void onStopTrackingTouch(SeekBar seekBar) {
     }
 
     private void startPlayLogic() {
-        onEvent(JCBuriedPointStandard.ON_CLICK_START_THUMB);
+        onEvent(JCUserActionStandard.ON_CLICK_START_THUMB);
         prepareVideo();
         startDismissControlViewTimer();
     }

diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/ListViewMultiHolderActivity.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/ListViewMultiHolderActivity.java
@@ -7,11 +7,9 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AbsListView;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.squareup.picasso.Picasso;
 

diff --git a/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java b/app/src/main/java/fm/jiecao/jiecaovideoplayer/MainActivity.java
@@ -12,8 +12,8 @@
 
 import com.squareup.picasso.Picasso;
 
-import fm.jiecao.jcvideoplayer_lib.JCBuriedPoint;
-import fm.jiecao.jcvideoplayer_lib.JCBuriedPointStandard;
+import fm.jiecao.jcvideoplayer_lib.JCUserAction;
+import fm.jiecao.jcvideoplayer_lib.JCUserActionStandard;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayer;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerSimple;
 import fm.jiecao.jcvideoplayer_lib.JCVideoPlayerStandard;
@@ -63,7 +63,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 .into(mJcVideoPlayerStandard.thumbImageView);
         mJcVideoPlayerStandard.looping = true;
 
-        JCVideoPlayer.setJcBuriedPoint(new MyJCBuriedPointStandard());
+        JCVideoPlayer.setJcUserAction(new MyUserActionStandard());
         mSensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
         mSensorEventListener = new JCVideoPlayer.JCAutoFullscreenListener();
     }
@@ -114,59 +114,59 @@ public void onClick(View v) {
         }
     }
 
-    class MyJCBuriedPointStandard implements JCBuriedPointStandard {
+    class MyUserActionStandard implements JCUserActionStandard {
 
         @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);
+                case JCUserAction.ON_CLICK_START_ICON:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_CLICK_START_ERROR:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_CLICK_START_AUTO_COMPLETE:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_CLICK_PAUSE:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_CLICK_RESUME:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_SEEK_POSITION:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_AUTO_COMPLETE:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_ENTER_FULLSCREEN:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_QUIT_FULLSCREEN:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_ENTER_TINYSCREEN:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_QUIT_TINYSCREEN:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_TOUCH_SCREEN_SEEK_VOLUME:
+                    Log.i("USER_EVENT", "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);
+                case JCUserAction.ON_TOUCH_SCREEN_SEEK_POSITION:
+                    Log.i("USER_EVENT", "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);
+                case JCUserActionStandard.ON_CLICK_START_THUMB:
+                    Log.i("USER_EVENT", "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);
+                case JCUserActionStandard.ON_CLICK_BLANK:
+                    Log.i("USER_EVENT", "ON_CLICK_BLANK" + " title is : " + (objects.length == 0 ? "" : objects[0]) + " url is : " + url + " screen is : " + screen);
                     break;
                 default:
-                    Log.i("Buried_Point", "unknow");
+                    Log.i("USER_EVENT", "unknow");
                     break;
             }
         }

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -52,8 +52,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="8dp"
-                android:text="Auto tiny window"
-                android:visibility="gone" />
+                android:text="Auto tiny window" />
 
             <Button
                 android:id="@+id/play_directly_without_layout"

diff --git a/app/src/main/res/layout/layout_standard_with_share_button.xml b/app/src/main/res/layout/layout_standard_with_share_button.xml
@@ -19,20 +19,6 @@
         android:layout_height="match_parent"
         android:layout_centerInParent="true" />
 
-    <RelativeLayout
-        android:id="@+id/cache_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center">
-
-        <fm.jiecao.jcvideoplayer_lib.JCResizeImageView
-            android:id="@+id/cache"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_centerInParent="true" />
-
-    </RelativeLayout>
-
     <ImageView
         android:id="@+id/cover"
         android:layout_width="wrap_content"

diff --git a/gradle/maven_push.gradle b/gradle/maven_push.gradle
@@ -22,7 +22,7 @@ signing {
 
 group = "fm.jiecao"
 archivesBaseName = "jiecaovideoplayer"
-version = "4.8.2"
+version = "4.8.3"
 
 uploadArchives {
     repositories {

diff --git a/jcvideoplayer-lib/build.gradle b/jcvideoplayer-lib/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 24
-        versionCode 46
-        versionName "4.8.2"
+        versionCode 47
+        versionName "4.8.3"
     }
     buildTypes {
         release {
@@ -27,15 +27,15 @@ dependencies {
     compile 'com.android.support:appcompat-v7:24.1.1'
 
     //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'
+    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.4'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.4'
     //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'
+//    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.4'
+    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.4'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.4'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.4'
     //ExoPlayer as IMediaPlayer: optional, experimental
-    //compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.6.0'
+    //compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.4'
 }
 
 apply from: '../gradle/maven_push.gradle'
diff --git a/jcvideoplayer-lib/src/main/AndroidManifest.xml b/jcvideoplayer-lib/src/main/AndroidManifest.xml
@@ -4,8 +4,7 @@
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    <uses-sdk tools:overrideLibrary="com.example.ijkplayer_x86_64,
-     tv.danmaku.ijk.media.player_arm64" />
+    <uses-sdk tools:overrideLibrary="tv.danmaku.ijk.media.player_arm64,tv.danmaku.ijk.media.player_x86_64" />
     <application
         android:allowBackup="true"
         android:supportsRtl="true"></application>

diff --git a/...ecao/jcvideoplayer_lib/JCBuriedPoint.java → ...iecao/jcvideoplayer_lib/JCUserAction.java b/...ecao/jcvideoplayer_lib/JCBuriedPoint.java → ...iecao/jcvideoplayer_lib/JCUserAction.java
@@ -4,7 +4,7 @@
  * Created by Nathen
  * On 2016/04/04 22:13
  */
-public interface JCBuriedPoint {
+public interface JCUserAction {
 
     int ON_CLICK_START_ICON = 0;
     int ON_CLICK_START_ERROR = 1;

diff --git a/...ideoplayer_lib/JCBuriedPointStandard.java → ...videoplayer_lib/JCUserActionStandard.java b/...ideoplayer_lib/JCBuriedPointStandard.java → ...videoplayer_lib/JCUserActionStandard.java
@@ -4,7 +4,7 @@
  * Created by Nathen
  * On 2016/04/26 20:53
  */
-public interface JCBuriedPointStandard extends JCBuriedPoint {
+public interface JCUserActionStandard extends JCUserAction {
 
     int ON_CLICK_START_THUMB = 101;
     int ON_CLICK_BLANK = 102;

diff --git a/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java b/jcvideoplayer-lib/src/main/java/fm/jiecao/jcvideoplayer_lib/JCUtils.java
@@ -3,7 +3,6 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.ContextWrapper;
-import android.content.pm.ActivityInfo;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.support.v7.app.AppCompatActivity;