From 71c697d596fb49e0fe0a603673e8639d7932a6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Wed, 24 Mar 2021 10:08:07 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=93=E5=8C=BA=E7=83=AD?= =?UTF-8?q?=E9=97=A8=E5=9B=9E=E7=AD=94=E5=9B=BE=E7=89=87=E8=A2=AB=E8=A3=81?= =?UTF-8?q?=E5=89=AA=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E6=90=9C=E7=B4=A2=E6=B1=82=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/common/view/ImageContainerView.kt | 16 +++++++++++++--- .../com/gh/gamecenter/ImageViewerActivity.kt | 5 +++-- .../fuli/answer/GameDetailAnswerAdapter.kt | 1 + .../search/SearchGameResultFragment.kt | 4 +++- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/gh/common/view/ImageContainerView.kt b/app/src/main/java/com/gh/common/view/ImageContainerView.kt index ad20b33de1..b464df5bd3 100644 --- a/app/src/main/java/com/gh/common/view/ImageContainerView.kt +++ b/app/src/main/java/com/gh/common/view/ImageContainerView.kt @@ -39,6 +39,7 @@ class ImageContainerView : LinearLayout { //图片之间的间距 private val mItemSpace = 4f.dip2px() + private var mOffset = 0 private var index = 0 constructor(context: Context) : this(context, null) @@ -50,12 +51,21 @@ class ImageContainerView : LinearLayout { private fun initView(attrs: AttributeSet?) { orientation = HORIZONTAL val ta = context.obtainStyledAttributes(attrs, R.styleable.ImageContainerView) - val offset = ta.getDimensionPixelSize(R.styleable.ImageContainerView_offset, 0) - mDefaultWidth = (DisplayUtils.getScreenWidth() - offset.toFloat() - mItemSpace * 2) / 3 - mFixdWidth = (DisplayUtils.getScreenWidth() - offset.toFloat() - mItemSpace * 2) * 2 / 3 + mOffset = ta.getDimensionPixelSize(R.styleable.ImageContainerView_offset, 0) + calculateWidth() ta.recycle() } + private fun calculateWidth() { + mDefaultWidth = (DisplayUtils.getScreenWidth() - mOffset.toFloat() - mItemSpace * 2) / 3 + mFixdWidth = (DisplayUtils.getScreenWidth() - mOffset.toFloat() - mItemSpace * 2) * 2 / 3 + } + + fun setOffset(offset: Float) { + mOffset = offset.dip2px() + calculateWidth() + } + fun bindData(entity: AnswerEntity, entrance: String = "", path: String = "") { mAnswerEntity = entity mEntrance = entrance diff --git a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt index fd2bff8381..712ee47434 100644 --- a/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/ImageViewerActivity.kt @@ -195,8 +195,9 @@ class ImageViewerActivity : BaseActivity(), OnPageChangeListener { } mArticleDetailBtn.setOnClickListener { - val intent = ArticleDetailActivity.getIntent(this, CommunityEntity(mAnswerEntity?.communityId - ?: "", mAnswerEntity?.communityName ?: ""), mAnswerEntity?.id + val intent = ArticleDetailActivity.getIntent(this, CommunityEntity(if (!mAnswerEntity?.communityId.isNullOrEmpty()) mAnswerEntity?.communityId + ?: "" else mAnswerEntity?.articleCommunityId ?: "", mAnswerEntity?.communityName + ?: ""), mAnswerEntity?.id ?: "", mEntrance, "") startActivity(intent) finish() diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt index 3d9e2f8bd7..9d8c82f45a 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/answer/GameDetailAnswerAdapter.kt @@ -42,6 +42,7 @@ class GameDetailAnswerAdapter(context: Context, holder.binding.contentContainer.setPadding(DisplayUtils.dip2px(12f),0,DisplayUtils.dip2px(12f),0) holder.binding.topLine.visibleIf(position > 0) + holder.binding.imageContainer.setOffset(72f) val entity = mAnswerList[position] if ("community_article" == entity.type) { val questions = Questions() diff --git a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt index 5e33725e64..6c3a862e53 100644 --- a/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/search/SearchGameResultFragment.kt @@ -299,7 +299,9 @@ class SearchGameResultFragment : ListFragment