优化
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package io.legado.app.help.glide
|
||||
|
||||
import android.content.Context
|
||||
import android.util.Log
|
||||
import com.bumptech.glide.Glide
|
||||
import com.bumptech.glide.GlideBuilder
|
||||
import com.bumptech.glide.Registry
|
||||
@@ -9,6 +10,8 @@ import com.bumptech.glide.load.engine.cache.InternalCacheDiskCacheFactory
|
||||
import com.bumptech.glide.load.engine.cache.MemorySizeCalculator
|
||||
import com.bumptech.glide.load.model.GlideUrl
|
||||
import com.bumptech.glide.module.AppGlideModule
|
||||
import io.legado.app.BuildConfig
|
||||
import io.legado.app.help.config.AppConfig
|
||||
import java.io.InputStream
|
||||
|
||||
|
||||
@@ -36,5 +39,8 @@ class LegadoGlideModule : AppGlideModule() {
|
||||
builder.setMemorySizeCalculator(calculator)
|
||||
builder.setBitmapPool(bitmapPool)
|
||||
builder.setDiskCache(InternalCacheDiskCacheFactory(context, 1024 * 1024 * 1000))
|
||||
if (!BuildConfig.DEBUG && !AppConfig.recordLog) {
|
||||
builder.setLogLevel(Log.ERROR)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,12 @@ import io.legado.app.ui.book.manga.ReadMangaActivity
|
||||
import io.legado.app.ui.book.read.ReadBookActivity
|
||||
import io.legado.app.ui.book.search.SearchActivity
|
||||
import io.legado.app.ui.main.bookshelf.BaseBookshelfFragment
|
||||
import io.legado.app.utils.*
|
||||
import io.legado.app.utils.cnCompare
|
||||
import io.legado.app.utils.observeEvent
|
||||
import io.legado.app.utils.setEdgeEffectColor
|
||||
import io.legado.app.utils.showDialogFragment
|
||||
import io.legado.app.utils.startActivity
|
||||
import io.legado.app.utils.startReadOrMangaActivity
|
||||
import io.legado.app.utils.viewbindingdelegate.viewBinding
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.Job
|
||||
@@ -134,7 +139,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
|
||||
}
|
||||
}
|
||||
booksFlowJob?.cancel()
|
||||
booksFlowJob = lifecycleScope.launch {
|
||||
booksFlowJob = viewLifecycleOwner.lifecycleScope.launch {
|
||||
appDb.bookDao.flowByGroup(groupId).map { list ->
|
||||
//排序
|
||||
when (AppConfig.getBookSortByGroupId(groupId)) {
|
||||
@@ -161,12 +166,10 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
|
||||
}.flowOn(Dispatchers.Default).catch {
|
||||
AppLog.put("书架更新出错", it)
|
||||
}.conflate().collect { list ->
|
||||
if (isAdded) {
|
||||
books = list
|
||||
booksAdapter.notifyDataSetChanged()
|
||||
binding.tvEmptyMsg.isGone = getItemCount() > 0
|
||||
delay(100)
|
||||
}
|
||||
books = list
|
||||
booksAdapter.notifyDataSetChanged()
|
||||
binding.tvEmptyMsg.isGone = getItemCount() > 0
|
||||
delay(100)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -204,10 +207,12 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
|
||||
startActivity<AudioPlayActivity> {
|
||||
putExtra("bookUrl", item.bookUrl)
|
||||
}
|
||||
else -> startReadOrMangaActivity<ReadBookActivity,ReadMangaActivity>(item) {
|
||||
|
||||
else -> startReadOrMangaActivity<ReadBookActivity, ReadMangaActivity>(item) {
|
||||
putExtra("bookUrl", item.bookUrl)
|
||||
}
|
||||
}
|
||||
|
||||
is BookGroup -> {
|
||||
groupId = item.groupId
|
||||
initBooksData()
|
||||
@@ -221,6 +226,7 @@ class BookshelfFragment2() : BaseBookshelfFragment(R.layout.fragment_bookshelf2)
|
||||
putExtra("name", item.name)
|
||||
putExtra("author", item.author)
|
||||
}
|
||||
|
||||
is BookGroup -> showDialogFragment(GroupEditDialog(item))
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user