1.修改专区热门回答图片被裁剪的问题
2.修改游戏搜索求功能标签显示问题
This commit is contained in:
@ -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
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -299,7 +299,9 @@ class SearchGameResultFragment : ListFragment<GameEntity, NormalListViewModel<Ga
|
||||
override fun onPause() {
|
||||
super.onPause()
|
||||
DownloadManager.getInstance(context).removeObserver(dataWatcher)
|
||||
showCloseMenuView()
|
||||
if (mOpenMenuContainer.visibility == View.VISIBLE){
|
||||
showCloseMenuView()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onLoadEmpty() {
|
||||
|
||||
Reference in New Issue
Block a user