From aa1c412a55af97c24af8f0b99419b67ce8438209 Mon Sep 17 00:00:00 2001 From: Administrator <1760316362@qq.com> Date: Thu, 1 Aug 2019 10:43:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ------ .../app/ui/sourcedebug/SourceDebugActivity.kt | 18 ++++++++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 7354986a4..90f626586 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -134,10 +134,4 @@ dependencies { //颜色选择 implementation 'com.jaredrummler:colorpicker:1.1.0' - - //对话框 - implementation 'com.afollestad.material-dialogs:core:3.1.0' - implementation 'com.afollestad.material-dialogs:input:3.1.0' - implementation 'com.afollestad.material-dialogs:files:3.1.0' - } diff --git a/app/src/main/java/io/legado/app/ui/sourcedebug/SourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/sourcedebug/SourceDebugActivity.kt index 82df34f83..644843369 100644 --- a/app/src/main/java/io/legado/app/ui/sourcedebug/SourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/sourcedebug/SourceDebugActivity.kt @@ -6,9 +6,12 @@ import androidx.appcompat.widget.SearchView import androidx.recyclerview.widget.LinearLayoutManager import io.legado.app.R import io.legado.app.base.VMBaseActivity +import io.legado.app.constant.Bus +import io.legado.app.help.EventMessage import io.legado.app.lib.theme.ATH import io.legado.app.lib.theme.ThemeStore import io.legado.app.utils.getViewModel +import io.legado.app.utils.observeEvent import kotlinx.android.synthetic.main.activity_source_debug.* import kotlinx.android.synthetic.main.view_title_bar.* import org.jetbrains.anko.toast @@ -24,12 +27,6 @@ class SourceDebugActivity : VMBaseActivity(R.layout.activity_s viewModel.init(intent.getStringExtra("key")) initRecyclerView() initSearchView() - viewModel.observeLogs(this) { - adapter.addItem(it.obj as String) - if (it.what == -1 || it.what == 1000) { - rotate_loading.hide() - } - } } private fun initRecyclerView() { @@ -66,4 +63,13 @@ class SourceDebugActivity : VMBaseActivity(R.layout.activity_s toast("未获取到书源") }) } + + override fun observeLiveBus() { + observeEvent(Bus.SOURCE_DEBUG_LOG){ + adapter.addItem(it.obj as String) + if (it.what == -1 || it.what == 1000) { + rotate_loading.hide() + } + } + } } \ No newline at end of file