去除检查书源调试信息配置

pull/1259/head
gedoor 3 years ago
parent 24d6894bb9
commit c2fa7c4ea1
  1. 7
      app/src/main/java/io/legado/app/service/CheckSourceService.kt
  2. 10
      app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt

@ -30,7 +30,6 @@ class CheckSourceService : BaseService() {
private val checkedIds = ArrayList<String>() private val checkedIds = ArrayList<String>()
private var processIndex = 0 private var processIndex = 0
private var notificationMsg = "" private var notificationMsg = ""
private val showCheckSourceMessage = AppConfig.checkSourceMessage
private val notificationBuilder by lazy { private val notificationBuilder by lazy {
NotificationCompat.Builder(this, AppConst.channelIdReadAloud) NotificationCompat.Builder(this, AppConst.channelIdReadAloud)
.setSmallIcon(R.drawable.ic_network_check) .setSmallIcon(R.drawable.ic_network_check)
@ -109,9 +108,7 @@ class CheckSourceService : BaseService() {
fun check(source: BookSource) { fun check(source: BookSource) {
execute(context = searchCoroutine) { execute(context = searchCoroutine) {
if (showCheckSourceMessage) {
Debug.startChecking(source) Debug.startChecking(source)
}
val webBook = WebBook(source) val webBook = WebBook(source)
var books = webBook.searchBookAwait(this, CheckSource.keyword) var books = webBook.searchBookAwait(this, CheckSource.keyword)
if (books.isEmpty()) { if (books.isEmpty()) {
@ -141,9 +138,7 @@ class CheckSourceService : BaseService() {
"error:${it.localizedMessage} "error:${it.localizedMessage}
${source.bookSourceComment}" ${source.bookSourceComment}"
""".trimIndent() """.trimIndent()
if (showCheckSourceMessage) {
Debug.updateFinalMessage(source.bookSourceUrl, "失败") Debug.updateFinalMessage(source.bookSourceUrl, "失败")
}
appDb.bookSourceDao.update(source) appDb.bookSourceDao.update(source)
}.onSuccess(searchCoroutine) { }.onSuccess(searchCoroutine) {
source.removeGroup("失效") source.removeGroup("失效")
@ -152,9 +147,7 @@ class CheckSourceService : BaseService() {
?.filterNot { ?.filterNot {
it.startsWith("error:") it.startsWith("error:")
}?.joinToString("\n") }?.joinToString("\n")
if (showCheckSourceMessage) {
Debug.updateFinalMessage(source.bookSourceUrl, "成功") Debug.updateFinalMessage(source.bookSourceUrl, "成功")
}
appDb.bookSourceDao.update(source) appDb.bookSourceDao.update(source)
}.onFinally(searchCoroutine) { }.onFinally(searchCoroutine) {
onNext(source.bookSourceUrl, source.bookSourceName) onNext(source.bookSourceUrl, source.bookSourceName)

@ -341,10 +341,8 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
} }
} }
CheckSource.start(this@BookSourceActivity, adapter.selection) CheckSource.start(this@BookSourceActivity, adapter.selection)
if(AppConfig.checkSourceMessage) {
checkMessageRefreshJob().start() checkMessageRefreshJob().start()
} }
}
noButton() noButton()
}.show() }.show()
} }
@ -436,10 +434,12 @@ class BookSourceActivity : VMBaseActivity<ActivityBookSourceBinding, BookSourceV
.make(binding.root, msg, Snackbar.LENGTH_INDEFINITE) .make(binding.root, msg, Snackbar.LENGTH_INDEFINITE)
.setAction(R.string.cancel) { .setAction(R.string.cancel) {
CheckSource.stop(this) CheckSource.stop(this)
if (AppConfig.checkSourceMessage) {
Debug.finishChecking() Debug.finishChecking()
adapter.notifyItemRangeChanged(0, adapter.itemCount, bundleOf(Pair("checkSourceMessage", null))) adapter.notifyItemRangeChanged(
} 0,
adapter.itemCount,
bundleOf(Pair("checkSourceMessage", null))
)
}.apply { show() } }.apply { show() }
} }
} }

Loading…
Cancel
Save