From 43ece1be95d107c775f3d131ee40a04b7b37dbf8 Mon Sep 17 00:00:00 2001
From: ocean <503259349@qq.com>
Date: Fri, 10 Oct 2025 19:04:37 +0800
Subject: [PATCH] update

---
 .../all/pdfreader/pro/app/ui/act/PdfResultActivity.kt    | 9 ++++++---
 .../main/java/com/all/pdfreader/pro/app/util/PdfUtils.kt | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfResultActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfResultActivity.kt
index e1fb587..5cf9c8d 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfResultActivity.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfResultActivity.kt
@@ -136,11 +136,12 @@ class PdfResultActivity : BaseActivity() {
             withContext(Dispatchers.Main) {
                 isProcessing = true
                 binding.processingLayout.visibility = View.VISIBLE
+            }
+            if (source == PdfPickerSource.SPLIT) {
                 binding.progressBar.isIndeterminate = false
                 binding.progressBar.progress = 0
                 binding.progressBar.max = 100
-            }
-            if (source == PdfPickerSource.SPLIT) {
+
                 val totalPages = selectedList.sumOf { it.pages.count { it.isSelected } }
                 var processedPages = 0
                 for (item in selectedList) {
@@ -174,6 +175,9 @@ class PdfResultActivity : BaseActivity() {
                     }
                 }
             } else if (source == PdfPickerSource.MERGE) {
+                binding.progressBar.isIndeterminate = false
+                binding.progressBar.progress = 0
+                binding.progressBar.max = 100
                 if (inputFile.isNotEmpty()) {
                     val inputFiles: List<File> = inputFile.map { path -> File(path) }
                     val outputDir = File(
@@ -207,7 +211,6 @@ class PdfResultActivity : BaseActivity() {
                 PdfSecurityUtils.setPasswordToPdfWithProgress(
                     filepath, password, password
                 ) { progress ->
-                    binding.progressBar.progress = progress
                     binding.progressTv.text = "$progress"
                 }.let { it ->
                     if (it) {
diff --git a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfUtils.kt b/app/src/main/java/com/all/pdfreader/pro/app/util/PdfUtils.kt
index 688860a..b938cf4 100644
--- a/app/src/main/java/com/all/pdfreader/pro/app/util/PdfUtils.kt
+++ b/app/src/main/java/com/all/pdfreader/pro/app/util/PdfUtils.kt
@@ -115,7 +115,7 @@ object PdfUtils {
         if (!outputDir.exists()) outputDir.mkdirs()
         val outputFile = File(outputDir, outputFileName)
         try {
-            PDDocument.load(inputFile).use { document ->
+            PDDocument.load(inputFile, MemoryUsageSetting.setupTempFileOnly()).use { document ->
                 PDDocument().use { newDocument ->
                     // 按页索引排序，保证顺序正确
                     val sortedPages = selectedPages.sortedBy { it.pageIndex }