pull/282/head
gedoor 4 years ago
parent 65e926c7de
commit e09c0c47fa
  1. 4
      app/src/main/java/io/legado/app/service/help/ReadBook.kt
  2. 4
      app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
  3. 5
      app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt

@ -64,6 +64,7 @@ object ReadBook {
null null
} }
} }
callBack?.upPageAnim()
} }
fun upMsg(msg: String?) { fun upMsg(msg: String?) {
@ -356,7 +357,7 @@ object ReadBook {
} }
} }
private val imageStyle get() = webBook?.bookSource?.ruleContent?.imageStyle val imageStyle get() = webBook?.bookSource?.ruleContent?.imageStyle
fun saveRead() { fun saveRead() {
Coroutine.async { Coroutine.async {
@ -378,5 +379,6 @@ object ReadBook {
fun upView() fun upView()
fun pageChanged() fun pageChanged()
fun contentLoadFinish() fun contentLoadFinish()
fun upPageAnim()
} }
} }

@ -550,6 +550,10 @@ class ReadBookActivity : VMBaseActivity<ReadBookViewModel>(R.layout.activity_boo
} }
} }
override fun upPageAnim() {
page_view?.upPageAnim()
}
/** /**
* 页面改变 * 页面改变
*/ */

@ -17,6 +17,7 @@ import io.legado.app.ui.book.read.page.provider.ChapterProvider
import io.legado.app.utils.activity import io.legado.app.utils.activity
import io.legado.app.utils.screenshot import io.legado.app.utils.screenshot
import kotlinx.android.synthetic.main.activity_book_read.view.* import kotlinx.android.synthetic.main.activity_book_read.view.*
import java.util.*
class PageView(context: Context, attrs: AttributeSet) : class PageView(context: Context, attrs: AttributeSet) :
FrameLayout(context, attrs), FrameLayout(context, attrs),
@ -109,7 +110,9 @@ class PageView(context: Context, attrs: AttributeSet) :
fun upPageAnim() { fun upPageAnim() {
pageDelegate?.onDestroy() pageDelegate?.onDestroy()
pageDelegate = null pageDelegate = null
pageDelegate = when (ReadBookConfig.pageAnim) { pageDelegate = if (ReadBook.imageStyle?.toUpperCase(Locale.ROOT) == "FULL") {
ScrollPageDelegate(this)
} else when (ReadBookConfig.pageAnim) {
0 -> CoverPageDelegate(this) 0 -> CoverPageDelegate(this)
1 -> SlidePageDelegate(this) 1 -> SlidePageDelegate(this)
2 -> SimulationPageDelegate(this) 2 -> SimulationPageDelegate(this)

Loading…
Cancel
Save