From dcac87edc5bb201e698f713b22eca21edb6bf833 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 11 Feb 2022 16:55:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=E9=A6=96=E6=AC=A1=E6=9C=97=E8=AF=BB?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=85=B6=E4=BB=96=E4=B9=A6=E7=9A=84tts?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E4=BE=9D=E7=84=B6=E6=98=AF=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E6=9C=97=E8=AF=BB=E7=9A=84=E5=BC=95=E6=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/model/ReadBook.kt | 1 + .../io/legado/app/ui/book/read/config/HttpTtsEditViewModel.kt | 1 - .../io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/ReadBook.kt b/app/src/main/java/io/legado/app/model/ReadBook.kt index 2af0be2b3..a8e6a9bb1 100644 --- a/app/src/main/java/io/legado/app/model/ReadBook.kt +++ b/app/src/main/java/io/legado/app/model/ReadBook.kt @@ -215,6 +215,7 @@ object ReadBook : CoroutineScope by MainScope() { */ fun readAloud(play: Boolean = true) { book?.let { + ReadAloud.upReadAloudClass() ReadAloud.play(appCtx, play) } } diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditViewModel.kt index ffeee7050..0559b7ff9 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/HttpTtsEditViewModel.kt @@ -37,7 +37,6 @@ class HttpTtsEditViewModel(app: Application) : BaseViewModel(app) { id = httpTTS.id execute { appDb.httpTTSDao.insert(httpTTS) - ReadAloud.upReadAloudClass() }.onSuccess { success?.invoke() } diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt index 2bcd7490a..bec5bd6d8 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt @@ -112,7 +112,6 @@ class ReadAloudConfigDialog : DialogFragment() { } PreferKey.ttsEngine -> { upPreferenceSummary(findPreference(key), speakEngineSummary) - ReadAloud.upReadAloudClass() } } } From 8b615fd4eefc3608dae516b4c53acf3876c6a534 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 11 Feb 2022 17:00:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=E6=9C=97=E8=AF=BB=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=9A=84=E6=9C=97=E8=AF=BB=E5=BC=95?= =?UTF-8?q?=E6=93=8E=E6=98=BE=E7=A4=BA=E7=9A=84=E6=98=AF=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=BC=95=E6=93=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt index bec5bd6d8..016b8975f 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt @@ -60,7 +60,7 @@ class ReadAloudConfigDialog : DialogFragment() { private val speakEngineSummary: String get() { - val ttsEngine = AppConfig.ttsEngine + val ttsEngine = ReadAloud.ttsEngine ?: return getString(R.string.system_tts) if (StringUtils.isNumeric(ttsEngine)) { return appDb.httpTTSDao.getName(ttsEngine.toLong()) From 1801211c86e1b04c5366b314d68261c224e701ce Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 11 Feb 2022 17:11:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E6=9B=B4=E6=94=B9=E5=8D=95=E6=9C=AC?= =?UTF-8?q?=E4=B9=A6=E7=9A=84tts=E5=90=8E=EF=BC=8C=E6=9C=97=E8=AF=BB?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E7=9A=84=E6=9C=97=E8=AF=BB?= =?UTF-8?q?=E5=BC=95=E6=93=8E=E6=B2=A1=E6=9C=89=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/read/config/ReadAloudConfigDialog.kt | 17 +++++++++-------- .../ui/book/read/config/SpeakEngineDialog.kt | 7 ++++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt index 016b8975f..a1d78afc4 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt @@ -56,6 +56,7 @@ class ReadAloudConfigDialog : DialogFragment() { } class ReadAloudPreferenceFragment : BasePreferenceFragment(), + SpeakEngineDialog.CallBack, SharedPreferences.OnSharedPreferenceChangeListener { private val speakEngineSummary: String @@ -72,10 +73,7 @@ class ReadAloudConfigDialog : DialogFragment() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { addPreferencesFromResource(R.xml.pref_config_aloud) - upPreferenceSummary( - findPreference(PreferKey.ttsEngine), - speakEngineSummary - ) + upSpeakEngineSummary() } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -95,7 +93,7 @@ class ReadAloudConfigDialog : DialogFragment() { override fun onPreferenceTreeClick(preference: Preference): Boolean { when (preference.key) { - PreferKey.ttsEngine -> showDialogFragment(SpeakEngineDialog()) + PreferKey.ttsEngine -> showDialogFragment(SpeakEngineDialog(this)) } return super.onPreferenceTreeClick(preference) } @@ -110,9 +108,6 @@ class ReadAloudConfigDialog : DialogFragment() { postEvent(EventBus.MEDIA_BUTTON, false) } } - PreferKey.ttsEngine -> { - upPreferenceSummary(findPreference(key), speakEngineSummary) - } } } @@ -128,5 +123,11 @@ class ReadAloudConfigDialog : DialogFragment() { } } + override fun upSpeakEngineSummary() { + upPreferenceSummary( + findPreference(PreferKey.ttsEngine), + speakEngineSummary + ) + } } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt index 58a91d19f..05dbf478e 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/SpeakEngineDialog.kt @@ -33,7 +33,7 @@ import kotlinx.coroutines.launch /** * tts引擎管理 */ -class SpeakEngineDialog : BaseDialogFragment(R.layout.dialog_recycler_view), +class SpeakEngineDialog(val callBack: CallBack) : BaseDialogFragment(R.layout.dialog_recycler_view), Toolbar.OnMenuItemClickListener { private val binding by viewBinding(DialogRecyclerViewBinding::bind) @@ -104,6 +104,7 @@ class SpeakEngineDialog : BaseDialogFragment(R.layout.dialog_recycler_view), tvFooterLeft.visible() tvFooterLeft.setOnClickListener { ReadBook.book?.setTtsEngine(ttsEngine) + callBack.upSpeakEngineSummary() dismissAllowingStateLoss() } tvOk.setText(R.string.general) @@ -230,4 +231,8 @@ class SpeakEngineDialog : BaseDialogFragment(R.layout.dialog_recycler_view), } + interface CallBack { + fun upSpeakEngineSummary() + } + } \ No newline at end of file From 0b2c8e5eeffba973db55dc3d6935d0c2a2c552ac Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 11 Feb 2022 17:21:44 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=E6=9B=BF=E6=8D=A2=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BAbug,?= =?UTF-8?q?=E9=A2=84=E5=8A=A0=E8=BD=BD=E5=8A=9F=E8=83=BD=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=8A=A0=E8=BD=BD=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/model/ReadBook.kt | 2 +- .../java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/ReadBook.kt b/app/src/main/java/io/legado/app/model/ReadBook.kt index a8e6a9bb1..30e2b86a0 100644 --- a/app/src/main/java/io/legado/app/model/ReadBook.kt +++ b/app/src/main/java/io/legado/app/model/ReadBook.kt @@ -353,7 +353,7 @@ object ReadBook : CoroutineScope by MainScope() { if (chapter.index in durChapterIndex - 1..durChapterIndex + 1) { val contentProcessor = ContentProcessor.get(book.name, book.origin) val displayTitle = chapter.getDisplayTitle( - contentProcessor.getContentReplaceRules(), + contentProcessor.getTitleReplaceRules(), book.getUseReplaceRule() ) val contents = contentProcessor.getContent(book, chapter, content) diff --git a/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt index 4926d7bc1..122a178f6 100644 --- a/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt @@ -110,7 +110,7 @@ class ReplaceEditActivity : replaceRule.isRegex = cbUseRegex.isChecked replaceRule.replacement = etReplaceTo.text.toString() replaceRule.scopeTitle = cbScopeTitle.isChecked - replaceRule.scopeContent = cbScopeTitle.isChecked + replaceRule.scopeContent = cbScopeContent.isChecked replaceRule.scope = etScope.text.toString() return replaceRule } From df45dac52dbe47be0bcafcf38b23549e7d8569c7 Mon Sep 17 00:00:00 2001 From: Xwite <1797350009@qq.com> Date: Fri, 11 Feb 2022 18:00:07 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=85=A8=E5=B1=80tts=E5=BC=95=E6=93=8E?= =?UTF-8?q?=E5=8F=98=E5=8C=96=E5=90=8E=E4=B9=9F=E8=A6=81=E6=94=B9=E5=8F=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt index a1d78afc4..51f3c8be9 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudConfigDialog.kt @@ -108,6 +108,7 @@ class ReadAloudConfigDialog : DialogFragment() { postEvent(EventBus.MEDIA_BUTTON, false) } } + PreferKey.ttsEngine -> upSpeakEngineSummary() } }