update

Author: wzq

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

@@ -0,0 +1,15 @@
+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()
+}

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

@@ -12,6 +12,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
+import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ElevatedFilterChip
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -21,10 +22,13 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import com.wzq.jd.compose.app.data.model.ArticleItem
 import com.wzq.jd.compose.app.data.model.SearchHotWords
+import com.wzq.jd.compose.app.page.PageState
 import com.wzq.jd.compose.app.page.main.ArticleItemPage
 
 /**
@@ -51,23 +55,40 @@ fun SearchPage(
             }
         },
     ) { pv ->
-        Box(modifier = Modifier.padding(pv)) {
-            if (viewModel.result.isEmpty() || viewModel.keywords.value.isEmpty()) {
-                DefaultPage(hotWords = viewModel.hotWords) {
-                    viewModel.searchResult(it)
-                }
-            } else {
-                LazyColumn(content = {
-                    items(viewModel.result, key = { it.id }) {
-                        ArticleItemPage(itemData = it) {}
+        Box(
+            modifier = Modifier
+                .padding(pv)
+                .fillMaxSize()
+        ) {
+            when (val state = viewModel.pageState.value) {
+                PageState.None -> {
+                    DefaultPage(hotWords = viewModel.hotWords) {
+                        viewModel.searchResult(it)
                     }
-                })
+                }
+
+                PageState.Loading -> {
+                    CircularProgressIndicator(Modifier.align(Alignment.Center))
+                }
+
+                is PageState.Success -> {
+                    val list: List<ArticleItem> = state.get() ?: emptyList()
+                    LazyColumn(content = {
+                        items(list, key = { it.id }) {
+                            ArticleItemPage(itemData = it) {}
+                        }
+                    })
+                }
+
+                else -> {}
             }
 
         }
+
     }
 }
 
+
 @OptIn(ExperimentalLayoutApi::class, ExperimentalMaterial3Api::class)
 @Composable
 private fun DefaultPage(hotWords: List<SearchHotWords>, onItemClick: (String) -> Unit) {

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

@@ -8,7 +8,12 @@ import androidx.lifecycle.viewModelScope
 import com.wzq.jd.compose.app.data.NetworkUtil
 import com.wzq.jd.compose.app.data.model.ArticleItem
 import com.wzq.jd.compose.app.data.model.SearchHotWords
+import com.wzq.jd.compose.app.page.PageState
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 /**
  * create by wzq on 2023/12/5
@@ -20,7 +25,8 @@ class SearchViewModel : ViewModel() {
     val keywords: State<String> = _keywords
 
     val hotWords = mutableStateListOf<SearchHotWords>()
-    val result = mutableStateListOf<ArticleItem>()
+
+    val pageState = mutableStateOf<PageState>(PageState.None)
 
     init {
         getHotWords()
@@ -38,17 +44,25 @@ class SearchViewModel : ViewModel() {
     fun setKeyWords(key: String) {
         _keywords.value = key
         if (key.isEmpty()) {
-            result.clear()
+            pageState.value = PageState.None
         }
     }
 
     fun searchResult(key: String) {
         setKeyWords(key)
+        if (key.isEmpty()) {
+            return
+        }
+        pageState.value = PageState.Loading
         viewModelScope.launch {
+            withContext(Dispatchers.IO) {
+                delay(1000) // TODO:
+            }
             NetworkUtil.remoteRepo.getSearchResult(key)
                 .onSuccess {
-                    result.clear()
-                    result.addAll(it.data.listData)
+                    pageState.value = PageState.Success(it.data.listData)
+                }.onFailure {
+                    pageState.value = PageState.Failure(it)
                 }
         }
     }