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" /> -