From 94c49cba8b75e8fae561ef4e5c52760c756fd57f Mon Sep 17 00:00:00 2001
From: kehaoyuan <kehaoyuan@ghzhushou.com>
Date: Fri, 17 Jul 2020 17:13:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A3=81=E5=89=AA=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E5=9B=BE=E7=89=87=E8=BF=87=E5=A4=A7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/gh/common/view/CropImageZoomView.java    | 11 +++++++++--
 .../com/gh/gamecenter/video/VideoEditorActivity.kt    |  7 +++++--
 app/src/main/res/layout/activity_video_editor.xml     |  7 +++----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/gh/common/view/CropImageZoomView.java b/app/src/main/java/com/gh/common/view/CropImageZoomView.java
index 43d336c4a7..84a5ee1057 100644
--- a/app/src/main/java/com/gh/common/view/CropImageZoomView.java
+++ b/app/src/main/java/com/gh/common/view/CropImageZoomView.java
@@ -318,11 +318,18 @@ public class CropImageZoomView extends AppCompatImageView implements
 
             if (dw <= getWidth() - mHorizontalPadding * 2
                     && dh <= getHeight() - mVerticalPadding * 2) {// 如果图片的高度<截图区高度，并且图片宽度<截图区宽度时
-                float scaleW = (getWidth() * 1.0f - mHorizontalPadding * 2)
-                        / dw;
+                float scaleW = (getWidth() * 1.0f - mHorizontalPadding * 2) / dw;
                 float scaleH = (getHeight() * 1.0f - mVerticalPadding * 2) / dh;
                 scale = Math.max(scaleW, scaleH);
             }
+
+            // 宽、高均超爱出截图区域
+            if (dw > getWidth() - mHorizontalPadding * 2 && dh > getHeight() - mVerticalPadding * 2) {
+                float scaleW = (getWidth() * 1.0f - mHorizontalPadding * 2) / dw;
+                float scaleH = (getHeight() * 1.0f - mVerticalPadding * 2) / dh;
+                scale = Math.max(scaleW, scaleH);
+            }
+
             initScale = scale;
             SCALE_MID = initScale * 2;
             SCALE_MAX = initScale * 4;
diff --git a/app/src/main/java/com/gh/gamecenter/video/VideoEditorActivity.kt b/app/src/main/java/com/gh/gamecenter/video/VideoEditorActivity.kt
index 2da64c3520..89193d2b83 100644
--- a/app/src/main/java/com/gh/gamecenter/video/VideoEditorActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/video/VideoEditorActivity.kt
@@ -4,9 +4,11 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.media.Image
 import android.media.MediaMetadataRetriever
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.view.MenuItem
 import android.view.ViewGroup
@@ -61,6 +63,7 @@ class VideoEditorActivity : ToolBarActivity() {
         mReviewAdapter = VideoReviewAdapter(this, mBinding)
         mBinding.review.layoutManager = FixLinearLayoutManager(this, LinearLayout.HORIZONTAL, false)
         mBinding.review.adapter = mReviewAdapter
+        mBinding.receiveIv.setCropRatio(9 / 16F)
     }
 
     override fun onDestroy() {
@@ -137,8 +140,8 @@ class VideoReviewAdapter(context: Context, val mBinding: ActivityVideoEditorBind
         val videoReview = videoReviewList.get(position)
         holder.iv.setImageBitmap(videoReview.thumbs)
         holder.iv.setOnClickListener {
-            mBinding.receiveIv.setImageBitmap(videoReview.thumbs)
-            mBinding.videoView.seekTo((videoReview.time/ 1000).toInt())
+            mBinding.receiveIv.setBitmap(videoReview.thumbs)
+            mBinding.videoView.seekTo((videoReview.time / 1000).toInt())
         }
     }
 
diff --git a/app/src/main/res/layout/activity_video_editor.xml b/app/src/main/res/layout/activity_video_editor.xml
index 562b2fe190..ce62fbd6a3 100644
--- a/app/src/main/res/layout/activity_video_editor.xml
+++ b/app/src/main/res/layout/activity_video_editor.xml
@@ -25,12 +25,11 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/video_view" />
 
-        <ImageView
+        <com.gh.common.view.CropImageCustom
             android:id="@+id/receiveIv"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="0dp"
-            android:layout_margin="30dp"
-            app:layout_constraintDimensionRatio="H,1:1"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/review" />