From 63d607842d43ae210785c845acab521d6309109b Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 16 Mar 2022 08:38:42 +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/App.kt | 19 ++++++++++++++- .../legado/app/ui/welcome/WelcomeActivity.kt | 23 ------------------- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/app/src/main/java/io/legado/app/App.kt b/app/src/main/java/io/legado/app/App.kt index cb6a62b6a..679abf150 100644 --- a/app/src/main/java/io/legado/app/App.kt +++ b/app/src/main/java/io/legado/app/App.kt @@ -21,6 +21,7 @@ import io.legado.app.help.config.AppConfig import io.legado.app.help.config.ThemeConfig.applyDayNight import io.legado.app.help.coroutine.Coroutine import io.legado.app.help.http.cronet.CronetLoader +import io.legado.app.help.storage.AppWebDav import io.legado.app.model.BookCover import io.legado.app.utils.defaultSharedPreferences import io.legado.app.utils.getPrefBoolean @@ -55,7 +56,23 @@ class App : MultiDexApplication() { when (AppConfig.chineseConverterType) { 1 -> ChineseUtils.t2s("初始化") 2 -> ChineseUtils.s2t("初始化") - else -> null + } + //同步阅读记录 + if (!AppConfig.syncBookProgress) return@async + val books = appDb.bookDao.all + books.forEach { book -> + AppWebDav.getBookProgress(book)?.let { bookProgress -> + if (bookProgress.durChapterIndex > book.durChapterIndex || + (bookProgress.durChapterIndex == book.durChapterIndex && + bookProgress.durChapterPos > book.durChapterPos) + ) { + book.durChapterIndex = bookProgress.durChapterIndex + book.durChapterPos = bookProgress.durChapterPos + book.durChapterTitle = bookProgress.durChapterTitle + book.durChapterTime = bookProgress.durChapterTime + appDb.bookDao.update(book) + } + } } } } diff --git a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt index 5f2feefe6..cc98722d7 100644 --- a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt +++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt @@ -6,12 +6,8 @@ import android.os.Bundle import io.legado.app.base.BaseActivity import io.legado.app.constant.PreferKey import io.legado.app.constant.Theme -import io.legado.app.data.appDb import io.legado.app.databinding.ActivityWelcomeBinding -import io.legado.app.help.config.AppConfig import io.legado.app.help.config.ThemeConfig -import io.legado.app.help.coroutine.Coroutine -import io.legado.app.help.storage.AppWebDav import io.legado.app.lib.theme.accentColor import io.legado.app.lib.theme.backgroundColor import io.legado.app.ui.book.read.ReadBookActivity @@ -26,25 +22,6 @@ open class WelcomeActivity : BaseActivity() { override fun onActivityCreated(savedInstanceState: Bundle?) { binding.ivBook.setColorFilter(accentColor) binding.vwTitleLine.setBackgroundColor(accentColor) - Coroutine.async { - //同步阅读记录 - if (!AppConfig.syncBookProgress) return@async - val books = appDb.bookDao.all - books.forEach { book -> - AppWebDav.getBookProgress(book)?.let { bookProgress -> - if (bookProgress.durChapterIndex > book.durChapterIndex || - (bookProgress.durChapterIndex == book.durChapterIndex && - bookProgress.durChapterPos > book.durChapterPos) - ) { - book.durChapterIndex = bookProgress.durChapterIndex - book.durChapterPos = bookProgress.durChapterPos - book.durChapterTitle = bookProgress.durChapterTitle - book.durChapterTime = bookProgress.durChapterTime - appDb.bookDao.update(book) - } - } - } - } // 避免从桌面启动程序后,会重新实例化入口类的activity if (intent.flags and Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT != 0) { finish()