From ad5fd8fb28c3ebeb6dbdd55c6d629d772e198ddf Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 23 Aug 2019 18:18:01 +0800 Subject: [PATCH] up --- .../app/ui/readbook/ReadBookActivity.kt | 35 ++++++++++++++++--- .../io/legado/app/ui/readbook/ReadMenu.kt | 3 +- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt index 8e16368ac..94b4cb37e 100644 --- a/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/readbook/ReadBookActivity.kt @@ -1,5 +1,8 @@ package io.legado.app.ui.readbook +import android.app.Activity +import android.content.Intent +import android.net.Uri import android.os.Bundle import android.view.KeyEvent import android.view.Menu @@ -18,6 +21,7 @@ import io.legado.app.ui.chapterlist.ChapterListActivity import io.legado.app.ui.readbook.config.MoreConfigDialog import io.legado.app.ui.readbook.config.ReadStyleDialog import io.legado.app.ui.replacerule.ReplaceRuleActivity +import io.legado.app.ui.sourceedit.SourceEditActivity import io.legado.app.ui.widget.page.ChapterProvider import io.legado.app.ui.widget.page.PageView import io.legado.app.ui.widget.page.TextChapter @@ -29,6 +33,7 @@ import kotlinx.android.synthetic.main.view_title_bar.* import kotlinx.coroutines.launch import org.jetbrains.anko.sdk27.listeners.onClick import org.jetbrains.anko.startActivity +import org.jetbrains.anko.startActivityForResult class ReadBookActivity : VMBaseActivity(R.layout.activity_read_book), PageView.CallBack, @@ -37,6 +42,7 @@ class ReadBookActivity : VMBaseActivity(R.layout.activity_rea override val viewModel: ReadBookViewModel get() = getViewModel(ReadBookViewModel::class.java) + private val requestCodeEditSource = 111 private var changeSourceDialog: ChangeSourceDialog? = null private var timeElectricityReceiver: TimeElectricityReceiver? = null private var readAloudStatus = Status.STOP @@ -70,18 +76,28 @@ class ReadBookActivity : VMBaseActivity(R.layout.activity_rea private fun initView() { tv_chapter_name.onClick { - + viewModel.bookSource?.let { + startActivityForResult( + requestCodeEditSource, + Pair("data", it.bookSourceUrl) + ) + } } tv_chapter_url.onClick { - + runCatching { + val url = tv_chapter_url.text.toString() + val intent = Intent(Intent.ACTION_VIEW) + intent.data = Uri.parse(url) + startActivity(intent) + } } read_menu.setListener(object : ReadMenu.Callback { - override fun skipToPage(page: Int) { + override fun autoPage() { } - override fun autoPage() { - + override fun skipToPage(page: Int) { + viewModel.durPageIndex = page } override fun skipPreChapter() { @@ -265,4 +281,13 @@ class ReadBookActivity : VMBaseActivity(R.layout.activity_rea } } } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + if (resultCode == Activity.RESULT_OK) { + when (requestCode) { + + } + } + } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/readbook/ReadMenu.kt b/app/src/main/java/io/legado/app/ui/readbook/ReadMenu.kt index 90c228841..6fde199ab 100644 --- a/app/src/main/java/io/legado/app/ui/readbook/ReadMenu.kt +++ b/app/src/main/java/io/legado/app/ui/readbook/ReadMenu.kt @@ -188,10 +188,11 @@ class ReadMenu : FrameLayout { } interface Callback { - fun skipToPage(page: Int) fun autoPage() + fun skipToPage(page: Int) + fun skipPreChapter() fun skipNextChapter()