Austin/gkd
1
0
Fork 0
mirror of https://github.com/gkd-kit/gkd.git synced 2024-11-16 19:57:15 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

feat: 点击记录显示优化

Browse Source
This commit is contained in:
lisonge 2023-11-06 21:15:05 +08:00
parent c60ff673b6
commit ff9c70e9e2
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/li/songe/gkd/ui/ClickLogPage.kt
View File

@ -4,7 +4,6 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
@ -35,14 +34,12 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.window.Dialog import androidx.compose.ui.window.Dialog
import androidx.hilt.navigation.compose.hiltViewModel import androidx.hilt.navigation.compose.hiltViewModel
import com.blankj.utilcode.util.LogUtils
import com.ramcosta.composedestinations.annotation.Destination import com.ramcosta.composedestinations.annotation.Destination
import com.ramcosta.composedestinations.annotation.RootNavGraph import com.ramcosta.composedestinations.annotation.RootNavGraph
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
@ -119,11 +116,27 @@ fun ClickLogPage() {
Spacer(modifier = Modifier.width(10.dp)) Spacer(modifier = Modifier.width(10.dp))
Text( Text(
text = appInfoCache[triggerLog.appId]?.name ?: triggerLog.appId text = appInfoCache[triggerLog.appId]?.name ?: triggerLog.appId
?: "" ?: "null"
) )
} }
Spacer(modifier = Modifier.width(10.dp)) Spacer(modifier = Modifier.width(10.dp))
Text(text = triggerLog.activityId ?: "") val showActivityId = if (triggerLog.activityId != null) {
if (triggerLog.appId != null && triggerLog.activityId.startsWith(
triggerLog.appId
)
) {
triggerLog.activityId.substring(triggerLog.appId.length)
} else {
triggerLog.activityId
}
} else {
null
}
Text(
text = showActivityId ?: "null",
overflow = TextOverflow.Ellipsis,
maxLines = 1,
)
val group = vm.getGroup(triggerLog) val group = vm.getGroup(triggerLog)
if (group?.name != null) { if (group?.name != null) {
Spacer(modifier = Modifier.width(10.dp)) Spacer(modifier = Modifier.width(10.dp))
@ -136,6 +149,9 @@ fun ClickLogPage() {
if (rule?.name != null) { if (rule?.name != null) {
Spacer(modifier = Modifier.width(10.dp)) Spacer(modifier = Modifier.width(10.dp))
Text(text = rule.name) Text(text = rule.name)
} else if ((group?.rules?.size ?: 0) > 1) {
Spacer(modifier = Modifier.width(10.dp))
Text(text = (if (triggerLog.ruleKey != null) "key=${triggerLog.ruleKey}, " else "") + "index=${triggerLog.ruleIndex}")
} }
} }
Divider() Divider()