Ling0925
/
TiebaLite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 数据异常时闪退

This commit is contained in:
HuanCheng65 2024-02-02 14:16:48 +08:00
parent 26d85c7577
commit dd151775d1
No known key found for this signature in database
GPG Key ID: 5EC9DD60A32C7360
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/huanchengfly/tieba/post/arch/BaseComposeActivity.kt
View File

@ -44,7 +44,9 @@ abstract class BaseComposeActivityWithData<DATA> : BaseComposeActivity() {
@Composable @Composable
final override fun Content() { final override fun Content() {
Content(data!!) data?.let { data ->
Content(data)
}
} }
@Composable @Composable

11
app/src/main/java/com/huanchengfly/tieba/post/ui/page/subposts/SubPostsPage.kt
View File

@ -540,14 +540,11 @@ private fun getDescText(
time: Long?, time: Long?,
ipAddress: String? ipAddress: String?
): String { ): String {
val texts = mutableListOf<String>() val texts = listOfNotNull(
if (time != null) texts.add(DateTimeUtils.getRelativeTimeString(App.INSTANCE, time)) time?.let { DateTimeUtils.getRelativeTimeString(App.INSTANCE, it) },
if (!ipAddress.isNullOrEmpty()) texts.add( ipAddress?.let { App.INSTANCE.getString(R.string.text_ip_location, it) }
App.INSTANCE.getString(
R.string.text_ip_location,
"$ipAddress"
)
) )
if (texts.isEmpty()) return ""
return texts.joinToString(" ") return texts.joinToString(" ")
} }

16
app/src/main/java/com/huanchengfly/tieba/post/ui/page/thread/ThreadPage.kt
View File

@ -187,16 +187,18 @@ private fun getDescText(
floor: Int, floor: Int,
ipAddress: String? ipAddress: String?
): String { ): String {
val texts = mutableListOf<String>() val texts = listOfNotNull(
if (time != null) texts.add(getRelativeTimeString(App.INSTANCE, time)) time?.let { getRelativeTimeString(App.INSTANCE, it) },
if (floor > 1) texts.add(App.INSTANCE.getString(R.string.tip_post_floor, floor)) if (floor > 1) App.INSTANCE.getString(R.string.tip_post_floor, floor) else null,
if (!ipAddress.isNullOrEmpty()) texts.add( if (ipAddress.isNullOrEmpty()) null else App.INSTANCE.getString(
App.INSTANCE.getString(
R.string.text_ip_location, R.string.text_ip_location,
"$ipAddress" ipAddress
) )
) )
return texts.joinToString(" ") if (texts.isEmpty()) {
return ""
}
return texts.joinToString(" · ")
} }
@Composable @Composable