Commit f865f89b authored by wanglei's avatar wanglei

...

parent cc095369
...@@ -64,6 +64,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -64,6 +64,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
private var uri: String? = null private var uri: String? = null
private var assets: String? = null private var assets: String? = null
private var density = 0f private var density = 0f
private var pwd: String = ""
override val binding: ActivityPdfBinding by lazy { override val binding: ActivityPdfBinding by lazy {
ActivityPdfBinding.inflate(layoutInflater) ActivityPdfBinding.inflate(layoutInflater)
...@@ -99,6 +100,8 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -99,6 +100,8 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
path = intent.extras?.getString("path") ?: "" path = intent.extras?.getString("path") ?: ""
uri = intent.extras?.getString("uri") uri = intent.extras?.getString("uri")
assets = intent.extras?.getString("assets") ?: "" assets = intent.extras?.getString("assets") ?: ""
pwd = intent.extras?.getString("pwd") ?: ""
LogEx.logDebug(TAG, "path=$path") LogEx.logDebug(TAG, "path=$path")
LogEx.logDebug(TAG, "uri=$uri") LogEx.logDebug(TAG, "uri=$uri")
...@@ -606,6 +609,15 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView { ...@@ -606,6 +609,15 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
} }
} }
override fun jumpSplit() {
super.jumpSplit()
startActivity(Intent(this, PdfSplitActivity::class.java).apply {
putExtra("path", path)
putExtra("pwd", pwd)
putExtra("uri", uri)
})
}
companion object { companion object {
const val UI_MODE_NORMAL = 0 const val UI_MODE_NORMAL = 0
......
...@@ -16,6 +16,7 @@ class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView { ...@@ -16,6 +16,7 @@ class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView {
private lateinit var pdfPagerAdapter: PdfPagerAdapter private lateinit var pdfPagerAdapter: PdfPagerAdapter
private var path: String = "" private var path: String = ""
private var pwd: String? = "" private var pwd: String? = ""
private var uri: String? = null
override val binding: ActivityPdfSplitBinding by lazy { override val binding: ActivityPdfSplitBinding by lazy {
ActivityPdfSplitBinding.inflate(layoutInflater) ActivityPdfSplitBinding.inflate(layoutInflater)
...@@ -32,11 +33,14 @@ class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView { ...@@ -32,11 +33,14 @@ class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView {
pdfPresenter = PdfPresenter(this, this) pdfPresenter = PdfPresenter(this, this)
path = intent.extras?.getString("path", "") ?: "" path = intent.extras?.getString("path", "") ?: ""
pwd = intent.extras?.getString("pwd", "") ?: "" pwd = intent.extras?.getString("pwd", "") ?: ""
uri = intent.extras?.getString("uri")
pdfPresenter.password = pwd pdfPresenter.password = pwd
initAdapter() initAdapter()
pdfPresenter.iniPdfPage(path) pdfPresenter.iniPdfPage(path, uri)
} }
override fun initListener() { override fun initListener() {
......
...@@ -46,7 +46,6 @@ import com.base.pdfviewerscannerwhite.databinding.DialogStoragePermissionBinding ...@@ -46,7 +46,6 @@ import com.base.pdfviewerscannerwhite.databinding.DialogStoragePermissionBinding
import com.base.pdfviewerscannerwhite.ui.main.DocumentFragment import com.base.pdfviewerscannerwhite.ui.main.DocumentFragment
import com.base.pdfviewerscannerwhite.ui.main.DocumentPageFragment import com.base.pdfviewerscannerwhite.ui.main.DocumentPageFragment
import com.base.pdfviewerscannerwhite.ui.main.MainActivity import com.base.pdfviewerscannerwhite.ui.main.MainActivity
import com.base.pdfviewerscannerwhite.ui.view.DialogView.showNotificationDialog
import com.base.pdfviewerscannerwhite.utils.ActivityLauncher import com.base.pdfviewerscannerwhite.utils.ActivityLauncher
import com.base.pdfviewerscannerwhite.utils.IntentShareUtils.documentShare import com.base.pdfviewerscannerwhite.utils.IntentShareUtils.documentShare
import com.base.pdfviewerscannerwhite.utils.KotlinExt.toFormatSize import com.base.pdfviewerscannerwhite.utils.KotlinExt.toFormatSize
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
android:layout_width="338dp" android:layout_width="338dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginStart="14dp"
android:layout_marginTop="26dp" android:layout_marginTop="26dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:background="@drawable/bg_selector_btn" android:background="@drawable/bg_selector_btn"
......
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