优化
This commit is contained in:
@@ -42,7 +42,9 @@ import io.legado.app.ui.widget.recycler.VerticalDivider
|
||||
import io.legado.app.utils.*
|
||||
import io.legado.app.utils.viewbindingdelegate.viewBinding
|
||||
import kotlinx.coroutines.*
|
||||
import kotlinx.coroutines.flow.*
|
||||
import kotlinx.coroutines.flow.catch
|
||||
import kotlinx.coroutines.flow.collectLatest
|
||||
import kotlinx.coroutines.flow.flow
|
||||
|
||||
class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceViewModel>(),
|
||||
PopupMenu.OnMenuItemClickListener,
|
||||
@@ -208,7 +210,6 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
|
||||
private fun upBookSource(searchKey: String? = null) {
|
||||
sourceFlowJob?.cancel()
|
||||
sourceFlowJob = launch {
|
||||
runCatching {
|
||||
when {
|
||||
searchKey.isNullOrEmpty() -> {
|
||||
appDb.bookSourceDao.flowAll()
|
||||
@@ -229,7 +230,9 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
|
||||
else -> {
|
||||
appDb.bookSourceDao.flowSearch("%$searchKey%")
|
||||
}
|
||||
}.collect { data ->
|
||||
}.catch {
|
||||
AppLog.put("书源界面更新书源出错", it)
|
||||
}.collectLatest { data ->
|
||||
val sourceList =
|
||||
if (sortAscending) when (sort) {
|
||||
Sort.Weight -> data.sortedBy { it.weight }
|
||||
@@ -267,9 +270,6 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
|
||||
}
|
||||
adapter.setItems(sourceList, adapter.diffItemCallback)
|
||||
}
|
||||
}.onFailure {
|
||||
AppLog.put("更新书源出错", it)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user