update

Author: wzq

app/src/main/java/com/wzq/jd/compose/app/data/remote/CustomHttpClient.kt

@@ -27,7 +27,7 @@ class CustomHttpClient {
                 followRedirects(true)
             }
             addInterceptor(HttpLoggingInterceptor().apply {
-                level = HttpLoggingInterceptor.Level.BODY
+                level = HttpLoggingInterceptor.Level.HEADERS
             })
 
         }

app/src/main/java/com/wzq/jd/compose/app/data/remote/RemoteDataRepo.kt

@@ -9,8 +9,6 @@ import io.ktor.client.call.body
 import io.ktor.client.request.forms.submitForm
 import io.ktor.client.request.get
 import io.ktor.client.request.parameter
-import io.ktor.client.request.post
-import io.ktor.client.request.setBody
 import io.ktor.http.parametersOf
 
 /**
@@ -46,9 +44,4 @@ class RemoteDataRepo(
         ).body<NetResult<PagingResult<ArticleItem>>>()
     }
 
-    suspend fun test() = client.doRequest<Unit> {
-        this.post("") {
-            setBody(parametersOf("a", "b"))
-        }
-    }
 }

app/src/main/java/com/wzq/jd/compose/app/page/PageState.kt

@@ -4,13 +4,9 @@ package com.wzq.jd.compose.app.page
  * create by wzq on 2023/12/5
  *
  */
-sealed class PageState {
-    data object None : PageState()
-    data object Loading : PageState()
-    class Success(private val data: Any?) : PageState() {
-        @Suppress("UNCHECKED_CAST")
-        fun <T> get() = data as? T
-    }
-
-    class Failure(val exception: Throwable? = null, val tag: Any? = null) : PageState()
+sealed class PageState<out T> {
+    data object None : PageState<Nothing>()
+    data object Loading : PageState<Nothing>()
+    class Success<out T>(val data: T) : PageState<T>()
+    class Failure(val exception: Throwable? = null, val tag: Any? = null) : PageState<Nothing>()
 }

app/src/main/java/com/wzq/jd/compose/app/page/home/HomeIndexPage.kt

@@ -1,19 +1,24 @@
 package com.wzq.jd.compose.app.page.home
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.Card
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.dp
 import com.wzq.jd.compose.app.data.model.ArticleItem
+import com.wzq.jd.compose.app.page.PageState
 import com.wzq.jd.compose.app.ui.widget.HtmlText
 import io.ktor.http.encodeURLPath
 
@@ -22,12 +27,23 @@ import io.ktor.http.encodeURLPath
  *
  */
 @Composable
-fun HomeIndexPage(articleList: List<ArticleItem>, onItemClick: (String) -> Unit) {
-    LazyColumn(content = {
-        items(articleList) {
-            ArticleItemPage(itemData = it, onItemClick)
+fun HomeIndexPage(state: PageState<List<ArticleItem>>, onItemClick: (String) -> Unit) {
+    when(state) {
+        PageState.Loading -> {
+            Box(modifier = Modifier.fillMaxSize()) {
+                CircularProgressIndicator(modifier = Modifier.align(Alignment.Center))
+            }
         }
-    })
+        is PageState.Success -> {
+            LazyColumn(content = {
+                items(state.data) {
+                    ArticleItemPage(itemData = it, onItemClick)
+                }
+            })
+        }
+        else -> {}
+    }
+
 }
 
 @OptIn(ExperimentalMaterial3Api::class)

app/src/main/java/com/wzq/jd/compose/app/page/home/HomeScreen.kt

@@ -56,7 +56,7 @@ fun HomeScreen(viewModel: HomeViewModel, navActions: NavActions) {
         ) { currentPagerNum ->
             when (currentPagerNum) {
                 0 -> HomeIndexPage(
-                    articleList = viewModel.homeList,
+                    state = viewModel.indexState.value,
                     onItemClick = { navActions.toWebScreen(it) })
 
                 1 -> HomeProjectPage(
@@ -70,7 +70,6 @@ fun HomeScreen(viewModel: HomeViewModel, navActions: NavActions) {
                 else -> throw Exception("todo")
             }
         }
-
     }
 }
 

app/src/main/java/com/wzq/jd/compose/app/page/home/HomeViewModel.kt

@@ -1,11 +1,13 @@
 package com.wzq.jd.compose.app.page.home
 
 import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wzq.jd.compose.app.data.DataRepos
 import com.wzq.jd.compose.app.data.model.ArticleItem
 import com.wzq.jd.compose.app.data.model.Categories
+import com.wzq.jd.compose.app.page.PageState
 import kotlinx.coroutines.launch
 
 /**
@@ -14,7 +16,7 @@ import kotlinx.coroutines.launch
  */
 class HomeViewModel : ViewModel() {
 
-    val homeList = mutableStateListOf<ArticleItem>()
+    val indexState = mutableStateOf<PageState<List<ArticleItem>>>(PageState.Loading)
     val projectList = mutableStateListOf<ArticleItem>()
     val categories = mutableStateListOf<Categories>()
 
@@ -26,10 +28,9 @@ class HomeViewModel : ViewModel() {
 
     private fun getArticleList(pageNum: Int = 0) {
         viewModelScope.launch {
-            DataRepos.remoteRepo.getArticleList(pageNum).onSuccess {
-                homeList.clear()
-                homeList.addAll(it.data.listData)
-            }
+            DataRepos.remoteRepo.getArticleList(pageNum)
+                .onSuccess { indexState.value = PageState.Success(it.data.listData) }
+                .onFailure { indexState.value = PageState.Failure(it) }
         }
     }
 

app/src/main/java/com/wzq/jd/compose/app/page/search/SearchViewModel.kt

@@ -28,9 +28,6 @@ class SearchViewModel : ViewModel() {
 
     init {
         getHotWords()
-        viewModelScope.launch {
-//            NetworkUtil.remoteRepo.test()
-        }
     }
 
     private fun getHotWords() {