1.2.4

README.md

@@ -17,13 +17,13 @@
 <dependency>
   <groupId>com.shuyu</groupId>
   <artifactId>gsyVideoPlayer</artifactId>
-  <version>1.2.3</version>
+  <version>1.2.4</version>
   <type>pom</type>
 </dependency>
 ```
 
 ```
-compile 'com.shuyu:gsyVideoPlayer:1.2.3'
+compile 'com.shuyu:gsyVideoPlayer:1.2.4'
 ```
 
 ## 效果,录屏下的屏幕旋转和实际有些出入
@@ -43,6 +43,9 @@ compile 'com.shuyu:gsyVideoPlayer:1.2.3'
 * <h4>3、详情模式</h4>
 <img src="https://github.com/CarGuo/GSYVideoPlayer/blob/master/04.gif" width="240px" height="426px"/>
 
+### 1.2.4 兼容API修改只16,全屏动画兼容全API
+　
+
 ### 1.2.3 增加了X86类型的依赖，个人可根据爱好在APP的build里面添加自己要的支持类型
 
 arm64和-86_64的没有加入，如果需要自己添加即可，因为编译最低需要API21

app/src/main/java/com/example/gsyvideoplayer/DetailPlayer.java

 package com.example.gsyvideoplayer;
 
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.widget.NestedScrollView;
 import android.support.v7.app.AppCompatActivity;
-import android.transition.TransitionManager;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
@@ -14,6 +12,7 @@ import android.widget.RelativeLayout;
 import com.shuyu.gsyvideoplayer.GSYVideoPlayer;
 import com.shuyu.gsyvideoplayer.utils.OrientationUtils;
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
+import com.transitionseverywhere.TransitionManager;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -88,9 +87,9 @@ public class DetailPlayer extends AppCompatActivity {
 
     private void toFull() {
         isFull = true;
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            TransitionManager.beginDelayedTransition(activityDetailPlayer);
-        }
+
+        TransitionManager.beginDelayedTransition(activityDetailPlayer);
+
         setViewHeight(detailPlayer, ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT);
         resolveFullVideoUI();
@@ -104,9 +103,7 @@ public class DetailPlayer extends AppCompatActivity {
         new Handler().postDelayed(new Runnable() {
             @Override
             public void run() {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                    TransitionManager.beginDelayedTransition(activityDetailPlayer);
-                }
+                TransitionManager.beginDelayedTransition(activityDetailPlayer);
                 setViewHeight(detailPlayer, ViewGroup.LayoutParams.MATCH_PARENT,
                         (int) getResources().getDimension(R.dimen.post_media_height));
             }

dependencies.gradle

@@ -7,7 +7,7 @@ allprojects {
 ext {
     //Android
     androidBuildToolsVersion = "23.0.1"
-    androidMinSdkVersion = 19
+    androidMinSdkVersion = 16
     androidTargetSdkVersion = 22
     androidCompileSdkVersion = 22
     supportLibraryVersion = '24.2.0'
@@ -16,10 +16,10 @@ ext {
     //ViewLibraries
     butterKnifeVersion = '8.2.1'
 
-    //ViewLibraries
-    butterKnifeVersion = '8.2.1'
     ijkplayer = '0.7.4'
 
+    transitionseverywhere = '1.7.0'
+
     //DataLibraries
     videocache = '2.6.3'
 
@@ -32,15 +32,16 @@ ext {
     ]
 
     viewDependencies = [
-            butterKnife     : "com.jakewharton:butterknife:${butterKnifeVersion}",
-            apt_butterKnife : "com.jakewharton:butterknife-compiler:${butterKnifeVersion}",
-            ijkplayer_java  : "tv.danmaku.ijk.media:ijkplayer-java:${ijkplayer}",
-            ijkplayer_armv7a: "tv.danmaku.ijk.media:ijkplayer-armv7a:${ijkplayer}",
-            ijkplayer_armv5 : "tv.danmaku.ijk.media:ijkplayer-armv5:${ijkplayer}",
-            ijkplayer_arm64 : "tv.danmaku.ijk.media:ijkplayer-arm64:${ijkplayer}",
-            ijkplayer_x86_64: "tv.danmaku.ijk.media:ijkplayer-x86_64:${ijkplayer}",
-            ijkplayer_x86   : "tv.danmaku.ijk.media:ijkplayer-x86:${ijkplayer}",
-            ijkplayer_exo   : "tv.danmaku.ijk.media:ijkplayer-exo:${ijkplayer}",
+            butterKnife          : "com.jakewharton:butterknife:${butterKnifeVersion}",
+            apt_butterKnife      : "com.jakewharton:butterknife-compiler:${butterKnifeVersion}",
+            ijkplayer_java       : "tv.danmaku.ijk.media:ijkplayer-java:${ijkplayer}",
+            ijkplayer_armv7a     : "tv.danmaku.ijk.media:ijkplayer-armv7a:${ijkplayer}",
+            ijkplayer_armv5      : "tv.danmaku.ijk.media:ijkplayer-armv5:${ijkplayer}",
+            ijkplayer_arm64      : "tv.danmaku.ijk.media:ijkplayer-arm64:${ijkplayer}",
+            ijkplayer_x86_64     : "tv.danmaku.ijk.media:ijkplayer-x86_64:${ijkplayer}",
+            ijkplayer_x86        : "tv.danmaku.ijk.media:ijkplayer-x86:${ijkplayer}",
+            ijkplayer_exo        : "tv.danmaku.ijk.media:ijkplayer-exo:${ijkplayer}",
+            transitionseverywhere: "com.andkulikov:transitionseverywhere:${transitionseverywhere}",
     ]
 
     dataDependencies = [

gradle.properties

@@ -18,7 +18,7 @@ org.gradle.jvmargs=-Xmx1536m
 BINTRAY_USER=
 BINTRAY_KEY=
 PROJ_GROUP=com.shuyu
-PROJ_VERSION=1.2.3
+PROJ_VERSION=1.2.4
 PROJ_NAME=gsyVideo
 PROJ_WEBSITEURL=hhttps://github.com/CarGuo/GSYVideoPlayer
 PROJ_ISSUETRACKERURL=

gsyVideoPlayer/build.gradle

@@ -32,9 +32,10 @@ dependencies {
     compile viewDependencies.ijkplayer_armv5
     compile viewDependencies.ijkplayer_x86
     compile viewDependencies.ijkplayer_exo
+    compile viewDependencies.transitionseverywhere
     compile dataDependencies.videocache
     compile androidDependencies.support_v4
     compile androidDependencies.appcompat_v7
 }
 
-//apply from: '../bintray.gradle'
+apply from: '../bintray.gradle'

gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/utils/ListVideoUtil.java

@@ -4,21 +4,18 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Point;
-import android.os.Build;
 import android.os.Handler;
-import android.transition.TransitionManager;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.shuyu.gsyvideoplayer.GSYVideoManager;
 import com.shuyu.gsyvideoplayer.GSYVideoPlayer;
 import com.shuyu.gsyvideoplayer.R;
 import com.shuyu.gsyvideoplayer.listener.StandardVideoAllCallBack;
-import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack;
 import com.shuyu.gsyvideoplayer.video.GSYBaseVideoPlayer;
 import com.shuyu.gsyvideoplayer.video.StandardGSYVideoPlayer;
+import com.transitionseverywhere.TransitionManager;
 
 import static com.shuyu.gsyvideoplayer.utils.CommonUtil.getActionBarHeight;
 import static com.shuyu.gsyvideoplayer.utils.CommonUtil.getStatusBarHeight;
@@ -60,8 +57,6 @@ public class ListVideoUtil {
     public ListVideoUtil(Context context) {
         gsyVideoPlayer = new StandardGSYVideoPlayer(context);
         this.context = context;
-        int smallVideoWidth = CommonUtil.getScreenWidth(context) / 2 - CommonUtil.dip2px(context, 20);
-        int smallVideoHeight = smallVideoWidth * 3 / 4;
     }
 
     /**
@@ -172,7 +167,7 @@ public class ListVideoUtil {
                 resolveMaterialToNormal(gsyVideoPlayer);
             }
         });
-        if (showFullAnimation && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (showFullAnimation) {
             if (fullViewContainer instanceof FrameLayout) {
                 //目前只做了frameLoayout的判断
                 resolveMaterialAnimation();
@@ -267,7 +262,7 @@ public class ListVideoUtil {
      * 动画回到正常效果
      */
     private void resolveMaterialToNormal(final GSYVideoPlayer gsyVideoPlayer) {
-        if (showFullAnimation && fullViewContainer instanceof FrameLayout && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        if (showFullAnimation && fullViewContainer instanceof FrameLayout) {
             int delay = orientationUtils.backToProtVideo();
             handler.postDelayed(new Runnable() {
                 @Override

gsyVideoPlayer/src/main/java/com/shuyu/gsyvideoplayer/video/GSYBaseVideoPlayer.java

@@ -6,7 +6,6 @@ import android.graphics.Color;
 import android.graphics.Point;
 import android.os.Build;
 import android.os.Handler;
-import android.transition.TransitionManager;
 import android.util.AttributeSet;
 import android.view.Gravity;
 import android.view.View;
@@ -25,6 +24,7 @@ import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack;
 import com.shuyu.gsyvideoplayer.utils.CommonUtil;
 import com.shuyu.gsyvideoplayer.utils.Debuger;
 import com.shuyu.gsyvideoplayer.utils.OrientationUtils;
+import com.transitionseverywhere.TransitionManager;
 
 import java.lang.reflect.Constructor;
 import java.util.Map;
@@ -218,7 +218,7 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia
             FrameLayout frameLayout = new FrameLayout(context);
             frameLayout.setBackgroundColor(Color.BLACK);
 
-            if (mShowFullAnimation && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (mShowFullAnimation) {
                 FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(getWidth(), getHeight());
                 lp.setMargins(mListItemRect[0], mListItemRect[1], 0, 0);
                 frameLayout.addView(gsyVideoPlayer, lp);
@@ -291,7 +291,7 @@ public abstract class GSYBaseVideoPlayer extends FrameLayout implements GSYMedia
         final GSYVideoPlayer gsyVideoPlayer;
         if (oldF != null) {
             gsyVideoPlayer = (GSYVideoPlayer) oldF;
-            if (mShowFullAnimation && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            if (mShowFullAnimation) {
                 TransitionManager.beginDelayedTransition(vp);
 
                 FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) gsyVideoPlayer.getLayoutParams();