From 93ecd73b7f0c14c608704a12b8d80243837cd3cf Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Fri, 3 Sep 2021 22:30:54 +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/src/main/java/io/legado/app/help/CrashHandler.kt          | 2 +-
 .../java/io/legado/app/{service/help => model}/AudioPlay.kt   | 2 +-
 .../java/io/legado/app/{service/help => model}/CacheBook.kt   | 3 +--
 .../java/io/legado/app/{service/help => model}/CheckSource.kt | 2 +-
 .../java/io/legado/app/{service/help => model}/Download.kt    | 2 +-
 .../java/io/legado/app/{service/help => model}/ReadAloud.kt   | 2 +-
 app/src/main/java/io/legado/app/model/ReadBook.kt             | 2 --
 .../main/java/io/legado/app/receiver/MediaButtonReceiver.kt   | 4 ++--
 app/src/main/java/io/legado/app/service/AudioPlayService.kt   | 4 ++--
 .../main/java/io/legado/app/service/BaseReadAloudService.kt   | 2 +-
 app/src/main/java/io/legado/app/service/CacheBookService.kt   | 2 +-
 app/src/main/java/io/legado/app/service/CheckSourceService.kt | 2 +-
 .../main/java/io/legado/app/service/HttpReadAloudService.kt   | 2 +-
 .../java/io/legado/app/ui/book/audio/AudioPlayActivity.kt     | 2 +-
 .../java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt    | 2 +-
 .../main/java/io/legado/app/ui/book/cache/CacheActivity.kt    | 2 +-
 app/src/main/java/io/legado/app/ui/book/cache/CacheAdapter.kt | 2 +-
 .../main/java/io/legado/app/ui/book/read/ReadBookActivity.kt  | 2 +-
 .../java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt   | 2 +-
 .../main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt | 2 +-
 .../java/io/legado/app/ui/book/read/config/AutoReadDialog.kt  | 2 +-
 .../legado/app/ui/book/read/config/ReadAloudConfigDialog.kt   | 2 +-
 .../java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt | 2 +-
 .../io/legado/app/ui/book/read/config/SpeakEngineDialog.kt    | 2 +-
 .../io/legado/app/ui/book/source/manage/BookSourceActivity.kt | 2 +-
 app/src/main/java/io/legado/app/ui/main/MainViewModel.kt      | 2 +-
 .../main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt    | 2 +-
 27 files changed, 28 insertions(+), 31 deletions(-)
 rename app/src/main/java/io/legado/app/{service/help => model}/AudioPlay.kt (99%)
 rename app/src/main/java/io/legado/app/{service/help => model}/CacheBook.kt (97%)
 rename app/src/main/java/io/legado/app/{service/help => model}/CheckSource.kt (96%)
 rename app/src/main/java/io/legado/app/{service/help => model}/Download.kt (94%)
 rename app/src/main/java/io/legado/app/{service/help => model}/ReadAloud.kt (98%)

diff --git a/app/src/main/java/io/legado/app/help/CrashHandler.kt b/app/src/main/java/io/legado/app/help/CrashHandler.kt
index b518d276f..94f8b7d02 100644
--- a/app/src/main/java/io/legado/app/help/CrashHandler.kt
+++ b/app/src/main/java/io/legado/app/help/CrashHandler.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Build
 import android.util.Log
-import io.legado.app.service.help.ReadAloud
+import io.legado.app.model.ReadAloud
 import io.legado.app.utils.FileUtils
 import io.legado.app.utils.longToastOnUi
 import io.legado.app.utils.msg
diff --git a/app/src/main/java/io/legado/app/service/help/AudioPlay.kt b/app/src/main/java/io/legado/app/model/AudioPlay.kt
similarity index 99%
rename from app/src/main/java/io/legado/app/service/help/AudioPlay.kt
rename to app/src/main/java/io/legado/app/model/AudioPlay.kt
index fa3f83e38..21d42c5d3 100644
--- a/app/src/main/java/io/legado/app/service/help/AudioPlay.kt
+++ b/app/src/main/java/io/legado/app/model/AudioPlay.kt
@@ -1,4 +1,4 @@
-package io.legado.app.service.help
+package io.legado.app.model
 
 import android.content.Context
 import android.content.Intent
diff --git a/app/src/main/java/io/legado/app/service/help/CacheBook.kt b/app/src/main/java/io/legado/app/model/CacheBook.kt
similarity index 97%
rename from app/src/main/java/io/legado/app/service/help/CacheBook.kt
rename to app/src/main/java/io/legado/app/model/CacheBook.kt
index d520ef48c..1b34170ee 100644
--- a/app/src/main/java/io/legado/app/service/help/CacheBook.kt
+++ b/app/src/main/java/io/legado/app/model/CacheBook.kt
@@ -1,4 +1,4 @@
-package io.legado.app.service.help
+package io.legado.app.model
 
 import android.content.Context
 import io.legado.app.R
@@ -6,7 +6,6 @@ import io.legado.app.constant.IntentAction
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.data.entities.BookSource
-import io.legado.app.model.ReadBook
 import io.legado.app.model.webBook.WebBook
 import io.legado.app.service.CacheBookService
 import io.legado.app.utils.msg
diff --git a/app/src/main/java/io/legado/app/service/help/CheckSource.kt b/app/src/main/java/io/legado/app/model/CheckSource.kt
similarity index 96%
rename from app/src/main/java/io/legado/app/service/help/CheckSource.kt
rename to app/src/main/java/io/legado/app/model/CheckSource.kt
index 1c00d5f77..a938c48d2 100644
--- a/app/src/main/java/io/legado/app/service/help/CheckSource.kt
+++ b/app/src/main/java/io/legado/app/model/CheckSource.kt
@@ -1,4 +1,4 @@
-package io.legado.app.service.help
+package io.legado.app.model
 
 import android.content.Context
 import io.legado.app.R
diff --git a/app/src/main/java/io/legado/app/service/help/Download.kt b/app/src/main/java/io/legado/app/model/Download.kt
similarity index 94%
rename from app/src/main/java/io/legado/app/service/help/Download.kt
rename to app/src/main/java/io/legado/app/model/Download.kt
index 1a5fcd657..9a1cb907f 100644
--- a/app/src/main/java/io/legado/app/service/help/Download.kt
+++ b/app/src/main/java/io/legado/app/model/Download.kt
@@ -1,4 +1,4 @@
-package io.legado.app.service.help
+package io.legado.app.model
 
 import android.content.Context
 import io.legado.app.constant.IntentAction
diff --git a/app/src/main/java/io/legado/app/service/help/ReadAloud.kt b/app/src/main/java/io/legado/app/model/ReadAloud.kt
similarity index 98%
rename from app/src/main/java/io/legado/app/service/help/ReadAloud.kt
rename to app/src/main/java/io/legado/app/model/ReadAloud.kt
index fb0b71804..85ef28a20 100644
--- a/app/src/main/java/io/legado/app/service/help/ReadAloud.kt
+++ b/app/src/main/java/io/legado/app/model/ReadAloud.kt
@@ -1,4 +1,4 @@
-package io.legado.app.service.help
+package io.legado.app.model
 
 import android.content.Context
 import android.content.Intent
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 4be4dcb5e..b0381fee2 100644
--- a/app/src/main/java/io/legado/app/model/ReadBook.kt
+++ b/app/src/main/java/io/legado/app/model/ReadBook.kt
@@ -10,8 +10,6 @@ import io.legado.app.help.coroutine.Coroutine
 import io.legado.app.help.storage.AppWebDav
 import io.legado.app.model.webBook.WebBook
 import io.legado.app.service.BaseReadAloudService
-import io.legado.app.service.help.CacheBook
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.read.page.entities.TextChapter
 import io.legado.app.ui.book.read.page.provider.ChapterProvider
 import io.legado.app.ui.book.read.page.provider.ImageProvider
diff --git a/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt b/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt
index 9e00499d2..18f8dce68 100644
--- a/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt
+++ b/app/src/main/java/io/legado/app/receiver/MediaButtonReceiver.kt
@@ -8,11 +8,11 @@ import io.legado.app.constant.EventBus
 import io.legado.app.data.appDb
 import io.legado.app.help.AppConfig
 import io.legado.app.help.LifecycleHelp
+import io.legado.app.model.AudioPlay
+import io.legado.app.model.ReadAloud
 import io.legado.app.model.ReadBook
 import io.legado.app.service.AudioPlayService
 import io.legado.app.service.BaseReadAloudService
-import io.legado.app.service.help.AudioPlay
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.audio.AudioPlayActivity
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.main.MainActivity
diff --git a/app/src/main/java/io/legado/app/service/AudioPlayService.kt b/app/src/main/java/io/legado/app/service/AudioPlayService.kt
index 78f5dc7e4..6dc7cbbd5 100644
--- a/app/src/main/java/io/legado/app/service/AudioPlayService.kt
+++ b/app/src/main/java/io/legado/app/service/AudioPlayService.kt
@@ -29,11 +29,11 @@ import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.ExoPlayerHelper
 import io.legado.app.help.IntentHelp
 import io.legado.app.help.MediaHelp
+import io.legado.app.model.AudioPlay
+import io.legado.app.model.ReadAloud
 import io.legado.app.model.analyzeRule.AnalyzeUrl
 import io.legado.app.model.webBook.WebBook
 import io.legado.app.receiver.MediaButtonReceiver
-import io.legado.app.service.help.AudioPlay
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.audio.AudioPlayActivity
 import io.legado.app.utils.postEvent
 import io.legado.app.utils.toastOnUi
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 b554e0891..c2fec03c0 100644
--- a/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/BaseReadAloudService.kt
@@ -19,9 +19,9 @@ import io.legado.app.constant.*
 import io.legado.app.help.IntentDataHelp
 import io.legado.app.help.IntentHelp
 import io.legado.app.help.MediaHelp
+import io.legado.app.model.ReadAloud
 import io.legado.app.model.ReadBook
 import io.legado.app.receiver.MediaButtonReceiver
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.book.read.page.entities.TextChapter
 import io.legado.app.utils.getPrefBoolean
diff --git a/app/src/main/java/io/legado/app/service/CacheBookService.kt b/app/src/main/java/io/legado/app/service/CacheBookService.kt
index 4987d44e5..dde185763 100644
--- a/app/src/main/java/io/legado/app/service/CacheBookService.kt
+++ b/app/src/main/java/io/legado/app/service/CacheBookService.kt
@@ -16,8 +16,8 @@ import io.legado.app.help.BookHelp
 import io.legado.app.help.IntentHelp
 import io.legado.app.help.coroutine.CompositeCoroutine
 import io.legado.app.help.coroutine.Coroutine
+import io.legado.app.model.CacheBook
 import io.legado.app.model.webBook.WebBook
-import io.legado.app.service.help.CacheBook
 import io.legado.app.utils.postEvent
 import io.legado.app.utils.toastOnUi
 import kotlinx.coroutines.asCoroutineDispatcher
diff --git a/app/src/main/java/io/legado/app/service/CheckSourceService.kt b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
index 36fa6a442..d266a6268 100644
--- a/app/src/main/java/io/legado/app/service/CheckSourceService.kt
+++ b/app/src/main/java/io/legado/app/service/CheckSourceService.kt
@@ -12,9 +12,9 @@ import io.legado.app.data.entities.BookSource
 import io.legado.app.help.AppConfig
 import io.legado.app.help.IntentHelp
 import io.legado.app.help.coroutine.CompositeCoroutine
+import io.legado.app.model.CheckSource
 import io.legado.app.model.Debug
 import io.legado.app.model.webBook.WebBook
-import io.legado.app.service.help.CheckSource
 import io.legado.app.ui.book.source.manage.BookSourceActivity
 import io.legado.app.utils.postEvent
 import io.legado.app.utils.toastOnUi
diff --git a/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
index 18788fa4a..118309543 100644
--- a/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
+++ b/app/src/main/java/io/legado/app/service/HttpReadAloudService.kt
@@ -6,9 +6,9 @@ import io.legado.app.constant.EventBus
 import io.legado.app.help.AppConfig
 import io.legado.app.help.IntentHelp
 import io.legado.app.help.coroutine.Coroutine
+import io.legado.app.model.ReadAloud
 import io.legado.app.model.ReadBook
 import io.legado.app.model.analyzeRule.AnalyzeUrl
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.utils.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.ensureActive
diff --git a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
index 0e5aa459c..8295927de 100644
--- a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayActivity.kt
@@ -22,8 +22,8 @@ import io.legado.app.databinding.ActivityAudioPlayBinding
 import io.legado.app.help.BlurTransformation
 import io.legado.app.help.glide.ImageLoader
 import io.legado.app.lib.dialogs.alert
+import io.legado.app.model.AudioPlay
 import io.legado.app.service.AudioPlayService
-import io.legado.app.service.help.AudioPlay
 import io.legado.app.ui.book.changesource.ChangeSourceDialog
 import io.legado.app.ui.book.toc.TocActivityResult
 import io.legado.app.ui.login.SourceLoginActivity
diff --git a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt
index e52d0af61..69cd49f9e 100644
--- a/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/audio/AudioPlayViewModel.kt
@@ -9,8 +9,8 @@ import io.legado.app.data.appDb
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.help.BookHelp
+import io.legado.app.model.AudioPlay
 import io.legado.app.model.webBook.WebBook
-import io.legado.app.service.help.AudioPlay
 import io.legado.app.utils.postEvent
 import io.legado.app.utils.toastOnUi
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
index b0e27b01e..503908fff 100644
--- a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt
@@ -24,7 +24,7 @@ import io.legado.app.help.BookHelp
 import io.legado.app.lib.dialogs.SelectItem
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.selector
-import io.legado.app.service.help.CacheBook
+import io.legado.app.model.CacheBook
 import io.legado.app.ui.document.HandleFileContract
 import io.legado.app.ui.widget.dialog.TextListDialog
 import io.legado.app.utils.*
diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheAdapter.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheAdapter.kt
index b1fddc3e8..923893100 100644
--- a/app/src/main/java/io/legado/app/ui/book/cache/CacheAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheAdapter.kt
@@ -9,7 +9,7 @@ import io.legado.app.base.adapter.RecyclerAdapter
 import io.legado.app.data.entities.Book
 import io.legado.app.data.entities.BookChapter
 import io.legado.app.databinding.ItemDownloadBinding
-import io.legado.app.service.help.CacheBook
+import io.legado.app.model.CacheBook
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.CopyOnWriteArraySet
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 7533bf777..9986f3ec9 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
@@ -27,10 +27,10 @@ import io.legado.app.help.storage.Backup
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.dialogs.selector
 import io.legado.app.lib.theme.accentColor
+import io.legado.app.model.ReadAloud
 import io.legado.app.model.ReadBook
 import io.legado.app.receiver.TimeBatteryReceiver
 import io.legado.app.service.BaseReadAloudService
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.changesource.ChangeSourceDialog
 import io.legado.app.ui.book.info.BookInfoActivity
 import io.legado.app.ui.book.read.config.*
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt
index 67a97d58f..b727551ba 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookBaseActivity.kt
@@ -23,8 +23,8 @@ import io.legado.app.lib.dialogs.selector
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.ThemeStore
 import io.legado.app.lib.theme.backgroundColor
+import io.legado.app.model.CacheBook
 import io.legado.app.model.ReadBook
-import io.legado.app.service.help.CacheBook
 import io.legado.app.ui.book.read.config.BgTextConfigDialog
 import io.legado.app.ui.book.read.config.ClickActionConfigDialog
 import io.legado.app.ui.book.read.config.PaddingConfigDialog
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
index 52df7b306..a8fdfdf74 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookViewModel.kt
@@ -14,11 +14,11 @@ import io.legado.app.help.AppConfig
 import io.legado.app.help.BookHelp
 import io.legado.app.help.ContentProcessor
 import io.legado.app.help.storage.AppWebDav
+import io.legado.app.model.ReadAloud
 import io.legado.app.model.ReadBook
 import io.legado.app.model.localBook.LocalBook
 import io.legado.app.model.webBook.WebBook
 import io.legado.app.service.BaseReadAloudService
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.read.page.entities.TextPage
 import io.legado.app.utils.msg
 import io.legado.app.utils.postEvent
diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt
index f2c3e2c6f..6d14cfcad 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/AutoReadDialog.kt
@@ -10,8 +10,8 @@ import io.legado.app.databinding.DialogAutoReadBinding
 import io.legado.app.help.ReadBookConfig
 import io.legado.app.lib.theme.bottomBackground
 import io.legado.app.lib.theme.getPrimaryTextColor
+import io.legado.app.model.ReadAloud
 import io.legado.app.service.BaseReadAloudService
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.book.read.ReadBookBaseActivity
 import io.legado.app.ui.widget.seekbar.SeekBarChangeListener
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 d161a4ede..8c1d0b371 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
@@ -16,8 +16,8 @@ import io.legado.app.constant.PreferKey
 import io.legado.app.data.appDb
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.backgroundColor
+import io.legado.app.model.ReadAloud
 import io.legado.app.service.BaseReadAloudService
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.utils.getPrefLong
 import io.legado.app.utils.postEvent
 import io.legado.app.utils.windowSize
diff --git a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
index ea03b43cf..a785c05b2 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/config/ReadAloudDialog.kt
@@ -11,9 +11,9 @@ import io.legado.app.databinding.DialogReadAloudBinding
 import io.legado.app.help.AppConfig
 import io.legado.app.lib.theme.bottomBackground
 import io.legado.app.lib.theme.getPrimaryTextColor
+import io.legado.app.model.ReadAloud
 import io.legado.app.model.ReadBook
 import io.legado.app.service.BaseReadAloudService
-import io.legado.app.service.help.ReadAloud
 import io.legado.app.ui.book.read.ReadBookActivity
 import io.legado.app.ui.widget.seekbar.SeekBarChangeListener
 import io.legado.app.utils.ColorUtils
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 e8a5bc700..e587879c3 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
@@ -24,7 +24,7 @@ import io.legado.app.databinding.ItemHttpTtsBinding
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.primaryColor
-import io.legado.app.service.help.ReadAloud
+import io.legado.app.model.ReadAloud
 import io.legado.app.ui.document.HandleFileContract
 import io.legado.app.ui.widget.dialog.TextDialog
 import io.legado.app.utils.*
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 c6e52563d..19c696f92 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
@@ -25,8 +25,8 @@ import io.legado.app.help.LocalConfig
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.theme.ATH
 import io.legado.app.lib.theme.primaryTextColor
+import io.legado.app.model.CheckSource
 import io.legado.app.model.Debug
-import io.legado.app.service.help.CheckSource
 import io.legado.app.ui.association.ImportBookSourceDialog
 import io.legado.app.ui.book.source.debug.BookSourceDebugActivity
 import io.legado.app.ui.book.source.edit.BookSourceEditActivity
diff --git a/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt b/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt
index 04e0dda6c..ac6bda9e7 100644
--- a/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/main/MainViewModel.kt
@@ -11,8 +11,8 @@ import io.legado.app.help.AppConfig
 import io.legado.app.help.BookHelp
 import io.legado.app.help.DefaultData
 import io.legado.app.help.LocalConfig
+import io.legado.app.model.CacheBook
 import io.legado.app.model.webBook.WebBook
-import io.legado.app.service.help.CacheBook
 import io.legado.app.utils.postEvent
 import kotlinx.coroutines.asCoroutineDispatcher
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
index c189bc585..64448eb51 100644
--- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
@@ -21,7 +21,7 @@ import io.legado.app.help.AppConfig
 import io.legado.app.lib.dialogs.SelectItem
 import io.legado.app.lib.theme.DrawableUtils
 import io.legado.app.lib.theme.primaryTextColor
-import io.legado.app.service.help.Download
+import io.legado.app.model.Download
 import io.legado.app.ui.association.OnLineImportActivity
 import io.legado.app.ui.document.HandleFileContract
 import io.legado.app.utils.*