From 870c3968f0baf6ffb6db12bfae1c66f2ef4941e5 Mon Sep 17 00:00:00 2001 From: Celeter Date: Sat, 26 Oct 2019 13:43:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E6=8A=A5=E9=94=99=20=E4=B9=A6=E6=BA=90=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=AF=E7=94=A8/=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E6=89=80=E9=80=89=E5=8F=91=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/data/dao/BookSourceDao.kt | 6 ++++++ .../java/io/legado/app/data/entities/RssArticle.kt | 2 +- .../app/ui/book/source/manage/BookSourceActivity.kt | 2 ++ .../app/ui/book/source/manage/BookSourceViewModel.kt | 12 ++++++++++++ app/src/main/res/menu/book_source.xml | 10 ++++++++++ app/src/main/res/values/strings.xml | 2 ++ 6 files changed, 33 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt index d2b48fa49..5bb45145a 100644 --- a/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt +++ b/app/src/main/java/io/legado/app/data/dao/BookSourceDao.kt @@ -35,6 +35,12 @@ interface BookSourceDao { @Query("update book_sources set enabled = 0 where bookSourceUrl in (:sourceUrls)") fun disableSection(vararg sourceUrls: String) + @Query("update book_sources set enabledExplore = 1 where bookSourceUrl in (:sourceUrls)") + fun enableSectionExplore(vararg sourceUrls: String) + + @Query("update book_sources set enabledExplore = 0 where bookSourceUrl in (:sourceUrls)") + fun disableSectionExplore(vararg sourceUrls: String) + @Query("delete from book_sources where bookSourceUrl in (:sourceUrls)") fun delSection(vararg sourceUrls: String) diff --git a/app/src/main/java/io/legado/app/data/entities/RssArticle.kt b/app/src/main/java/io/legado/app/data/entities/RssArticle.kt index b44949155..d3f800bb0 100644 --- a/app/src/main/java/io/legado/app/data/entities/RssArticle.kt +++ b/app/src/main/java/io/legado/app/data/entities/RssArticle.kt @@ -13,7 +13,7 @@ data class RssArticle( var title: String = "", var order: Long = 0, var author: String? = null, - var link: String? = null, + var link: String = "", var pubDate: String? = null, var description: String? = null, var content: String? = null, diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index ec1359b63..e46feafad 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -86,6 +86,8 @@ class BookSourceActivity : VMBaseActivity(R.layout.activity R.id.menu_revert_selection -> adapter.revertSelection() R.id.menu_enable_selection -> viewModel.enableSelection(adapter.getSelectionIds()) R.id.menu_disable_selection -> viewModel.disableSelection(adapter.getSelectionIds()) + R.id.menu_enable_explore -> viewModel.enableSelectExplore(adapter.getSelectionIds()) + R.id.menu_disable_explore -> viewModel.disableSelectExplore(adapter.getSelectionIds()) R.id.menu_del_selection -> viewModel.delSelection(adapter.getSelectionIds()) R.id.menu_check_source -> startService(Pair("data", adapter.getSelectionIds())) diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt index 7a3b5bb91..fe366dae4 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceViewModel.kt @@ -52,6 +52,18 @@ class BookSourceViewModel(application: Application) : BaseViewModel(application) } } + fun enableSelectExplore(ids: LinkedHashSet) { + execute { + App.db.bookSourceDao().enableSectionExplore(*ids.toTypedArray()) + } + } + + fun disableSelectExplore(ids: LinkedHashSet) { + execute { + App.db.bookSourceDao().disableSectionExplore(*ids.toTypedArray()) + } + } + fun delSelection(ids: LinkedHashSet) { execute { App.db.bookSourceDao().delSection(*ids.toTypedArray()) diff --git a/app/src/main/res/menu/book_source.xml b/app/src/main/res/menu/book_source.xml index 1aa312bc4..3aacc98b3 100644 --- a/app/src/main/res/menu/book_source.xml +++ b/app/src/main/res/menu/book_source.xml @@ -32,6 +32,16 @@ android:title="@string/disable_selection" app:showAsAction="never" /> + + + + 添加分组 新建替换 分组 + 启用所选发现 + 禁用所选发现 启用所选 禁用所选 TTS