视频预览逻辑添加

韩亚云
1 parent 342d5129
Showing 5 changed files with 43 additions and 8 deletions
core/app_qr/src/main/java/com/cnlive/cloud/moudle/qr/uitl/ScanUtil.java
core/imageload/src/main/java/com/cnlive/core/imagepreview/ImageDrawee.java
core/imageload/src/main/java/com/cnlive/core/imagepreview/ImagePreView.java
core/imageload/src/main/java/com/cnlive/core/ui/activity/PreViewImageActivity.java
core/imageload/src/main/java/com/cnlive/core/ui/presenter/PreViewImagePresenter.java
+package com.cnlive.cloud.moudle.qr.uitl;
+
+import java.io.File;
+
+import cn.bertsir.zbar.utils.QRUtils;
+
+/**
+ * created by hanyayun
+ * on 2020/6/17
+ */
+public class ScanUtil {
+
+    public static String getRecode(File file){
+        try {
+            return QRUtils.getInstance().decodeQRcode(file.getAbsolutePath());
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "";
+    }
+}
@@ -32,17 +32,20 @@ public class ImageDrawee extends FrameLayout {
     private ProgressUI progressUI;
     private ViewData viewData;
  
-    public ImageDrawee(@NonNull Context context,ViewData viewData) {
+    public ImageDrawee(@NonNull Context context,ViewData viewData,CNVideoView videoView) {
         super(context);
         this.viewData = viewData;
-        init();
+        init(videoView);
     }
  
-    private void init() {
+    private void init(CNVideoView videoView) {
         // 添加 imageView
         if(viewData.getType() == 1){
             imageView = new PhotoView(getContext());
             addView(imageView);
+        }else {
+            removeAllViews();
+            addView(videoView);
         }
     }
  
@@ -376,6 +376,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
      * 取消浏览
      */
     public void cancel() {
+        videoView.release();
         videoView.onDestroy();
         cancel(null);
     }
@@ -386,6 +387,11 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
      * @param callback 退场动画执行回调
      */
     public void cancel(final ImageTransfer.OnTransCallback callback) {
+        if(getCurrentItem().getImageView() == null) {
+            playEnterAnim = false;
+            playExitAnim = false;
+            draggable = false;
+        }
         if (indexUI != null) {
             indexUI.hide();
         }
@@ -443,9 +449,8 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
             }
         }
         if (drawee == null) {
-            drawee = new ImageDrawee(container.getContext(),mSourceList.get(position));
+            drawee = new ImageDrawee(container.getContext(),mSourceList.get(position),videoView);
             drawee.setProgressUI(progressUI);
-            if(mSourceList.get(position).getType() == 2)drawee.addView(videoView);
             mViewBox.add(drawee);
         }
         container.addView(drawee);
@@ -711,6 +716,7 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
  
     @Override
     public boolean onTouchEvent(MotionEvent event) {
+        if(getCurrentItem().getImageView() == null) return false;
         int action = event.getAction() & event.getActionMasked();
         if (action == MotionEvent.ACTION_MOVE) {
             if (draggable && isDragging && mDragHandler != null) {
@@ -797,6 +803,11 @@ public class ImagePreView extends FrameLayout implements ViewPager.OnPageChangeL
                     // 消费返回键点击事件，不传递出去
                     return true;
                 }
+                if(getCurrentItem().getImageView() == null){
+                    cancel();
+                    // 消费返回键点击事件，不传递出去
+                    return true;
+                }
             }
         }
         return super.onKeyDown(keyCode, event);
@@ -8,7 +8,6 @@ import android.widget.ImageView;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.cnlive.core.imageload.R;
 import com.cnlive.core.imageload.databinding.ActivityPreviewImageBinding;
-import com.cnlive.core.imagepreview.ViewerStatus;
 import com.cnlive.core.imagepreview.listener.OnItemClickListener;
 import com.cnlive.core.libs.base.frame.activity.BaseActivity;
 import com.cnlive.core.ui.model.PreViewImgData;
@@ -71,7 +70,7 @@ public class PreViewImageActivity extends BaseActivity&lt;PreViewImageView, PreView
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if(binding.imagePre != null && binding.imagePre.getViewStatus() == ViewerStatus.STATUS_WATCHING){
+        if(binding.imagePre != null){
             binding.imagePre.cancel();
         }
     }
@@ -12,6 +12,7 @@ import android.util.Log;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.FutureTarget;
 import com.bumptech.glide.request.target.Target;
+import com.cnlive.cloud.moudle.qr.uitl.ScanUtil;
 import com.cnlive.core.imageload.api.ApiServiceStock;
 import com.cnlive.core.libs.base.application.AppConfig;
 import com.cnlive.core.libs.base.frame.presenter.BasePresenter;
@@ -278,7 +279,7 @@ public class PreViewImagePresenter extends BasePresenter&lt;PreViewImageView&gt; {
                 File scanFile = getFile(emitter, imgUrl, activity);
                 if (scanFile != null && FileUtils.isFileExists(scanFile) && scanFile.length() > 0) {
                     String content = null;
-                    content = QRUtils.getInstance().decodeQRcode(scanFile.getAbsolutePath());
+                    content = ScanUtil.getRecode(scanFile);//QRUtils.getInstance().decodeQRcode(scanFile.getAbsolutePath());
                     if (TextUtils.isEmpty(scanFile.getAbsolutePath())) {
                         content = QRUtils.getInstance().decodeQRcodeByZxing(scanFile.getAbsolutePath());
                     }