mirror of
https://github.com/gedoor/legado.git
synced 2024-07-06 23:47:49 +08:00
优化
This commit is contained in:
parent
15258abc09
commit
8cd9610992
@ -80,7 +80,7 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
|
|||||||
val searchGroup = AppConfig.searchGroup
|
val searchGroup = AppConfig.searchGroup
|
||||||
if (searchGroup.isNotEmpty()) {
|
if (searchGroup.isNotEmpty()) {
|
||||||
lifecycleScope.launch {
|
lifecycleScope.launch {
|
||||||
alert("搜索结果为空") {
|
context?.alert("搜索结果为空") {
|
||||||
setMessage("${searchGroup}分组搜索结果为空,是否切换到全部分组")
|
setMessage("${searchGroup}分组搜索结果为空,是否切换到全部分组")
|
||||||
cancelButton()
|
cancelButton()
|
||||||
okButton {
|
okButton {
|
||||||
@ -112,6 +112,11 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_
|
|||||||
viewModel.searchFinishCallback = searchFinishCallback
|
viewModel.searchFinishCallback = searchFinishCallback
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onDestroy() {
|
||||||
|
super.onDestroy()
|
||||||
|
viewModel.searchFinishCallback = null
|
||||||
|
}
|
||||||
|
|
||||||
private fun showTitle() {
|
private fun showTitle() {
|
||||||
binding.toolBar.title = viewModel.name
|
binding.toolBar.title = viewModel.name
|
||||||
binding.toolBar.subtitle = viewModel.author
|
binding.toolBar.subtitle = viewModel.author
|
||||||
|
@ -31,6 +31,7 @@ import kotlinx.coroutines.Job
|
|||||||
import kotlinx.coroutines.asCoroutineDispatcher
|
import kotlinx.coroutines.asCoroutineDispatcher
|
||||||
import kotlinx.coroutines.channels.awaitClose
|
import kotlinx.coroutines.channels.awaitClose
|
||||||
import kotlinx.coroutines.coroutineScope
|
import kotlinx.coroutines.coroutineScope
|
||||||
|
import kotlinx.coroutines.ensureActive
|
||||||
import kotlinx.coroutines.flow.callbackFlow
|
import kotlinx.coroutines.flow.callbackFlow
|
||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.collect
|
import kotlinx.coroutines.flow.collect
|
||||||
@ -214,6 +215,7 @@ open class ChangeBookSourceViewModel(application: Application) : BaseViewModel(a
|
|||||||
}
|
}
|
||||||
}.onCompletion {
|
}.onCompletion {
|
||||||
searchStateData.postValue(false)
|
searchStateData.postValue(false)
|
||||||
|
ensureActive()
|
||||||
searchFinishCallback?.invoke(searchBooks.isEmpty())
|
searchFinishCallback?.invoke(searchBooks.isEmpty())
|
||||||
}.catch {
|
}.catch {
|
||||||
AppLog.put("换源搜索出错\n${it.localizedMessage}", it)
|
AppLog.put("换源搜索出错\n${it.localizedMessage}", it)
|
||||||
|
@ -89,7 +89,7 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c
|
|||||||
val searchGroup = AppConfig.searchGroup
|
val searchGroup = AppConfig.searchGroup
|
||||||
if (searchGroup.isNotEmpty()) {
|
if (searchGroup.isNotEmpty()) {
|
||||||
lifecycleScope.launch {
|
lifecycleScope.launch {
|
||||||
alert("搜索结果为空") {
|
context?.alert("搜索结果为空") {
|
||||||
setMessage("${searchGroup}分组搜索结果为空,是否切换到全部分组")
|
setMessage("${searchGroup}分组搜索结果为空,是否切换到全部分组")
|
||||||
noButton()
|
noButton()
|
||||||
yesButton {
|
yesButton {
|
||||||
@ -128,6 +128,11 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onDestroy() {
|
||||||
|
super.onDestroy()
|
||||||
|
viewModel.searchFinishCallback = null
|
||||||
|
}
|
||||||
|
|
||||||
private fun showTitle() {
|
private fun showTitle() {
|
||||||
binding.toolBar.title = viewModel.chapterTitle
|
binding.toolBar.title = viewModel.chapterTitle
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user