Commit 8f4133ea authored by wanglei's avatar wanglei

...

parent a78574ea
...@@ -51,8 +51,8 @@ import java.io.File ...@@ -51,8 +51,8 @@ import java.io.File
class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
private val TAG = "PdfActivity" private val TAG = "PdfActivity"
private lateinit var pdfPresenter: PdfPresenter private var pdfPresenter: PdfPresenter? = null
private lateinit var pdfPageAdapter: PdfPagerAdapter private var pdfPageAdapter: PdfPagerAdapter? = null
private var muPDFCore: MuPDFCore? = null // 加载mupdf.so文件 private var muPDFCore: MuPDFCore? = null // 加载mupdf.so文件
private var searchTask: SearchTask? = null private var searchTask: SearchTask? = null
...@@ -85,7 +85,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -85,7 +85,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
super.onDestroy() super.onDestroy()
muPDFCore?.onDestroy() muPDFCore?.onDestroy()
AdmobNativeUtils.onDestroy() AdmobNativeUtils.onDestroy()
pdfPageAdapter.release() pdfPageAdapter?.release()
} }
...@@ -114,7 +114,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -114,7 +114,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
changeNormalUI() changeNormalUI()
runCatching { runCatching {
muPDFCore = pdfPresenter.openFile(path, uri) muPDFCore = pdfPresenter?.openFile(path, uri)
} }
// 搜索设为空 // 搜索设为空
...@@ -124,8 +124,8 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -124,8 +124,8 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
//val pwd = intent.extras?.getString("pwd") ?: "" //val pwd = intent.extras?.getString("pwd") ?: ""
val flag = muPDFCore?.authenticatePassword(pwd) ?: false val flag = muPDFCore?.authenticatePassword(pwd) ?: false
if (flag) { if (flag) {
pdfPresenter.password = pwd pdfPresenter?.password = pwd
// pdfPageAdapter.setPassword(pwd) // pdfPageAdapter.setPassword(pwd)
createPdfUI() createPdfUI()
muPDFCore?.countPages()?.let { muPDFCore?.countPages()?.let {
//pdfPresenter.iniPdfPage(it) //pdfPresenter.iniPdfPage(it)
...@@ -351,10 +351,10 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -351,10 +351,10 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
} }
private fun initAdapter() { private fun initAdapter() {
pdfPageAdapter = PdfPagerAdapter(path, uri, mPassword = pwd){ pdfPageAdapter = PdfPagerAdapter(path, uri, mPassword = pwd) {
iniSetVerticalSeekbar(it) iniSetVerticalSeekbar(it)
} }
pdfPageAdapter.clickAction = { pageIndex -> pdfPageAdapter?.clickAction = { pageIndex ->
binding.mupdfReaderView.displayedViewIndex = pageIndex binding.mupdfReaderView.displayedViewIndex = pageIndex
} }
binding.rvPager.adapter = pdfPageAdapter binding.rvPager.adapter = pdfPageAdapter
...@@ -482,7 +482,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -482,7 +482,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
override fun onMoveToChild(i: Int) { override fun onMoveToChild(i: Int) {
binding.tvPageCount.text = "${i + 1}/${muPDFCore?.countPages()}" binding.tvPageCount.text = "${i + 1}/${muPDFCore?.countPages()}"
pdfPageAdapter.changeSelectPager(i) pdfPageAdapter?.changeSelectPager(i)
binding.rvPager.scrollToPosition(i) binding.rvPager.scrollToPosition(i)
setVerticalSeekbar(i + 1, muPDFCore?.countPages() ?: 0) setVerticalSeekbar(i + 1, muPDFCore?.countPages() ?: 0)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment