diff --git a/app/src/main/java/io/legado/app/data/entities/SearchBook.kt b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt index 2fc2a3a15..a343bdac6 100644 --- a/app/src/main/java/io/legado/app/data/entities/SearchBook.kt +++ b/app/src/main/java/io/legado/app/data/entities/SearchBook.kt @@ -25,9 +25,11 @@ import kotlinx.parcelize.Parcelize data class SearchBook( @PrimaryKey override var bookUrl: String = "", - var origin: String = "", // 书源规则 + /** 书源 */ + var origin: String = "", var originName: String = "", - var type: Int = BookType.text, // @BookType + /** BookType */ + var type: Int = BookType.text, override var name: String = "", override var author: String = "", override var kind: String? = null, @@ -35,7 +37,8 @@ data class SearchBook( var intro: String? = null, override var wordCount: String? = null, var latestChapterTitle: String? = null, - var tocUrl: String = "", // 目录页Url (toc=table of Contents) + /** 目录页Url (toc=table of Contents) */ + var tocUrl: String = "", var time: Long = System.currentTimeMillis(), override var variable: String? = null, var originOrder: Int = 0 diff --git a/app/src/main/java/io/legado/app/data/entities/SearchKeyword.kt b/app/src/main/java/io/legado/app/data/entities/SearchKeyword.kt index 955e5fe3d..6d46eb900 100644 --- a/app/src/main/java/io/legado/app/data/entities/SearchKeyword.kt +++ b/app/src/main/java/io/legado/app/data/entities/SearchKeyword.kt @@ -10,8 +10,11 @@ import kotlinx.parcelize.Parcelize @Parcelize @Entity(tableName = "search_keywords", indices = [(Index(value = ["word"], unique = true))]) data class SearchKeyword( + /** 搜索关键词 */ @PrimaryKey - var word: String = "", // 搜索关键词 - var usage: Int = 1, // 使用次数 - var lastUseTime: Long = System.currentTimeMillis() // 最后一次使用时间 + var word: String = "", + /** 使用次数 */ + var usage: Int = 1, + /** 最后一次使用时间 */ + var lastUseTime: Long = System.currentTimeMillis() ) : Parcelable diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt index 2e3d55d61..4bce347b6 100644 --- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt @@ -398,6 +398,10 @@ class SearchActivity : VMBaseActivity() val searchScope: SearchScope = SearchScope(AppConfig.searchScope) private val searchModel = SearchModel(viewModelScope, object : SearchModel.CallBack { @@ -55,6 +60,17 @@ class SearchViewModel(application: Application) : BaseViewModel(application) { } }.flowOn(IO) + init { + viewModelScope.launch { + appDb.bookDao.flowAll().mapLatest { books -> + books.map { "${it.name}-${it.author}" } + }.collect { + bookshelf.clear() + bookshelf.addAll(it) + } + } + } + /** * 开始搜索 */