1. 去除首页设置按钮

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

@@ -33,6 +33,7 @@ import com.iscs.bozzys.api.Job
 import com.iscs.bozzys.ui.pages.detail.job.openPageDetailJob
 import com.iscs.bozzys.ui.theme.Text
 import com.iscs.bozzys.utils.DateUtil.getShowDate
+import com.iscs.bozzys.utils.DateUtil.getShowDateOrTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -137,7 +138,7 @@ fun JobListItem(job: Job) {
                 )
                 Spacer(modifier = Modifier.weight(1f))
                 // 显示创建日期
-                Text(job.createTime.getShowDate(), fontSize = 14.sp, color = Text.copy(alpha = 0.6f))
+                Text(job.createTime.getShowDateOrTime(), fontSize = 14.sp, color = Text.copy(alpha = 0.6f))
             }
         }
     }

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

@@ -31,6 +31,7 @@ import com.iscs.bozzys.R
 import com.iscs.bozzys.api.Task
 import com.iscs.bozzys.ui.pages.detail.task.openPageDetailTask
 import com.iscs.bozzys.ui.theme.Text
+import com.iscs.bozzys.utils.DateUtil.getShowDateOrTime
 
 @OptIn(ExperimentalLayoutApi::class)
 @Composable
@@ -124,6 +125,9 @@ fun TaskListItem(task: Task) {
                     color = Color.White,
                     textAlign = TextAlign.Center
                 )
+                Spacer(modifier = Modifier.weight(1f))
+                // 显示工作日期
+                Text(task.workTime.getShowDateOrTime(), fontSize = 14.sp, color = Text.copy(alpha = 0.6f))
             }
         }
     }

app/src/main/java/com/iscs/bozzys/ui/pages/detail/job/PageDetailJob.kt

@@ -429,7 +429,7 @@ class PageDetailJob : PageBase() {
             // 底部功能按钮
             Row(
                 modifier = Modifier
-                    .padding(bottom = if (pb.value <= 0) 10.dp else pb)
+                    .padding(bottom = if (pb.value <= 0) 10.dp else pb, top = 10.dp)
                     .padding(horizontal = 24.dp)
                     .fillMaxWidth()
             ) {

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

@@ -148,16 +148,16 @@ private fun TopToolBar(pv: PaddingValues, vmHome: VMHome) {
                     lineHeight = 10.sp
                 )
             }
-            Icon(
-                painter = painterResource(R.drawable.settings),
-                contentDescription = null,
-                modifier = Modifier
-                    .size(36.dp)
-                    .clip(RoundedCornerShape(6.dp))
-                    .clickable(onClick = { vmHome.navigationToId(3) })
-                    .padding(10.dp),
-                tint = Color.White
-            )
+//            Icon(
+//                painter = painterResource(R.drawable.settings),
+//                contentDescription = null,
+//                modifier = Modifier
+//                    .size(36.dp)
+//                    .clip(RoundedCornerShape(6.dp))
+//                    .clickable(onClick = { vmHome.navigationToId(3) })
+//                    .padding(10.dp),
+//                tint = Color.White
+//            )
         }
     }
 }
@@ -191,7 +191,7 @@ private fun TODO(vmHome: VMHome) {
                     .weight(1f)
                     .height(80.dp)
                     .clip(RoundedCornerShape(12.dp))
-                    .background(Color(0xFFFFF5EB)),
+                    .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.1f)),
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center
             ) {
@@ -223,7 +223,7 @@ private fun TODO(vmHome: VMHome) {
                     .weight(1f)
                     .height(80.dp)
                     .clip(RoundedCornerShape(12.dp))
-                    .background(Color(0xFFFFF5EB)),
+                    .background(MaterialTheme.colorScheme.primary.copy(alpha = 0.1f)),
                 horizontalAlignment = Alignment.CenterHorizontally,
                 verticalArrangement = Arrangement.Center
             ) {
@@ -258,9 +258,9 @@ private fun TODO(vmHome: VMHome) {
  * 待办列表
  */
 @Composable
-private fun TaskList(pv: PaddingValues, vmHome: VMHome) {
+private fun TaskList(pv: PaddingValues, vm: VMHome) {
     val ctx = LocalContext.current
-    val state by vmHome.state.collectAsState()
+    val state by vm.state.collectAsState()
     Column(
         Modifier
             .padding(horizontal = 16.dp)
@@ -274,7 +274,7 @@ private fun TaskList(pv: PaddingValues, vmHome: VMHome) {
                 .fillMaxWidth()
                 .height(36.dp)
                 .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }, onClick = {
-                    vmHome.navigationToId(2)
+                    vm.navigationToId(2)
                 }),
             verticalAlignment = Alignment.CenterVertically
         ) {

app/src/main/java/com/iscs/bozzys/ui/pages/vm/VMHome.kt

@@ -171,7 +171,7 @@ class VMHome : VMBase() {
             // 下拉即刷新
             _state.value = _state.value.copy(jobPage = _state.value.jobPage.copy(isRefresh = page.isRefresh, type = page.type))
             // 执行接口数据请求
-            ApiRequest.getJobs(hashMapOf("pageNo" to page.page, "pageSize" to page.pageSize, "status" to page.type, "name" to page.keywords))
+            ApiRequest.getJobs(hashMapOf("pageNo" to page.page, "pageSize" to page.pageSize, "status" to page.type, "key" to page.keywords))
                 .onSuccess {
                     if (page.page == 1) _state.value.jobList.clear()
                     val jobs = it.data?.list ?: emptyList()

app/src/main/java/com/iscs/bozzys/utils/DateUtil.kt

@@ -57,12 +57,50 @@ object DateUtil {
      * 将时间戳转化为可显示的日期
      */
     fun Long?.getShowDate(): String {
-        Log.d("xiaoming", "当前使用的时间戳 -> $this")
         var show = "--"
         if (this != null && this > 0) {
             // 执行时间戳的转换
+
         }
         return show
     }
 
+    /**
+     * 将时间戳转化为可显示的日期
+     */
+    fun Long?.getShowDateOrTime(): String {
+        val localTs = System.currentTimeMillis()
+        val localDat = localTs.format("yyyy-MM-dd HH:mm:ss").split(" ")
+        val localDate = localDat[0]
+        // val localTime = localDat[1]
+        // 显示逻辑
+        // 当天 显示具体时间
+        // 昨天 显示昨天具体时间
+        // 前天 显示前天具体时间
+        // 本年 显示日期和时间
+        // 他年 显示年月日和时间
+        if (this != null && this > 0) {
+            // 执行时间戳的转换
+            val dat = this.format("yyyy-MM-dd HH:mm:ss").split(" ")
+            val date = dat[0].split("-")
+            val year = date[0]
+            val month = date[1]
+            val day = date[2]
+            val time = dat[1]
+            return if (localDate == dat[0]) {
+                // 说明是当天
+                time
+            } else if (localDate == "$year-$month-${(day.toInt() - 1).toString().padStart(2, '0')}") {
+                // 说明是昨天
+                "昨天 $time"
+            } else if (localDate.startsWith("$year-")) {
+                // 说明是本年度
+                "$month-$day $time"
+            } else {
+                "${dat[0]} ${dat[1]}"
+            }
+        }
+        return "--"
+    }
+
 }