update

Author: wzq

app/src/main/java/com/wzq/jd/compose/app/App.kt

@@ -3,29 +3,25 @@ package com.wzq.jd.compose.app
 import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
-import androidx.room.Room
 import com.wzq.jd.compose.app.data.local.AppDatabase
 
 /**
  * create by wzq on 2023/12/20
  *
  */
-class App: Application() {
+class App : Application() {
 
     companion object {
         @SuppressLint("StaticFieldLeak")
         private var _context: Context? = null
 
         val context: Context get() = _context!!
-        val db by lazy {
-            Room.databaseBuilder(context, AppDatabase::class.java, "database-j")
-                .fallbackToDestructiveMigration()
-                .build()
-        }
     }
 
     override fun onCreate() {
         super.onCreate()
         _context = this
+
+        AppDatabase.instance
     }
 }

app/src/main/java/com/wzq/jd/compose/app/data/local/AppDatabase.kt

@@ -1,7 +1,9 @@
 package com.wzq.jd.compose.app.data.local
 
 import androidx.room.Database
+import androidx.room.Room
 import androidx.room.RoomDatabase
+import com.wzq.jd.compose.app.App
 import com.wzq.jd.compose.app.data.model.ArticleItem
 import com.wzq.jd.compose.app.data.model.Categories
 
@@ -13,4 +15,12 @@ import com.wzq.jd.compose.app.data.model.Categories
 abstract class AppDatabase : RoomDatabase() {
     abstract fun articleDao(): ArticleDao
     abstract fun categoriesDao(): CategoriesDao
+
+    companion object{
+        val instance by lazy {
+            Room.databaseBuilder(App.context, AppDatabase::class.java, "database-j")
+                .fallbackToDestructiveMigration()
+                .build()
+        }
+    }
 }

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

@@ -4,8 +4,8 @@ import androidx.compose.runtime.mutableStateMapOf
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.wzq.jd.compose.app.App
 import com.wzq.jd.compose.app.data.DataRepos
+import com.wzq.jd.compose.app.data.local.AppDatabase
 import com.wzq.jd.compose.app.data.model.ArticleItem
 import com.wzq.jd.compose.app.data.model.Categories
 import kotlinx.coroutines.launch
@@ -20,21 +20,22 @@ class CategoriesViewModel(savedStateHandle: SavedStateHandle) : ViewModel() {
 
     val pagerData = mutableStateMapOf<Int, List<ArticleItem>>()
 
-    fun getItemList(index: Int, batch: Int = 0) {
+    private val articleDao = AppDatabase.instance.articleDao()
+
+    fun getItemList(index: Int) {
         viewModelScope.launch {
             if (pagerData.containsKey(index)) {
                 return@launch
             }
             val cid = categories?.children?.get(index)?.id ?: return@launch
 
-            val dao = App.db.articleDao()
-            val data = dao.getArticlesByCid(cid)
+            val data = articleDao.getArticlesByCid(cid)
             if (data.isNotEmpty()) {
                 pagerData[index] = data
             } else {
                 DataRepos.remoteRepo.getArticleList(cid = cid).onSuccess { result ->
                     pagerData[index] = result.data.listData.also {
-                        dao.insert(it)
+                        articleDao.insert(it)
                     }
                 }
             }

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

@@ -62,7 +62,7 @@ fun CategoryScreen(
 
     LaunchedEffect(key1 = pagerState, block = {
         snapshotFlow { pagerState.currentPage }.collect {
-            viewModel.getItemList(pagerState.currentPage, 3)
+            viewModel.getItemList(pagerState.currentPage)
         }
     })
     ;

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

@@ -4,8 +4,8 @@ import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.wzq.jd.compose.app.App
 import com.wzq.jd.compose.app.data.DataRepos
+import com.wzq.jd.compose.app.data.local.AppDatabase
 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
@@ -23,7 +23,7 @@ class HomeViewModel : ViewModel() {
 
     val categories = mutableStateListOf<Categories>()
 
-    private val categoriesDao = App.db.categoriesDao()
+    private val categoriesDao = AppDatabase.instance.categoriesDao()
 
     init {
         getArticleList()