diff --git a/app/src/main/java/com/gh/common/util/ShareUtils.java b/app/src/main/java/com/gh/common/util/ShareUtils.java index 3405f64243..1da3681219 100644 --- a/app/src/main/java/com/gh/common/util/ShareUtils.java +++ b/app/src/main/java/com/gh/common/util/ShareUtils.java @@ -10,6 +10,7 @@ import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Matrix; +import android.media.ThumbnailUtils; import android.os.Bundle; import android.text.TextUtils; import android.view.Gravity; @@ -23,9 +24,6 @@ import android.widget.PopupWindow; import android.widget.RelativeLayout; import android.widget.TextView; -import androidx.recyclerview.widget.GridLayoutManager; -import androidx.recyclerview.widget.RecyclerView; - import com.facebook.common.references.CloseableReference; import com.facebook.datasource.DataSource; import com.facebook.imagepipeline.datasource.BaseBitmapDataSubscriber; @@ -52,6 +50,9 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + import static com.gh.common.util.GetLoginDataUtils.SCOPE; /** @@ -292,6 +293,12 @@ public class ShareUtils { ImageUtils.display(mContext, iconUrl, new BaseBitmapDataSubscriber() { @Override protected void onNewResultImpl(Bitmap bitmap) { + if (mShareType == ShareType.video) { + // 分享类型为视频时裁为正方形 + int dimension = Math.min(bitmap.getWidth(), bitmap.getHeight()); + bitmap = ThumbnailUtils.extractThumbnail(bitmap, dimension, dimension); + } + Bitmap compressBp = compressBitmap(bitmap); if (mShareType == ShareType.askNormal || mShareType == ShareType.askInvite) { msg.thumbData = ImageUtils.bmpToByteArray(compressBp, true); diff --git a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java index dc06cf5a40..eecf1f279c 100644 --- a/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java +++ b/app/src/main/java/com/gh/gamecenter/WeiBoShareActivity.java @@ -4,8 +4,8 @@ import android.app.Activity; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; +import android.media.ThumbnailUtils; import android.os.Bundle; -import androidx.annotation.NonNull; import com.facebook.common.references.CloseableReference; import com.facebook.datasource.DataSource; @@ -22,6 +22,8 @@ import com.sina.weibo.sdk.share.WbShareCallback; import com.sina.weibo.sdk.share.WbShareHandler; import com.sina.weibo.sdk.utils.Utility; +import androidx.annotation.NonNull; + /** * Created by khy on 2016/11/23. *
@@ -93,6 +95,10 @@ public class WeiBoShareActivity extends Activity implements WbShareCallback { if (ShareUtils.ShareType.askInvite.name().equals(mShareType) || ShareUtils.ShareType.askNormal.name().equals(mShareType)) { bgBitmap = compressBp; + } else if (ShareUtils.ShareType.video.name().equals(mShareType)) { + // 分享类型为视频时裁为正方形 + int dimension = Math.min(compressBp.getWidth(), compressBp.getHeight()); + bgBitmap = ThumbnailUtils.extractThumbnail(bitmap, dimension, dimension); } else { bgBitmap = ShareUtils.getInstance(getApplicationContext()).addBackGround(compressBp); } diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt index 4378ab2c59..65e780b79a 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/answer/detail/AnswerDetailFragment.kt @@ -1148,7 +1148,7 @@ class AnswerDetailFragment : NormalFragment() { @JavascriptInterface fun onVideoClick(content: String) { val videoEntity = GsonUtils.fromJson(content, MyVideoEntity::class.java) - DirectUtils.directToVideoDetail(requireContext(), videoEntity.id, videoEntity.id, false, mEntrance) + DirectUtils.directToVideoDetail(requireContext(), videoEntity.id, videoEntity.id, false, "回答详情-视频") } } diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt index 286fb5d9aa..ecc17db935 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/DetailPlayerView.kt @@ -94,9 +94,9 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib when (videoEntity.status) { "pass" -> { - val shareIcon = videoEntity.getThumb() + val shareIcon = videoEntity.poster - val shareSummary = "@" + videoEntity.user.name + "在光环助手发布了游戏小视频,快点开看看吧" + val shareSummary = "@" + videoEntity.user.name + " 在光环助手发布了游戏小视频,快点开看看吧" ShareUtils.getInstance(context).showShareWindows(context as Activity, (context as Activity).window.decorView, @@ -169,7 +169,6 @@ class DetailPlayerView @JvmOverloads constructor(context: Context, attrs: Attrib mRetry = true seekOnStart = mLastBufferPoint * mDuration / 100L startPlayLogic() - } if (mViewModel?.showComment == true) { diff --git a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt index d8be57f949..71ed2d0db9 100644 --- a/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/video/detail/VideoDetailContainerFragment.kt @@ -272,9 +272,9 @@ class VideoDetailContainerFragment : NormalFragment() { private fun share() { mViewModel.currentDisplayingVideo?.let { - val shareIcon = it.getThumb() + val shareIcon = it.poster - val shareSummary = "@" + it.user.name + "在光环助手发布了游戏小视频,快点开看看吧" + val shareSummary = "@" + it.user.name + " 在光环助手发布了游戏小视频,快点开看看吧" ShareUtils.getInstance(context).showShareWindows(activity, view, diff --git a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt index 41ca6ad6e3..5e6b718e12 100644 --- a/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/video/videomanager/VideoVerifyAdapter.kt @@ -60,7 +60,7 @@ class VideoVerifyAdapter(context: Context, } holder.itemView.setOnClickListener { - DirectUtils.directToVideoDetail(mContext, entity.id, VideoDetailContainerViewModel.Location.USER_UPLOADED_VIDEO.value, false, "(视频投稿)") + DirectUtils.directToVideoDetail(mContext, entity.id, VideoDetailContainerViewModel.Location.USER_UPLOADED_VIDEO.value, false, "视频投稿-已投稿") } } else if (holder is FooterViewHolder) { holder.initFooterViewHolder(mViewModel, mIsLoading, mIsNetworkError, mIsOver)