优化显示效果

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

@@ -84,7 +84,9 @@ fun JobListItem(job: Job) {
                 // 当前任务号
                 Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
                     Icon(
-                        painterResource(R.drawable.number), contentDescription = null, modifier = Modifier
+                        painterResource(R.drawable.number),
+                        contentDescription = null,
+                        modifier = Modifier
                             .padding(end = 5.dp)
                             .size(13.dp),
                         tint = Color(0xFF666666)
@@ -92,19 +94,33 @@ fun JobListItem(job: Job) {
                     Text(job.orderNo, fontSize = 13.sp, color = Color(0xFF666666))
                 }
                 // 负责人
-                if (job.initiatorName.isNotEmpty()) Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
+                if (job.initiatorName.isNotEmpty()) Row(
+                    Modifier.padding(end = 12.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
                     Icon(
-                        painterResource(R.drawable.user), contentDescription = null, modifier = Modifier
+                        painterResource(R.drawable.user),
+                        contentDescription = null,
+                        modifier = Modifier
                             .padding(end = 5.dp)
                             .size(13.dp),
                         tint = Color(0xFF666666)
                     )
-                    Text("作业发起人：${job.initiatorName}", fontSize = 13.sp, color = Color(0xFF666666))
+                    Text(
+                        "作业发起人：${job.initiatorName}",
+                        fontSize = 13.sp,
+                        color = Color(0xFF666666)
+                    )
                 }
                 // 岗位区间，暂时没有字段匹配，先隐藏
-                if (false) Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
+                if (false) Row(
+                    Modifier.padding(end = 12.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
                     Icon(
-                        painterResource(R.drawable.location), contentDescription = null, modifier = Modifier
+                        painterResource(R.drawable.location),
+                        contentDescription = null,
+                        modifier = Modifier
                             .padding(end = 5.dp)
                             .size(13.dp),
                         tint = Color(0xFF1E90FF)
@@ -117,7 +133,7 @@ fun JobListItem(job: Job) {
                 Modifier
                     .padding(top = 5.dp)
                     .fillMaxWidth()
-                    .height(20.dp),
+                    .height(26.dp),
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text("当前任务：", fontSize = 13.sp, lineHeight = 13.sp, color = Text)
@@ -127,16 +143,20 @@ fun JobListItem(job: Job) {
                         .fillMaxHeight()
                         .clip(RoundedCornerShape(4.dp))
                         .background(Color(0xFF1E90FF))
-                        .padding(horizontal = 6.dp),
+                        .padding(horizontal = 6.dp, vertical = 4.dp),
                     fontSize = 12.sp,
-                    lineHeight = 20.sp,
+                    lineHeight = 12.sp,
                     fontWeight = FontWeight.Bold,
                     color = Color.White,
                     textAlign = TextAlign.Center
                 )
                 Spacer(modifier = Modifier.weight(1f))
                 // 显示创建日期
-                Text(job.createTime.getShowDateOrTime(), fontSize = 12.sp, color = Text.copy(alpha = 0.6f))
+                Text(
+                    job.createTime.getShowDateOrTime(),
+                    fontSize = 12.sp,
+                    color = Text.copy(alpha = 0.6f)
+                )
             }
         }
     }

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

@@ -74,7 +74,9 @@ fun TaskListItem(task: Task) {
                 // 当前任务号
                 Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
                     Icon(
-                        painterResource(R.drawable.number), contentDescription = null, modifier = Modifier
+                        painterResource(R.drawable.number),
+                        contentDescription = null,
+                        modifier = Modifier
                             .padding(end = 5.dp)
                             .size(13.dp),
                         tint = Color(0xFF666666)
@@ -82,19 +84,33 @@ fun TaskListItem(task: Task) {
                     Text(task.orderNo, fontSize = 13.sp, color = Color(0xFF666666))
                 }
                 // 负责人
-                if (!task.workerUserName.isNullOrEmpty()) Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
+                if (!task.workerUserName.isNullOrEmpty()) Row(
+                    Modifier.padding(end = 12.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
                     Icon(
-                        painterResource(R.drawable.user), contentDescription = null, modifier = Modifier
+                        painterResource(R.drawable.user),
+                        contentDescription = null,
+                        modifier = Modifier
                             .padding(end = 5.dp)
                             .size(13.dp),
                         tint = Color(0xFF666666)
                     )
-                    Text("任务负责人：${task.workerUserName}", fontSize = 13.sp, color = Color(0xFF666666))
+                    Text(
+                        "任务负责人：${task.workerUserName}",
+                        fontSize = 13.sp,
+                        color = Color(0xFF666666)
+                    )
                 }
                 // 岗位区间，暂时没有字段匹配，先隐藏
-                if (false) Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
+                if (false) Row(
+                    Modifier.padding(end = 12.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
                     Icon(
-                        painterResource(R.drawable.location), contentDescription = null, modifier = Modifier
+                        painterResource(R.drawable.location),
+                        contentDescription = null,
+                        modifier = Modifier
                             .padding(end = 5.dp)
                             .size(13.dp),
                         tint = Color(0xFF1E90FF)
@@ -106,7 +122,9 @@ fun TaskListItem(task: Task) {
             // 任务状态
             Row(Modifier.padding(end = 12.dp), verticalAlignment = Alignment.CenterVertically) {
                 Icon(
-                    painterResource(R.drawable.target), contentDescription = null, modifier = Modifier
+                    painterResource(R.drawable.target),
+                    contentDescription = null,
+                    modifier = Modifier
                         .padding(end = 5.dp)
                         .size(13.dp),
                     tint = Color(0xFF666666)
@@ -117,7 +135,7 @@ fun TaskListItem(task: Task) {
                 Modifier
                     .padding(top = 5.dp)
                     .fillMaxWidth()
-                    .height(20.dp),
+                    .height(26.dp),
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Text("我的任务：", fontSize = 13.sp, lineHeight = 13.sp, color = Text)
@@ -127,16 +145,20 @@ fun TaskListItem(task: Task) {
                         .fillMaxHeight()
                         .clip(RoundedCornerShape(4.dp))
                         .background(Color(0xFF1E90FF))
-                        .padding(horizontal = 6.dp),
+                        .padding(horizontal = 6.dp, vertical = 4.dp),
                     fontSize = 12.sp,
-                    lineHeight = 20.sp,
+                    lineHeight = 12.sp,
                     fontWeight = FontWeight.Bold,
                     color = Color.White,
                     textAlign = TextAlign.Center
                 )
                 Spacer(modifier = Modifier.weight(1f))
                 // 显示工作日期
-                Text(task.workTime.getShowDateOrTime(), fontSize = 12.sp, color = Text.copy(alpha = 0.6f))
+                Text(
+                    task.workTime.getShowDateOrTime(),
+                    fontSize = 12.sp,
+                    color = Text.copy(alpha = 0.6f)
+                )
             }
         }
     }

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

@@ -660,6 +660,7 @@ class PageDetailTask : PageBase() {
     fun TaskOptions(pv: PaddingValues, vm: VMDetailTask) {
         val pb = pv.calculateBottomPadding()
         val state by vm.state.collectAsState()
+        if (state.node.id <= 0) return
         Column(
             Modifier
                 .padding(bottom = if (pb.value <= 0) 10.dp else pb)