From a71e8824ce7d21c53a9b8b84fc5ca108c9ca330c Mon Sep 17 00:00:00 2001 From: lyr <15622190878@163.com> Date: Thu, 1 Jul 2021 11:04:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5.0.0-?= =?UTF-8?q?=E6=96=B0=E7=A4=BE=E5=8C=BA=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=880629=20=E4=BA=A7=E5=93=81=E6=B5=8B=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98=2015-17=EF=BC=89https://git.ghzs.com/pm/halo-app-issu?= =?UTF-8?q?es/-/issues/1253#note=5F106052?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/ForumArticleAskListFragment.kt | 2 +- .../forum/detail/ForumDetailFragment.kt | 21 ++++++++++--------- .../forum/home/ArticleItemVideoView.kt | 10 +++++++++ .../home/ForumArticleAskItemViewHolder.kt | 2 +- .../forum/home/ForumArticleListFragment.kt | 2 +- .../personalhome/home/UserHistoryFragment.kt | 2 +- .../gh/gamecenter/qa/entity/ArticleEntity.kt | 1 + 7 files changed, 26 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt index 91230bdc0d..b335805587 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListFragment.kt @@ -78,7 +78,7 @@ class ForumArticleAskListFragment : ListFragment { - @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1) - override fun onFirst(first: Bitmap) { - var blurBitmap = BitmapUtils.doBlur(first, 100) - runOnUiThread { - mBinding.forumDefaultBackground.setImageBitmap(blurBitmap) - } - } + ImageUtils.getBitmap(if (type == "official_bbs") icon else game.getIcon(), + object : BiCallback { + @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1) + override fun onFirst(first: Bitmap) { + var blurBitmap = BitmapUtils.doBlur(first, 100) + runOnUiThread { + mBinding.forumDefaultBackground.setImageBitmap(blurBitmap) + } + } - override fun onSecond(second: Boolean) {} - }) + override fun onSecond(second: Boolean) {} + }) } else { ImageUtils.display(mBinding.forumBackground, background) } diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt index 884e619c80..2c28979e0d 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ArticleItemVideoView.kt @@ -38,6 +38,7 @@ class ArticleItemVideoView @JvmOverloads constructor(context: Context, attrs: At var remainingTv: TextView = findViewById(R.id.remainingTv) var back: ImageView = findViewById(R.id.back) var pendingView: TextView = findViewById(R.id.pendingView) + var titleTv: TextView = findViewById(R.id.title) override fun getLayoutId(): Int { return R.layout.layout_article_item_video @@ -66,6 +67,10 @@ class ArticleItemVideoView @JvmOverloads constructor(context: Context, attrs: At fun startPlayLogic(isAutoPlay: Boolean) { mIsAutoPlay = isAutoPlay +// if (mIsAutoPlay) { +// val seekTime = ForumScrollCalculatorHelper.getPlaySchedule(MD5Utils.getContentMD5(mVideoEntity?.url)) +// seekOnStart = seekTime +// } startPlayLogic() } @@ -182,11 +187,15 @@ class ArticleItemVideoView @JvmOverloads constructor(context: Context, attrs: At private fun showBackBtn() { mTopContainer.background = ContextCompat.getDrawable(context, R.drawable.video_title_bg) back.visibility = View.VISIBLE + mVideoEntity?.run { + titleTv.text = title + } } private fun hideBackBtn() { mTopContainer?.setBackgroundResource(0) back.visibility = View.GONE + titleTv.text = "" } fun updateThumb(url: String) { @@ -199,6 +208,7 @@ class ArticleItemVideoView @JvmOverloads constructor(context: Context, attrs: At fun updateVideoData(video: ForumVideoEntity) { mVideoEntity = video + titleTv.text = if (mIfCurrentIsFullscreen) video.title else "" } override fun setViewShowState(view: View?, visibility: Int) { diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt index a35cd781a7..77c31c58f6 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt @@ -56,7 +56,7 @@ class ForumArticleAskItemViewHolder(val binding: CommunityAnswerItemBinding) : B binding.content.visibility = View.VISIBLE } //若文章内有图片和视频,标题后增加‘有视频’标签 issues-1052 - if (entity.getPassVideos().isNotEmpty() && entity.images.isNotEmpty()) { + if (entity.getPassVideos().isNotEmpty()) { val videoSpan = SpanBuilder(" ").image(1, " ".length, R.drawable.ic_article_video_label).build() binding.title.text = SpannableStringBuilder() .append(entity.questions.title) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt index f2ebe9700c..845cd2b3c1 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListFragment.kt @@ -83,7 +83,7 @@ class ForumArticleListFragment : LazyListFragment