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 6f8fac6eb..9f1fd01ed 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 @@ -2,7 +2,6 @@ package io.legado.app.ui.book.read.page import android.annotation.SuppressLint import android.content.Context -import android.graphics.Bitmap import android.graphics.drawable.Drawable import android.view.LayoutInflater import android.widget.FrameLayout @@ -14,7 +13,6 @@ import io.legado.app.data.entities.Bookmark import io.legado.app.databinding.ViewBookPageBinding import io.legado.app.help.config.ReadBookConfig import io.legado.app.help.config.ReadTipConfig -import io.legado.app.help.coroutine.Coroutine import io.legado.app.model.ReadBook import io.legado.app.ui.book.read.ReadBookActivity import io.legado.app.ui.book.read.page.entities.TextPage @@ -42,7 +40,6 @@ class PageView(context: Context) : FrameLayout(context) { private var tvBookName: BatteryView? = null private var tvTimeBattery: BatteryView? = null private var tvTimeBatteryP: BatteryView? = null - private var bitmap: Bitmap? = null val headerHeight: Int get() { @@ -62,21 +59,6 @@ class PageView(context: Context) : FrameLayout(context) { } } - fun getBitmap(): Bitmap? { - return bitmap?.copy(Bitmap.Config.ARGB_8888, false) - } - - private fun upBitmap() { - post { - Coroutine.async { - screenshot() - }.onSuccess { - bitmap?.recycle() - bitmap = screenshot() - } - } - } - fun upStyle() = binding.run { upTipStyle() ReadBookConfig.let { @@ -243,7 +225,6 @@ class PageView(context: Context) : FrameLayout(context) { val time = timeFormat.format(Date(System.currentTimeMillis())) tvTimeBattery?.setBattery(battery, time) tvTimeBatteryP?.text = "$time $battery%" - upBitmap() } fun setContent(textPage: TextPage, resetPageOffset: Boolean = true) { @@ -252,7 +233,6 @@ class PageView(context: Context) : FrameLayout(context) { resetPageOffset() } binding.contentTextView.setContent(textPage) - upBitmap() } fun setContentDescription(content: String) { diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt index 737c238c6..0d70b03f2 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/page/delegate/HorizontalPageDelegate.kt @@ -4,6 +4,7 @@ import android.graphics.Bitmap import android.view.MotionEvent import io.legado.app.ui.book.read.page.ReadView import io.legado.app.ui.book.read.page.entities.PageDirection +import io.legado.app.utils.screenshot abstract class HorizontalPageDelegate(readView: ReadView) : PageDelegate(readView) { @@ -20,15 +21,15 @@ abstract class HorizontalPageDelegate(readView: ReadView) : PageDelegate(readVie when (mDirection) { PageDirection.PREV -> { prevBitmap?.recycle() - prevBitmap = prevPage.getBitmap() + prevBitmap = prevPage.screenshot() curBitmap?.recycle() - curBitmap = curPage.getBitmap() + curBitmap = curPage.screenshot() } PageDirection.NEXT -> { nextBitmap?.recycle() - nextBitmap = nextPage.getBitmap() + nextBitmap = nextPage.screenshot() curBitmap?.recycle() - curBitmap = curPage.getBitmap() + curBitmap = curPage.screenshot() } else -> Unit }