视频预览测试优化

韩亚云
1 parent af53ca93
Showing 5 changed files with 33 additions and 15 deletions
cloud/video/src/main/java/com/libs/video/video/exoplayer/play/CNVideoView.java
core/app_qr/build.gradle
core/imageload/src/main/java/com/cnlive/core/imagepreview/ImagePreView.java
core/imageload/src/main/java/com/cnlive/core/imagepreview/listener/OnItemLongPressListener.java
core/imageload/src/main/java/com/cnlive/core/ui/view/PreViewImageView.java
@@ -12,6 +12,7 @@ import android.os.Build;
 import android.os.Parcelable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
@@ -205,6 +206,7 @@ public class CNVideoView&lt;P extends AbstractPlayer&gt; extends FrameLayout
      */
     @Override
     public void start() {
+        Log.e("ssss", "startPlay: ");
         boolean isStarted = false;
         if (isInIdleState() || isInStartAbortState()) {
             isStarted = startPlay();
@@ -5,14 +5,15 @@ android {
 //    buildToolsVersion "29.0.2"
 //
 //
-//    defaultConfig {
-//        minSdkVersion 16
-//        targetSdkVersion 29
-//        versionCode 1
-//        versionName "1.0"
-//        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-//        consumerProguardFiles 'consumer-rules.pro'
-//    }
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+        ndk {
+            abiFilters "armeabi-v7a"  // 指定要ndk需要兼容的架构(这样其他依赖包里mips,x86,armeabi,arm-v8之类的so会被过滤掉)
+        }
+    }
  
     buildTypes {
         release {
@@ -172,11 +172,13 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
     }
  
     private void startPlay(int position) {
+        Log.e(TAG, "startPlay: release");
         videoView.release();
         PlayerUtils.removeViewFormParent(videoView);
         if(mSourceList.get(position).getType() == 1){
  
-        }else if(mSourceList.get(position).getType() == 2){
+        }else if(mSourceList.get(position).getType() == 2 && getCurrentItem().getImageView() == null){
+            Log.e(TAG, "startPlay: "+position);
             getCurrentItem().removeAllViews();
             getCurrentItem().addView(videoView);
             videoView.setUrl("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
@@ -192,7 +194,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
         }
         for (int i = 0, len = list.size(); i < len; i++) {
             ViewData vd = new ViewData(list.get(i));
-            if (i == 0){
+            if (i == 0 || i == 2){
                 vd.setType(2);
             }else {
                 vd.setType(1);
@@ -565,11 +567,24 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
                 }
             });
         }else if(mSourceList.get(position).getType() == 2){
+            if(drawee.getImageView() == null){
+                videoView.setOnLongClickListener(new OnLongClickListener() {
+                    @Override
+                    public boolean onLongClick(View view) {
+                        if (!hasAnimRunning && mItemLongPressListener != null) {
+                            return mItemLongPressListener.onItemLongPress(position, videoView);
+                        }
+                        return false;
+                    }
+                });
+            }
             playEnterAnim = false;
             playExitAnim = false;
             draggable = false;
-            videoView.setUrl("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
-            videoView.start();
+            if(position == 0){
+                videoView.setUrl("http://ffyl.vods2.cnlive.com/223/vod/2018/1120/223_88c98ab1395f4762b703fbdd9d59d2e5/ff80808166c2a45201672f14a9933131_800.m3u8");
+                videoView.start();
+            }
         }
     }
  
 package com.cnlive.core.imagepreview.listener;
  
-import android.widget.ImageView;
+import android.view.View;
  
 /**
  * 图片长按
@@ -9,5 +9,5 @@ import android.widget.ImageView;
  */
 public interface OnItemLongPressListener {
  
-    boolean onItemLongPress(int position, ImageView imageView);
+    boolean onItemLongPress(int position, View imageView);
 }
@@ -132,7 +132,7 @@ public class PreViewImageView extends BaseView {
         activity.binding.imagePre.watch(activity.position);
         activity.binding.imagePre.setOnItemLongPressListener(new OnItemLongPressListener() {
             @Override
-            public boolean onItemLongPress(int position, ImageView imageView) {
+            public boolean onItemLongPress(int position, View imageView) {
                 if(activity.data.isShowDialog()){
                     activity.requestPermission(String.valueOf(R.string.dialog_imagepicker_permission_save_pic),new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, new OnPermissionResponseListener() {
                         @Override