Merge branch 'hotfix-v5.5.4-454-crashes' into 'release'

修改sentry上一些闪退问题

See merge request halo/android/assistant-android!182
This commit is contained in:
陈君陶
2022-01-17 17:57:28 +08:00
3 changed files with 3 additions and 2 deletions

View File

@ -33,7 +33,7 @@ data class ArticleDetailEntity(
var tagActivityId: String = "",
@SerializedName("tag_activity_name")
var tagActivityName: String = "",
var type: String = "",
var type: String? = "",
@SerializedName("game")
var gameEntity: GameEntity? = null,
@SerializedName("choiceness_status")

View File

@ -109,6 +109,7 @@ class VideoCommentFragment : LazyListFragment<CommentItemData, VideoCommentViewM
}
fun startCommentActivity() {
if (!isSupportVisible) return
clickToastByStatus(mListViewModel.videoDetail?.status ?: "") {
mListViewModel.videoDetail?.let {
val intent = CommentActivity.getVideoCommentIntent(

View File

@ -149,7 +149,7 @@ class VideoDescTopViewHolder(
//若标题未超过一行或无描述内容、活动标签、原创标签,箭头不显示
val ellipsisCount =
binding.titleTv.layout.getEllipsisCount(binding.titleTv.lineCount - 1)
binding.titleTv.layout?.getEllipsisCount(binding.titleTv.lineCount - 1) ?: 0
binding.expandMoreIv.goneIf(entity.des.isEmpty() && entity.tagActivityName.isEmpty() && entity.original != "yes" && ellipsisCount == 0)
}
binding.expandMoreIv.setOnClickListener {