From a5fc04009ee3ba43d8dccf8f06d6f43ccdad1c0a Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 12 Aug 2022 18:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=8C=89=E8=8F=9C=E5=8D=95=E6=9C=97?= =?UTF-8?q?=E8=AF=BB=E4=BB=8E=E9=80=89=E6=8B=A9=E5=BC=80=E5=A7=8B=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=80=E7=9B=B4=E6=9C=97=E8=AF=BB=E4=B8=8B=E5=8E=BB?= =?UTF-8?q?,=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/model/ReadAloud.kt | 5 +- .../app/service/BaseReadAloudService.kt | 2 +- .../app/ui/book/read/ReadBookActivity.kt | 5 +- .../legado/app/ui/book/read/TextActionMenu.kt | 65 +------------------ .../app/ui/book/read/page/ContentTextView.kt | 4 +- .../legado/app/ui/book/read/page/PageView.kt | 12 +++- .../legado/app/ui/book/read/page/ReadView.kt | 4 ++ 7 files changed, 25 insertions(+), 72 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/ReadAloud.kt b/app/src/main/java/io/legado/app/model/ReadAloud.kt index 513b8fc77..47b404af4 100644 --- a/app/src/main/java/io/legado/app/model/ReadAloud.kt +++ b/app/src/main/java/io/legado/app/model/ReadAloud.kt @@ -38,11 +38,14 @@ object ReadAloud { fun play( context: Context, - play: Boolean = true + play: Boolean = true, + pageIndex: Int = ReadBook.durPageIndex ) { val intent = Intent(context, aloudClass) intent.action = IntentAction.play intent.putExtra("play", play) + intent.putExtra("pageIndex", pageIndex) + context.startService(intent) } diff --git a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt index 55c102686..b1eefc712 100644 --- a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt +++ b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt @@ -102,7 +102,7 @@ abstract class BaseReadAloudService : BaseService(), when (intent?.action) { IntentAction.play -> { textChapter = ReadBook.curTextChapter - pageIndex = ReadBook.durPageIndex + pageIndex = intent.getIntExtra("pageIndex", ReadBook.durPageIndex) newReadAloud( intent.getBooleanExtra("play", true) ) diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index f610bc3a1..db4df3f86 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -609,13 +609,16 @@ class ReadBookActivity : BaseReadBookActivity(), /** * 当前选择的文本 */ - override val selectedText: String get() = binding.readView.curPage.selectedText + override val selectedText: String get() = binding.readView.getSelectText() /** * 文本选择菜单操作 */ override fun onMenuItemSelected(itemId: Int): Boolean { when (itemId) { + R.id.menu_aloud -> { + ReadBook.readAloud() + } R.id.menu_bookmark -> binding.readView.curPage.let { val bookmark = it.createBookmark() if (bookmark == null) { diff --git a/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt b/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt index 4dbd6db65..f7cab0bbd 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/TextActionMenu.kt @@ -7,8 +7,6 @@ import android.content.Intent import android.content.pm.ResolveInfo import android.net.Uri import android.os.Build -import android.speech.tts.TextToSpeech -import android.speech.tts.UtteranceProgressListener import android.view.* import android.widget.PopupWindow import androidx.annotation.RequiresApi @@ -22,13 +20,11 @@ import io.legado.app.base.adapter.RecyclerAdapter import io.legado.app.constant.PreferKey import io.legado.app.databinding.ItemTextBinding import io.legado.app.databinding.PopupActionMenuBinding -import io.legado.app.service.BaseReadAloudService import io.legado.app.utils.* @SuppressLint("RestrictedApi") class TextActionMenu(private val context: Context, private val callBack: CallBack) : - PopupWindow(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT), - TextToSpeech.OnInitListener { + PopupWindow(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) { private val binding = PopupActionMenuBinding.inflate(LayoutInflater.from(context)) private val adapter = Adapter(context).apply { @@ -37,9 +33,6 @@ class TextActionMenu(private val context: Context, private val callBack: CallBac private val menuItems: List private val visibleMenuItems = arrayListOf() private val moreMenuItems = arrayListOf() - private val ttsListener by lazy { - TTSUtteranceListener() - } private val expandTextMenu get() = context.getPrefBoolean(PreferKey.expandTextMenu) init { @@ -194,13 +187,6 @@ class TextActionMenu(private val context: Context, private val callBack: CallBac when (item.itemId) { R.id.menu_copy -> context.sendToClip(callBack.selectedText) R.id.menu_share_str -> context.share(callBack.selectedText) - R.id.menu_aloud -> { - if (BaseReadAloudService.isRun) { - context.toastOnUi(R.string.alouding_disable) - return - } - readAloud(callBack.selectedText) - } R.id.menu_browser -> { kotlin.runCatching { val intent = if (callBack.selectedText.isAbsUrl()) { @@ -227,38 +213,6 @@ class TextActionMenu(private val context: Context, private val callBack: CallBac } } - private var textToSpeech: TextToSpeech? = null - private var ttsInitFinish = false - private var lastText: String = "" - - @SuppressLint("SetJavaScriptEnabled") - private fun readAloud(text: String) { - lastText = text - if (textToSpeech == null) { - textToSpeech = TextToSpeech(context, this).apply { - setOnUtteranceProgressListener(ttsListener) - } - return - } - if (!ttsInitFinish) return - if (text == "") return - if (textToSpeech?.isSpeaking == true) { - textToSpeech?.stop() - } - textToSpeech?.speak(text, TextToSpeech.QUEUE_ADD, null, "select_text") - lastText = "" - } - - @Synchronized - override fun onInit(status: Int) { - if (status == TextToSpeech.SUCCESS) { - ttsInitFinish = true - readAloud(lastText) - } else { - context.toastOnUi(R.string.tts_init_failed) - } - } - @RequiresApi(Build.VERSION_CODES.M) private fun createProcessTextIntent(): Intent { return Intent() @@ -299,23 +253,6 @@ class TextActionMenu(private val context: Context, private val callBack: CallBac } } - private inner class TTSUtteranceListener : UtteranceProgressListener() { - - override fun onStart(utteranceId: String?) { - - } - - override fun onDone(utteranceId: String?) { - textToSpeech?.shutdown() - textToSpeech = null - } - - @Deprecated("Deprecated in Java") - override fun onError(utteranceId: String?) { - - } - } - interface CallBack { val selectedText: String diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt index a0cdb0f34..37dc46140 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/ContentTextView.kt @@ -40,8 +40,8 @@ class ContentTextView(context: Context, attrs: AttributeSet?) : View(context, at } private var callBack: CallBack private val visibleRect = RectF() - private val selectStart = TextPos(0, 0, 0) - private val selectEnd = TextPos(0, 0, 0) + val selectStart = TextPos(0, 0, 0) + val selectEnd = TextPos(0, 0, 0) var textPage: TextPage = TextPage() private set diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt index 5d9e1b463..5dfb51162 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt @@ -6,7 +6,6 @@ import android.view.LayoutInflater import android.widget.FrameLayout import androidx.core.view.isGone import androidx.core.view.isInvisible -import io.legado.app.R import io.legado.app.constant.AppConst.timeFormat import io.legado.app.data.entities.Bookmark import io.legado.app.databinding.ViewBookPageBinding @@ -15,9 +14,13 @@ import io.legado.app.help.config.ReadTipConfig import io.legado.app.model.ReadBook import io.legado.app.ui.book.read.ReadBookActivity import io.legado.app.ui.book.read.page.entities.TextPage +import io.legado.app.ui.book.read.page.entities.TextPos import io.legado.app.ui.book.read.page.provider.ChapterProvider import io.legado.app.ui.widget.BatteryView -import io.legado.app.utils.* +import io.legado.app.utils.activity +import io.legado.app.utils.dpToPx +import io.legado.app.utils.statusBarHeight +import io.legado.app.utils.visible import splitties.views.backgroundColor import java.util.* @@ -308,7 +311,10 @@ class PageView(context: Context) : FrameLayout(context) { return binding.contentTextView.relativePage(relativePagePos) } + val textPage get() = binding.contentTextView.textPage + + val selectStart: TextPos get() = binding.contentTextView.selectStart + val selectedText: String get() = binding.contentTextView.getSelectedText() - val textPage get() = binding.contentTextView.textPage } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt index 60ef6b29b..afe9a4deb 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/ReadView.kt @@ -531,6 +531,10 @@ class ReadView(context: Context, attrs: AttributeSet) : nextPage.upBattery(battery) } + fun getSelectText(): String { + return curPage.selectedText + } + override val currentChapter: TextChapter? get() { return if (callBack.isInitFinish) ReadBook.textChapter(0) else null