Преглед изворни кода

1. 优化部分显示效果

bjb пре 4 месеци
родитељ
комит
ccf9f9ebef

+ 2 - 2
app/src/main/java/com/iscs/bozzys/api/ApiRequest.kt

@@ -267,14 +267,14 @@ object ApiRequest {
     /**
      * 获取所有消息
      */
-    suspend fun getMessage(params: MutableMap<String, Any>): Result<Response<PageRsp<Message>>> {
+    suspend fun getMessages(params: MutableMap<String, Any>): Result<Response<PageRsp<Message>>> {
         return requestApi { api.getMessages(params) }
     }
 
     /**
      * 获取未读消息数量
      */
-    suspend fun getMessageUnread(): Result<Response<Int>> {
+    suspend fun getMessagesUnread(): Result<Response<Int>> {
         return requestApi { api.getMessagesUnread() }
     }
 

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

@@ -278,7 +278,7 @@ private fun TaskList(pv: PaddingValues, vm: VMHome) {
                 }),
             verticalAlignment = Alignment.CenterVertically
         ) {
-            Text("我的当前任务", fontSize = 14.sp, fontWeight = FontWeight.Medium, color = Text)
+            Text("当前任务", fontSize = 14.sp, fontWeight = FontWeight.Medium, color = Text)
             Spacer(Modifier.weight(1f))
             Text("查看全部", fontSize = 14.sp, color = Color(0xFF1E90FF))
         }
@@ -354,7 +354,6 @@ fun MessageListItem(msg: Message, vm: VMHome) {
         ) {
             Column(
                 Modifier
-                    .padding(end = 10.dp)
                     .fillMaxHeight()
                     .weight(1f)
             ) {
@@ -374,13 +373,13 @@ fun MessageListItem(msg: Message, vm: VMHome) {
                     Text(msg.createTime.getShowDateOrTime(), fontSize = 14.sp, color = Text.copy(alpha = 0.6f))
                 }
             }
-            Spacer(
-                Modifier
-                    .size(8.dp)
-                    .clip(RoundedCornerShape(50))
-                    .background(if (msg.readStatus) Color.Transparent else Color(0xFFFF4500))
-                    .align(Alignment.CenterVertically)
-            )
+//            Spacer(
+//                Modifier
+//                    .size(8.dp)
+//                    .clip(RoundedCornerShape(50))
+//                    .background(if (msg.readStatus) Color.Transparent else Color(0xFFFF4500))
+//                    .align(Alignment.CenterVertically)
+//            )
         }
     }
 }

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

@@ -75,7 +75,7 @@ class PageHome : PageBase() {
                     .padding(PaddingValues(bottom = ip.calculateBottomPadding() - pv.calculateBottomPadding()))
                     .fillMaxSize()
             ) {
-                vm.state.value.navs.forEach { nav ->
+                state.navs.forEach { nav ->
                     when (nav.id) {
                         0 -> HomeCompose(pv, if (state.navigationId == 0) 99f else 0f, vm)
                         1 -> JobsCompose(pv, if (state.navigationId == 1) 99f else 0f, vm)

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

@@ -114,7 +114,7 @@ class VMHome : VMBase() {
                 return@launch
             }
             // 获取未读消息数量
-            val msgCountRsp = ApiRequest.getMessageUnread().getOrElse { it.getResponse() }
+            val msgCountRsp = ApiRequest.getMessagesUnread().getOrElse { it.getResponse() }
             if (!msgCountRsp.code.isCodeOk()) {
                 _state.value = _state.value.copy(isHomeTabRefresh = false)
                 delay(500)
@@ -147,7 +147,7 @@ class VMHome : VMBase() {
                 return@launch
             }
             // 获取最新三条消息
-            val msgRsp = ApiRequest.getMessage(mutableMapOf("pageNo" to 1, "pageSize" to 3)).getOrElse { it.getResponse() }
+            val msgRsp = ApiRequest.getMessages(mutableMapOf("pageNo" to 1, "pageSize" to 3)).getOrElse { it.getResponse() }
             if (!msgRsp.code.isCodeOk()) {
                 _state.value = _state.value.copy(isHomeTabRefresh = false)
                 delay(500)

+ 1 - 1
app/src/main/java/com/iscs/bozzys/ui/pages/vm/VMMessage.kt

@@ -29,7 +29,7 @@ class VMMessage : VMBase() {
     fun getMessage(page: StatePageMessage) {
         viewModelScope.launch {
             _state.value = _state.value.copy(page = _state.value.page.copy(page = page.page, isRefresh = page.isRefresh))
-            ApiRequest.getMessage(mutableMapOf("pageNo" to page.page, "pageSize" to page.pageSize)).onSuccess {
+            ApiRequest.getMessages(mutableMapOf("pageNo" to page.page, "pageSize" to page.pageSize)).onSuccess {
                 // 如果加载的是第一页数据,这里先做清除操作
                 if (page.page == 1) _state.value.messages.clear()
                 val newList = _state.value.messages.toMutableList()