优化校验书源逻辑

pull/408/head
口口吕 6 years ago
parent 4d4c93cb8d
commit 1e1094f678
  1. 1
      app/src/main/java/io/legado/app/constant/EventBus.kt
  2. 2
      app/src/main/java/io/legado/app/service/CheckSourceService.kt
  3. 16
      app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt

@ -20,7 +20,6 @@ object EventBus {
const val WEB_SERVICE_STOP = "webServiceStop" const val WEB_SERVICE_STOP = "webServiceStop"
const val UP_DOWNLOAD = "upDownload" const val UP_DOWNLOAD = "upDownload"
const val SAVE_CONTENT = "saveContent" const val SAVE_CONTENT = "saveContent"
const val CHECK_INIT = "checkInit"
const val CHECK_UP_PROGRESS = "checkProgress" const val CHECK_UP_PROGRESS = "checkProgress"
const val CHECK_UP_PROGRESS_STRING = "checkProgressTxt" const val CHECK_UP_PROGRESS_STRING = "checkProgressTxt"
const val CHECK_DONE = "checkDone" const val CHECK_DONE = "checkDone"

@ -80,8 +80,6 @@ class CheckSourceService : BaseService() {
threadCount = min(allIds.size, threadCount) threadCount = min(allIds.size, threadCount)
if (backgroundVerification) { if (backgroundVerification) {
updateNotification(0, getString(R.string.progress_show, "", 0, allIds.size)) updateNotification(0, getString(R.string.progress_show, "", 0, allIds.size))
} else {
postEvent(EventBus.CHECK_INIT, allIds.size)
} }
for (i in 0 until threadCount) { for (i in 0 until threadCount) {
check() check()

@ -15,6 +15,7 @@ import androidx.lifecycle.LiveData
import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.snackbar.Snackbar
import io.legado.app.App import io.legado.app.App
import io.legado.app.BuildConfig import io.legado.app.BuildConfig
import io.legado.app.R import io.legado.app.R
@ -41,6 +42,7 @@ import io.legado.app.ui.widget.text.AutoCompleteTextView
import io.legado.app.utils.* import io.legado.app.utils.*
import kotlinx.android.synthetic.main.activity_book_source.* import kotlinx.android.synthetic.main.activity_book_source.*
import kotlinx.android.synthetic.main.activity_book_source.recycler_view import kotlinx.android.synthetic.main.activity_book_source.recycler_view
import kotlinx.android.synthetic.main.activity_book_source.title_bar
import kotlinx.android.synthetic.main.dialog_edit_text.view.* import kotlinx.android.synthetic.main.dialog_edit_text.view.*
import kotlinx.android.synthetic.main.dialog_progressbar_view.* import kotlinx.android.synthetic.main.dialog_progressbar_view.*
import kotlinx.android.synthetic.main.dialog_progressbar_view.tv_footer_left import kotlinx.android.synthetic.main.dialog_progressbar_view.tv_footer_left
@ -300,7 +302,12 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
CheckSource.keyword = it CheckSource.keyword = it
} }
} }
val bundle = Bundle()
bundle.putInt("maxProgress", adapter.getSelection().size)
CheckSourceDialog().apply {
arguments = bundle
CheckSource.start(this@BookSourceActivity, adapter.getSelection()) CheckSource.start(this@BookSourceActivity, adapter.getSelection())
}.show(supportFragmentManager, "CheckDialog")
} }
noButton { } noButton { }
}.show().applyTint() }.show().applyTint()
@ -390,18 +397,11 @@ class BookSourceActivity : VMBaseActivity<BookSourceViewModel>(R.layout.activity
} }
override fun observeLiveBus() { override fun observeLiveBus() {
observeEvent<Int>(EventBus.CHECK_INIT) { max->
val bundle = Bundle()
bundle.putInt("maxProgress", max)
CheckSourceDialog().apply {
arguments = bundle
}.show(supportFragmentManager, "CheckDialog")
}
observeEvent<Int>(EventBus.CHECK_DONE) { observeEvent<Int>(EventBus.CHECK_DONE) {
groups.map { group-> groups.map { group->
if (group.contains("失效")) { if (group.contains("失效")) {
search_view.setQuery("失效", true) search_view.setQuery("失效", true)
toast("发现有失效书源,已为您自动筛选!") Snackbar.make(title_bar, "发现有失效书源,已为您自动筛选!", Snackbar.LENGTH_LONG).show()
} }
} }
} }

Loading…
Cancel
Save