Skip to content

Commit 2ee7bdd

Browse files
committed
update
1 parent 57d901e commit 2ee7bdd

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

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

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.wzq.jd.compose.app.App
88
import com.wzq.jd.compose.app.data.DataRepos
99
import com.wzq.jd.compose.app.data.model.ArticleItem
1010
import com.wzq.jd.compose.app.data.model.Categories
11-
import kotlinx.coroutines.delay
1211
import kotlinx.coroutines.launch
1312

1413
/**
@@ -26,21 +25,19 @@ class CategoriesViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
2625
if (pagerData.containsKey(index)) {
2726
return@launch
2827
}
29-
val cid = categories?.children?.get(index)?.id ?: 0
30-
println(cid)
31-
pagerData[index] = App.db.articleDao().getArticlesByCid(cid).also {
32-
println(it)
33-
}
34-
// val all = (App.db.articleDao().getArticlesAll())
35-
// println(all.size)
36-
launch {
37-
delay(5000)
28+
val cid = categories?.children?.get(index)?.id ?: return@launch
29+
30+
val dao = App.db.articleDao()
31+
val data = dao.getArticlesByCid(cid)
32+
if (data.isNotEmpty()) {
33+
pagerData[index] = data
34+
} else {
3835
DataRepos.remoteRepo.getArticleList(cid = cid).onSuccess { result ->
39-
println(result.data.listData)
40-
pagerData[index] = result.data.listData
36+
pagerData[index] = result.data.listData.also {
37+
dao.insert(it)
38+
}
4139
}
4240
}
43-
println(11111)
4441
}
4542
}
4643

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import androidx.compose.runtime.mutableStateListOf
44
import androidx.compose.runtime.mutableStateOf
55
import androidx.lifecycle.ViewModel
66
import androidx.lifecycle.viewModelScope
7+
import com.wzq.jd.compose.app.App
78
import com.wzq.jd.compose.app.data.DataRepos
89
import com.wzq.jd.compose.app.data.model.ArticleItem
910
import com.wzq.jd.compose.app.data.model.Categories
@@ -19,9 +20,11 @@ class HomeViewModel : ViewModel() {
1920
val indexState = mutableStateOf<PageState<List<ArticleItem>>>(PageState.Loading)
2021

2122
val projectState = mutableStateOf<PageState<List<ArticleItem>>>(PageState.Loading)
22-
val projectList = mutableStateListOf<ArticleItem>()
23+
2324
val categories = mutableStateListOf<Categories>()
2425

26+
private val articleDao = App.db.articleDao()
27+
2528
init {
2629
getArticleList()
2730
getProjectList()

0 commit comments

Comments
 (0)