...

app/src/main/java/com/base/pdfviewerscannerwhite/ui/document/pdf/PdfActivity.kt

@@ -35,8 +35,6 @@ import com.base.pdfviewerscannerwhite.utils.LogEx
 import com.base.pdfviewerscannerwhite.utils.SpStringUtils
 import com.base.pdfviewerscannerwhite.utils.SpStringUtils.LAST_VIEW_KEY
 import com.base.pdfviewerscannerwhite.utils.ToastUtils.toast
-import com.cherry.lib.doc.office.constant.EventConstant
-import com.cherry.lib.doc.office.wp.control.WPControl
 import java.io.File
 
 
@@ -141,7 +139,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
             }
             if (uiMode == UI_MODE_EDITE_SAVE) {
                 changeNormalUI()
-                resetPdfView()
+                cancelOperation()
                 return@addCallback
             }
 
@@ -172,30 +170,6 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
             binding.mupdfReaderView.setMode(MuPDFReaderView.Mode.Drawing)
         }
         binding.ivWancheng.setOnClickListener {
-            var success: Boolean = false
-            val pageView = binding.mupdfReaderView.displayedView as MuPDFView
-            when (saveMode) {
-                SAVE_MODE_HIGHLIGHT -> {
-                    success = pageView.markupSelection(Annotation.Type.HIGHLIGHT)
-                }
-
-                SAVE_MODE_GLIDE_LINE -> {
-                    success = pageView.markupSelection(Annotation.Type.UNDERLINE)
-                }
-
-                SAVE_MODE_STRIKETHROUGH -> {
-                    success = pageView.markupSelection(Annotation.Type.STRIKEOUT)
-                }
-
-                SAVE_MODE_PAINTING_BRUSH -> {
-                    success = pageView.saveDraw()
-                }
-            }
-            if (!success) {
-                toast("nothing to save")
-                return@setOnClickListener
-            }
-            binding.mupdfReaderView.setMode(MuPDFReaderView.Mode.Viewing)
             changeEditSaveUI()
         }
         binding.ivBianji.setOnClickListener {
@@ -223,13 +197,13 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
         }
 
         binding.tvBtnSave.setOnClickListener {
-
             PdfLoadingActivity.muPDFCore = muPDFCore
-
-            changeNormalUI()
+            reallySave()
             startActivity(Intent(this, PdfLoadingActivity::class.java).apply {
                 putExtra("doWhat", DO_SAVE_PDF)
+                putExtra("srcPath", path)
             })
+            finish()
         }
         binding.ivXuanzhuan.setOnClickListener {
             switchOrientation()
@@ -246,9 +220,33 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
     /**
      *
      */
-    private fun resetPdfView() {
+    private fun reallySave() {
+        var success: Boolean = false
+        val pageView = binding.mupdfReaderView.displayedView as MuPDFView
+        when (saveMode) {
+            SAVE_MODE_HIGHLIGHT -> {
+                success = pageView.markupSelection(Annotation.Type.HIGHLIGHT)
+            }
+
+            SAVE_MODE_GLIDE_LINE -> {
+                success = pageView.markupSelection(Annotation.Type.UNDERLINE)
+            }
+
+            SAVE_MODE_STRIKETHROUGH -> {
+                success = pageView.markupSelection(Annotation.Type.STRIKEOUT)
+            }
+
+            SAVE_MODE_PAINTING_BRUSH -> {
+                success = pageView.saveDraw()
+            }
+        }
+        if (!success) {
+            toast("nothing to save")
+            return
+        }
     }
 
+
     private fun cancelOperation() {
         val pageView = binding.mupdfReaderView.displayedView as MuPDFView?
         if (pageView != null) {
@@ -509,7 +507,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
 
 
     /**
-     * 编辑报错UI模式
+     * 编辑保持UI模式
      */
     private fun changeEditSaveUI() {
         uiMode = UI_MODE_EDITE_SAVE

app/src/main/java/com/base/pdfviewerscannerwhite/ui/document/pdf/PdfLoadingActivity.kt

@@ -62,6 +62,9 @@ class PdfLoadingActivity : BaseActivity<ActivityPdfLoadingBinding>() {
                 muPDFCore?.save()
                 muPDFCore = null
                 progressFinishAction = {
+                    startActivity(Intent(this, PdfActivity::class.java).apply {
+                        putExtra("path", srcPath)
+                    })
                     finish()
                 }
                 lifecycleScope.launch {