优化
This commit is contained in:
@@ -104,6 +104,17 @@ class BookInfoActivity :
|
|||||||
viewModel.upEditBook()
|
viewModel.upEditBook()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private val editSourceResult = registerForActivityResult(
|
||||||
|
StartActivityContract(BookSourceEditActivity::class.java)
|
||||||
|
) {
|
||||||
|
if (it.resultCode == RESULT_CANCELED) {
|
||||||
|
return@registerForActivityResult
|
||||||
|
}
|
||||||
|
book?.let { book ->
|
||||||
|
viewModel.bookSource = appDb.bookSourceDao.getBookSource(book.origin)
|
||||||
|
viewModel.refreshBook(book)
|
||||||
|
}
|
||||||
|
}
|
||||||
private var tocChanged = false
|
private var tocChanged = false
|
||||||
private var chapterChanged = false
|
private var chapterChanged = false
|
||||||
private val waitDialog by lazy { WaitDialog(this) }
|
private val waitDialog by lazy { WaitDialog(this) }
|
||||||
@@ -396,7 +407,7 @@ class BookInfoActivity :
|
|||||||
tvOrigin.setOnClickListener {
|
tvOrigin.setOnClickListener {
|
||||||
viewModel.getBook()?.let { book ->
|
viewModel.getBook()?.let { book ->
|
||||||
if (book.isLocal) return@let
|
if (book.isLocal) return@let
|
||||||
startActivity<BookSourceEditActivity> {
|
editSourceResult.launch {
|
||||||
putExtra("sourceUrl", book.origin)
|
putExtra("sourceUrl", book.origin)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -126,6 +126,11 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
|
|||||||
book.lastCheckTime = remoteBook.lastModify
|
book.lastCheckTime = remoteBook.lastModify
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
val bs = bookSource ?: return@execute
|
||||||
|
if (book.originName != bs.bookSourceName) {
|
||||||
|
book.originName = bs.bookSourceName
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}.onError {
|
}.onError {
|
||||||
when (it) {
|
when (it) {
|
||||||
|
|||||||
Reference in New Issue
Block a user