修改编译的错误

app/build.gradle

@@ -30,7 +30,7 @@ android {
         }
     }
 
-    flavorDimensions "1.2.4"
+    flavorDimensions "1.3.0"
 
     aaptOptions {
         noCompress "webp"  //表示不让aapt压缩的文件后缀
@@ -64,13 +64,13 @@ android {
     productFlavors {
 
         kids {
-            versionName "1.2.3"
-            dimension "1.2.3"
+            versionName "1.3.0"
+            dimension "1.3.0"
         }
 
         child {
-            versionName "1.2.4"
-            dimension "1.2.4"
+            versionName "1.3.0"
+            dimension "1.3.0"
         }
 
     }
@@ -175,5 +175,5 @@ dependencies {
 
     kapt 'com.github.bumptech.glide:compiler:4.11.0'
     kapt 'androidx.annotation:annotation:1.1.0'
-    kapt 'androidx.room:room-compiler:2.2.5'
+    kapt 'androidx.room:room-compiler:2.3.0-alpha04'
 }

app/src/main/java/com/bearya/data/dao/ChapterDao.kt

@@ -9,6 +9,6 @@ import com.bearya.data.entity.Chapter
 interface ChapterDao {
 
     @Query("SELECT * FROM Chapter WHERE `enable` = 1 AND `level`= :grade")
-    fun findChapterByGrade(grade: Int): PagingSource<Int, Chapter>
+    fun getChapterByGrade(grade: Int): PagingSource<Int, Chapter>
 
 }

app/src/main/java/com/bearya/data/entity/Analysis.kt

@@ -1,10 +0,0 @@
-package com.bearya.data.entity
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-data class Analysis(@PrimaryKey(autoGenerate = true) val id: Int? = 0,
-                    val name: String?,
-                    val sectionId: Int?
-)

app/src/main/java/com/bearya/data/entity/Section.kt

@@ -1,13 +0,0 @@
-package com.bearya.data.entity
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-data class Section(@PrimaryKey(autoGenerate = true) val id: Int? = 0,
-                   val chapterId: Int?, // 关联的章节Id
-                   val name: String?, // 内容图片的名称
-                   val hasAnalysis: Boolean?, // 是否拥有答案解析
-                   val enable: Boolean?,// 启用状态
-                   var lock: Boolean? // 锁定状态
-)

app/src/main/java/com/bearya/data/repository/AnalysisRepository.kt

@@ -1,12 +0,0 @@
-package com.bearya.data.repository
-
-import com.bearya.data.dao.AnalysisDao
-import com.bearya.kids.AppDatabase
-
-class AnalysisRepository {
-
-    private val analysisDao: AnalysisDao by lazy { AppDatabase.instance.analysisDao() }
-
-    fun findAnalysisBySectionId(id: Int) = analysisDao.findAnalysisBySectionId(id)
-
-}

app/src/main/java/com/bearya/data/repository/ChapterRepository.kt

@@ -7,6 +7,6 @@ class ChapterRepository {
 
     private val chapterDao: ChapterDao by lazy { AppDatabase.instance.chapterDao() }
 
-    fun findChaptersByGrade(grade: Int = 1) = chapterDao.findChapterByGrade(grade)
+    fun getChapterByGrade(grade: Int = 1) = chapterDao.getChapterByGrade(grade)
 
 }

app/src/main/java/com/bearya/data/repository/SectionRepository.kt

@@ -1,11 +0,0 @@
-package com.bearya.data.repository
-
-import com.bearya.data.dao.SectionDao
-import com.bearya.kids.AppDatabase
-
-class SectionRepository {
-
-    private val sectionDao:SectionDao by lazy { AppDatabase.instance.sectionDao() }
-
-    fun findSectionByChapterId(chapterId : Int = 1) = sectionDao.findSectionsByChapterId(chapterId)
-}

app/src/main/java/com/bearya/kids/AppDatabase.kt

@@ -4,17 +4,11 @@ import android.content.Context
 import androidx.room.Database
 import androidx.room.Room
 import androidx.room.RoomDatabase
-import com.bearya.data.dao.AnalysisDao
 import com.bearya.data.dao.ChapterDao
-import com.bearya.data.dao.SectionDao
-import com.bearya.data.entity.Analysis
 import com.bearya.data.entity.Chapter
-import com.bearya.data.entity.Section
 
 @Database(entities = [
-    Chapter::class,
-    Section::class,
-    Analysis::class
+    Chapter::class
 ], version = 2, exportSchema = true)
 abstract class AppDatabase : RoomDatabase() {
 

app/src/main/java/com/bearya/kids/chapter/ChapterViewModel.kt

@@ -17,7 +17,7 @@ class ChapterViewModel : ViewModel() {
     val gradeLevel: MutableLiveData<Int> by lazy { MutableLiveData<Int>() }
 
     val chapters: LiveData<PagingData<Chapter>> = gradeLevel.switchMap {
-        buildPagerLiveData(viewModelScope) { chapterRepository.findChaptersByGrade(it) }
+        buildPagerLiveData(viewModelScope) { chapterRepository.getChapterByGrade(it) }
     }
 
     val gradeName: LiveData<String> = gradeLevel.map {

app/version.properties

@@ -1,2 +1,2 @@
-#Thu Jan 28 15:32:23 CST 2021
-VERSION_CODE=389
+#Thu Jan 28 15:49:32 CST 2021
+VERSION_CODE=400