Ver Fonte

修改版本号

yangchong211 há 6 anos atrás
pai
commit
7e4e349e30

BIN
.idea/caches/build_file_checksums.ser


+ 1 - 1
.idea/misc.xml

@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 3 - 1
README.md

@@ -84,8 +84,9 @@
 
 ### 2.使用方法介绍
 #### 2.1 关于gradle引用说明
+- 如下所示
     ```
-    compile 'cn.yc:YCVideoPlayerLib:2.6.1'
+    compile 'cn.yc:YCVideoPlayerLib:2.6.2'
     ```
 
 #### 2.2 添加布局
@@ -100,6 +101,7 @@
 
 
 #### 2.3 最简单的视频播放器参数设定
+- 如下所示
     ```
     //设置播放类型
     // IjkPlayer or MediaPlayer

+ 3 - 3
YCVideoPlayerLib/build.gradle

@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 16
-        versionName "2.6.2"
+        versionCode 17
+        versionName "2.6.3"
     }
 
     buildTypes {
@@ -48,7 +48,7 @@ group = "cn.yc"
 //发布到JCenter上的项目名字,必须填写
 def libName = "YCVideoPlayerLib"
 // 版本号,下次更新是只需要更改版本号即可
-version = "2.6.2"
+version = "2.6.3"
 /**  上面配置后上传至jcenter后的编译路径是这样的: compile 'cn.yc:YCVideoPlayerLib:2.4'  **/
 
 //生成源文件

+ 8 - 17
YCVideoPlayerLib/src/main/java/org/yczbj/ycvideoplayerlib/player/VideoPlayer.java

@@ -640,46 +640,37 @@ public class VideoPlayer extends FrameLayout implements InterVideoPlayer {
     @RequiresApi(api = Build.VERSION_CODES.ICE_CREAM_SANDWICH)
     private void initTextureView() {
         if (mTextureView == null) {
-            mTextureView = VideoTextureView.addTextureView(mContext, new OnSurfaceListener() {
-                /**
-                 * SurfaceTexture准备就绪
-                 */
-                @RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
+            mTextureView = new VideoTextureView(mContext);
+            mTextureView.setOnSurfaceListener(new OnSurfaceListener() {
                 @Override
                 public void onSurfaceAvailable(SurfaceTexture surface) {
                     if (mSurfaceTexture == null) {
                         mSurfaceTexture = surface;
                         openMediaPlayer();
                     } else {
-                        mTextureView.setSurfaceTexture(mSurfaceTexture);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                            mTextureView.setSurfaceTexture(mSurfaceTexture);
+                        }
                     }
                 }
 
-                /**
-                 * SurfaceTexture缓冲大小变化
-                 */
                 @Override
                 public void onSurfaceSizeChanged(SurfaceTexture surface, int width, int height) {
 
                 }
 
-                /**
-                 * SurfaceTexture即将被销毁
-                 */
                 @Override
                 public boolean onSurfaceDestroyed(SurfaceTexture surface) {
-                    return false;
+                    return mSurfaceTexture == null;
                 }
 
-                /**
-                 * SurfaceTexture通过updateImage更新
-                 */
                 @Override
                 public void onSurfaceUpdated(SurfaceTexture surface) {
 
                 }
-            },mContainer);
+            });
         }
+        mTextureView.addTextureView(mContainer,mTextureView);
     }
 
 

+ 7 - 13
YCVideoPlayerLib/src/main/java/org/yczbj/ycvideoplayerlib/view/VideoTextureView.java

@@ -109,26 +109,20 @@ public class VideoTextureView extends TextureView implements TextureView.Surface
 
     /**
      * 添加TextureView到视图中
-     * @param context                   上下文
-     * @param listener                  listener监听
-     * @param frameLayout               父布局
-     * @return                          VideoTextureView
+     * @param frameLayout               布局
+     * @param textureView               textureView
      */
-    public static VideoTextureView addTextureView(Context context , OnSurfaceListener listener ,
-                                                  FrameLayout frameLayout){
-        VideoTextureView videoTextureView = new VideoTextureView(context);
-        videoTextureView.setOnSurfaceListener(listener);
+    public void addTextureView(FrameLayout frameLayout , VideoTextureView textureView){
+        frameLayout.removeView(textureView);
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
                 ViewGroup.LayoutParams.MATCH_PARENT,
                 ViewGroup.LayoutParams.MATCH_PARENT, Gravity.CENTER);
-        //防止多次添加,所以每次先移除,后添加
-        frameLayout.removeView(videoTextureView);
-        //添加到视图中
-        frameLayout.addView(videoTextureView, 0, params);
-        return videoTextureView;
+        frameLayout.addView(textureView, 0, params);
     }
 
 
+
+
     /**
      * 自定义video大小
      * @param videoWidth                宽

+ 2 - 2
app/build.gradle

@@ -85,7 +85,7 @@ dependencies {
     compile 'cn.yc:YCBaseAdapterLib:1.3'                            //adapter封装
     compile 'cn.yc:YCDialogLib:3.5'                                 //弹窗
     compile 'cn.yc:YCProgressLib:1.2'                               //进度条
-    compile 'cn.yc:YCVideoPlayerLib:2.6.2'                            //播放器
-//    compile project(':YCVideoPlayerLib')
+//    compile 'cn.yc:YCVideoPlayerLib:2.6.2'                            //播放器
+    compile project(':YCVideoPlayerLib')
     compile 'cn.yc:YCStatusBarLib:1.4.0'                              //状态栏
 }

+ 0 - 28
app/src/main/java/org/yczbj/ycvideoplayer/ui/person/TestFiveVideoActivity.java

@@ -65,34 +65,6 @@ public class TestFiveVideoActivity extends BaseActivity implements View.OnClickL
                 .placeholder(R.drawable.image_default)
                 .crossFade()
                 .into(controller.imageView());
-        controller.setTopVisibility(true);
-        controller.setOnVideoControlListener(new OnVideoControlListener() {
-            @Override
-            public void onVideoControlClick(int type) {
-                switch (type){
-                    case ConstantKeys.VideoControl.DOWNLOAD:
-                        ToastUtils.showShort("下载");
-                        break;
-                    case ConstantKeys.VideoControl.AUDIO:
-                        ToastUtils.showShort("转音频");
-                        break;
-                    case ConstantKeys.VideoControl.SHARE:
-                        ToastUtils.showShort("分享");
-                        break;
-                    case ConstantKeys.VideoControl.MENU:
-                        ToastUtils.showShort("更多");
-                        break;
-                    case ConstantKeys.VideoControl.TV:
-                        ToastUtils.showShort("tv投影");
-                        break;
-                    case ConstantKeys.VideoControl.HOR_AUDIO:
-                        ToastUtils.showShort("下载");
-                        break;
-                    default:
-                        break;
-                }
-            }
-        });
         mVideoPlayer.setController(controller);
     }