Parcourir la source

调整部分按钮显示效果

bjb il y a 3 mois
Parent
commit
821deaeb56

+ 1 - 1
app/src/main/java/com/iscs/bozzys/ui/pages/compose/JobListItem.kt

@@ -84,7 +84,7 @@ fun JobListItem(job: Job) {
                 // 当前任务号
                 Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
                     Icon(
-                        painterResource(R.drawable.jobs), contentDescription = null, modifier = Modifier
+                        painterResource(R.drawable.number), contentDescription = null, modifier = Modifier
                             .padding(end = 5.dp)
                             .size(13.dp),
                         tint = Color(0xFF666666)

+ 2 - 2
app/src/main/java/com/iscs/bozzys/ui/pages/compose/TaskListItem.kt

@@ -74,7 +74,7 @@ fun TaskListItem(task: Task) {
                 // 当前任务号
                 Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
                     Icon(
-                        painterResource(R.drawable.jobs), contentDescription = null, modifier = Modifier
+                        painterResource(R.drawable.number), contentDescription = null, modifier = Modifier
                             .padding(end = 5.dp)
                             .size(13.dp),
                         tint = Color(0xFF666666)
@@ -106,7 +106,7 @@ fun TaskListItem(task: Task) {
             // 任务状态
             Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
                 Icon(
-                    painterResource(R.drawable.job_todo), contentDescription = null, modifier = Modifier
+                    painterResource(R.drawable.target), contentDescription = null, modifier = Modifier
                         .padding(end = 5.dp)
                         .size(13.dp),
                     tint = Color(0xFF666666)

+ 1 - 1
app/src/main/java/com/iscs/bozzys/ui/pages/detail/task/PageDetailTask.kt

@@ -96,7 +96,7 @@ class PageDetailTask : PageBase() {
             ) {
                 TaskInfo(task)
                 // 表单数据存在即显示
-                if (state.forms.isNotEmpty()) TaskForm(vm)
+                if (state.forms.isNotEmpty() && !listOf("isolation", "releaseIsolation", "returnLock").contains(state.node.type)) TaskForm(vm)
                 // 处理动态内容的条件,其实业务逻辑不应该在这里处理的
                 when (state.node.type) {
                     "isolation",                    // 隔离

+ 1 - 1
app/src/main/java/com/iscs/bozzys/ui/pages/home/HomeCompose.kt

@@ -133,7 +133,7 @@ private fun TopToolBar(pv: PaddingValues, vm: VMHome) {
                         .size(36.dp)
                         .clip(RoundedCornerShape(6.dp))
                         .clickable(onClick = { ctx.openPageMessage() })
-                        .padding(9.dp),
+                        .padding(5.dp),
                     tint = Color.White
                 )
                 if (state.msgCount > 0) Text(

+ 1 - 1
app/src/main/java/com/iscs/bozzys/ui/pages/home/JobsCompose.kt

@@ -119,7 +119,7 @@ private fun TopToolBar(pv: PaddingValues, vm: VMHome) {
                             // 测试发布作业
                             // ctx.openPagePushJob(71)
                         })
-                        .padding(6.dp),
+                        .padding(5.dp),
                     tint = Color.White
                 )
             } else {